Changeset 1703

Show
Ignore:
Timestamp:
11/11/09 15:58:36 (2 years ago)
Author:
jwoithe
Message:

MOTU: add basic device detection and support infrastructure for the Ultralite Mark 3. Note the port layout is yet to be confirmed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/libffado-2.0/src/motu/motu_avdevice.cpp

    r1635 r1703  
    6767    {FW_VENDORID_MOTU, 0, 0x00000005, 0x000001f2, MOTU_MODEL_896HD, "MOTU", "896HD"}, 
    6868    {FW_VENDORID_MOTU, 0, 0x00000015, 0x000001f2, MOTU_MODEL_828mk3, "MOTU", "828Mk3"}, 
     69    {FW_VENDORID_MOTU, 0, 0x00000019, 0x000001f2, MOTU_MODEL_ULTRALITEmk3, "MOTU", "UltraLineMk3"}, 
    6970}; 
    7071 
    …… 
    306307}; 
    307308 
     309const PortEntry Ports_ULTRALITEmk3[] = 
     310{ 
     311    {"Main-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 40}, 
     312    {"Main-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 43}, 
     313    {"Mix-L", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10}, 
     314    {"Mix-R", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13}, 
     315    {"Mic1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 16}, 
     316    {"Mic2", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 19}, 
     317    {"Analog1", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 16}, 
     318    {"Analog2", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 19}, 
     319    {"Analog3", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 22}, 
     320    {"Analog4", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 25}, 
     321    {"Analog5", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 28}, 
     322    {"Analog6", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 31}, 
     323    {"Analog7", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 34}, 
     324    {"Analog8", MOTU_PA_INOUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 37}, 
     325    {"Phones-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10}, 
     326    {"Phones-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13}, 
     327    {"SPDIF1", MOTU_PA_IN | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 40}, 
     328    {"SPDIF2", MOTU_PA_IN | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 43}, 
     329    {"Padding1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY|MOTU_PA_PADDING, 46}, 
     330    {"Padding2", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY|MOTU_PA_PADDING, 49}, 
     331    {"SPDIF1", MOTU_PA_OUT | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 46}, 
     332    {"SPDIF2", MOTU_PA_OUT | MOTU_PA_RATE_1x2x|MOTU_PA_OPTICAL_ANY, 49}, 
     333}; 
     334 
    308335/* The order of DevicesProperty entries must match the numeric order of the 
    309336 * MOTU model enumeration (EMotuModel). 
    310337 */ 
    311338const DevicePropertyEntry DevicesProperty[] = { 
    312 //  { Ports_map,       N_ELEMENTS( Ports_map ),        MaxSR, MixerDescrPtr, Mark3MixerDescrPtr }, 
    313     { Ports_828MKII,   N_ELEMENTS( Ports_828MKII ),    96000, &Mixer_828Mk2, NULL, }, 
    314     { Ports_TRAVELER,  N_ELEMENTS( Ports_TRAVELER ),  192000, &Mixer_Traveler, NULL, }, 
    315     { Ports_ULTRALITE, N_ELEMENTS( Ports_ULTRALITE ),  96000, &Mixer_Ultralite, NULL, }, 
    316     { Ports_8PRE,      N_ELEMENTS( Ports_8PRE ),       96000, &Mixer_8pre, NULL, }, 
    317     { Ports_828MKI,    N_ELEMENTS( Ports_828MKI ),     48000 }, 
    318     { Ports_896HD,     N_ELEMENTS( Ports_896HD ),     192000, &Mixer_896HD, NULL, }, 
    319     { Ports_828mk3,    N_ELEMENTS( Ports_828mk3 ),    192000 }, 
     339//  { Ports_map,          N_ELEMENTS( Ports_map ),        MaxSR, MixerDescrPtr, Mark3MixerDescrPtr }, 
     340    { Ports_828MKII,      N_ELEMENTS( Ports_828MKII ),       96000, &Mixer_828Mk2, NULL, }, 
     341    { Ports_TRAVELER,     N_ELEMENTS( Ports_TRAVELER ),     192000, &Mixer_Traveler, NULL, }, 
     342    { Ports_ULTRALITE,    N_ELEMENTS( Ports_ULTRALITE ),     96000, &Mixer_Ultralite, NULL, }, 
     343    { Ports_8PRE,         N_ELEMENTS( Ports_8PRE ),          96000, &Mixer_8pre, NULL, }, 
     344    { Ports_828MKI,       N_ELEMENTS( Ports_828MKI ),        48000 }, 
     345    { Ports_896HD,        N_ELEMENTS( Ports_896HD ),        192000, &Mixer_896HD, NULL, }, 
     346    { Ports_828mk3,       N_ELEMENTS( Ports_828mk3 ),       192000 }, 
     347    { Ports_ULTRALITEmk3, N_ELEMENTS( Ports_ULTRALITEmk3 ), 192000 }, 
    320348}; 
    321349 

  • branches/libffado-2.0/src/motu/motu_avdevice.h

    r1581 r1703  
    128128 
    129129enum EMotuModel { 
    130     MOTU_MODEL_NONE     = 0x0000, 
    131     MOTU_MODEL_828mkII  = 0x0001, 
    132     MOTU_MODEL_TRAVELER = 0x0002, 
    133     MOTU_MODEL_ULTRALITE= 0x0003, 
    134     MOTU_MODEL_8PRE     = 0x0004, 
    135     MOTU_MODEL_828MkI   = 0x0005, 
    136     MOTU_MODEL_896HD    = 0x0006, 
    137     MOTU_MODEL_828mk3   = 0x0007, 
     130    MOTU_MODEL_NONE         = 0x0000, 
     131    MOTU_MODEL_828mkII      = 0x0001, 
     132    MOTU_MODEL_TRAVELER     = 0x0002, 
     133    MOTU_MODEL_ULTRALITE    = 0x0003, 
     134    MOTU_MODEL_8PRE         = 0x0004, 
     135    MOTU_MODEL_828MkI       = 0x0005, 
     136    MOTU_MODEL_896HD        = 0x0006, 
     137    MOTU_MODEL_828mk3       = 0x0007, 
     138    MOTU_MODEL_ULTRALITEmk3 = 0x0008, 
    138139}; 
    139140