Changeset 1842

Show
Ignore:
Timestamp:
05/31/10 04:32:34 (2 years ago)
Author:
jwoithe
Message:

MOTU: tidy up clock source availability, especially for G3 devices.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/motu/motu_avdevice.cpp

    r1841 r1842  
    10491049    r.push_back(s); 
    10501050 
    1051     if (device_gen < MOTU_DEVICE_G3) { 
     1051    /* The 9-pin ADAT sync was only present on selected G2 
     1052     * devices. 
     1053     */ 
     1054    if (m_motu_model==MOTU_MODEL_828mkII || m_motu_model==MOTU_MODEL_TRAVELER || 
     1055        m_motu_model==MOTU_MODEL_896HD) { 
    10521056        s = clockIdToClockSource(MOTU_CLKSRC_ADAT_9PIN); 
    10531057        r.push_back(s); 
    10541058    } 
    1055     s = clockIdToClockSource(MOTU_CLKSRC_AES_EBU); 
    1056     r.push_back(s); 
    1057  
    1058     if (device_gen == MOTU_DEVICE_G3) { 
     1059    /* AES/EBU is present on the G2/G3 Travelers and 896HDs */ 
     1060    if (m_motu_model==MOTU_MODEL_TRAVELER || m_motu_model==MOTU_MODEL_TRAVELERmk3 || 
     1061        m_motu_model==MOTU_MODEL_896HD || m_motu_model==MOTU_MODEL_896HDmk3) { 
     1062        s = clockIdToClockSource(MOTU_CLKSRC_AES_EBU); 
     1063        r.push_back(s); 
     1064    } 
     1065 
     1066    /* Dual-port ADAT is a feature of the G3 devices, and then only some */ 
     1067    if (m_motu_model==MOTU_MODEL_828mk3 || m_motu_model==MOTU_MODEL_TRAVELERmk3 || 
     1068        m_motu_model==MOTU_MODEL_896HDmk3) { 
    10591069        s = clockIdToClockSource(MOTU_CLKSRC_OPTICAL_A); 
    10601070        r.push_back(s); 

  • trunk/libffado/src/motu/motu_avdevice.h

    r1840 r1842  
    273273    MOTU_MODEL_ULTRALITEmk3     = 0x0008, 
    274274    MOTU_MODEL_ULTRALITEmk3_HYB = 0x0009, 
     275    MOTU_MODEL_TRAVELERmk3      = 0x000a, // Placeholder only at present 
     276    MOTU_MODEL_896HDmk3         = 0x000b, // Placeholder only at present 
    275277}; 
    276278