Changeset 896

Show
Ignore:
Timestamp:
02/26/08 14:56:53 (14 years ago)
Author:
jwoithe
Message:

Add untested preliminary support for the 828 MkI. This has not been tested against an actual device, nor has it been compile tested. Channel mapping is probably wrong and we don't yet know whether the MkI's protocol is similar enough to the MkII's that things will just work. This addition may however allow further tests to be done.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/motu/motu_avdevice.cpp

    r864 r896  
    5858    {FW_VENDORID_MOTU, 0, 0x0000000d, 0x000001f2, MOTUFW_MODEL_ULTRALITE, "MOTU", "UltraLite"}, 
    5959    {FW_VENDORID_MOTU, 0, 0x0000000f, 0x000001f2, MOTUFW_MODEL_8PRE, "MOTU", "8pre"}, 
     60    {FW_VENDORID_MOTU, 0, 0x00000001, 0x000001f2, MOTUFW_MODEL_828MkI "MOTU", "828MkI"}, 
    6061}; 
    6162 
    6263// Ports declarations 
     64const PortEntry Ports_828MKI[] = 
     65{ 
     66    {"Analog1", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 10}, 
     67    {"Analog2", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 13}, 
     68    {"Analog3", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 16}, 
     69    {"Analog4", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 19}, 
     70    {"Analog5", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 22}, 
     71    {"Analog6", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 25}, 
     72    {"Analog7", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 28}, 
     73    {"Analog8", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 31}, 
     74    {"SPDIF1", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 34}, 
     75    {"SPDIF2", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ANY, 37}, 
     76    {"ADAT1", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ADAT, 40}, 
     77    {"ADAT2", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ADAT, 43}, 
     78    {"ADAT3", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ADAT, 46}, 
     79    {"ADAT4", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_ANY|MOTUFW_PA_OPTICAL_ADAT, 49}, 
     80    {"ADAT5", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_1x|MOTUFW_PA_OPTICAL_ADAT, 52}, 
     81    {"ADAT6", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_1x|MOTUFW_PA_OPTICAL_ADAT, 55}, 
     82    {"ADAT7", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_1x|MOTUFW_PA_OPTICAL_ADAT, 58}, 
     83    {"ADAT8", MOTUFW_DIR_INOUT, MOTUFW_PA_RATE_1x|MOTUFW_PA_OPTICAL_ADAT, 61}, 
     84}; 
     85 
    6386const PortEntry Ports_828MKII[] = 
    6487{ 
     
    179202const DevicePropertyEntry DevicesProperty[] = { 
    180203//  { Ports_map,       sizeof( Ports_map ),        MaxSR }, 
     204    { Ports_828MkI,    sizeof( Ports_828MKI ),     48000 }, 
    181205    { Ports_828MKII,   sizeof( Ports_828MKII ),    96000 }, 
    182206    { Ports_TRAVELER,  sizeof( Ports_TRAVELER ),  192000 }, 
  • trunk/libffado/src/motu/motu_avdevice.h

    r864 r896  
    9696      MOTUFW_MODEL_ULTRALITE= 0x0003, 
    9797      MOTUFW_MODEL_8PRE     = 0x0004, 
     98      MOTUFW_MODEL_828MkI   = 0x0005, 
    9899}; 
    99100