Changeset 1515

Show
Ignore:
Timestamp:
02/11/09 03:41:24 (12 years ago)
Author:
holin
Message:

Alesis Multimix16 support from adi (ticket #196)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/dice/dice_avdevice.cpp

    r1514 r1515  
    5656    {FW_VENDORID_TCAT,   0x00000023, "TC Electronic", "Konnekt Live"}, 
    5757    {FW_VENDORID_ALESIS, 0x00000001, "Alesis", "io|14"}, 
     58    {FW_VENDORID_ALESIS, 0x00000000, "Alesis", "Multimix16 Firewire"}, 
    5859    {FW_VENDORID_PRESONUS, 0x0000000b, "Presonus", "Firestudio Project"}, 
    5960    {FW_VENDORID_FOCUSRITE, 0x00000005, "Focusrite", "Saffire PRO 40"}, 
     
    792793 
    793794        /* Vendor-specific hacks */ 
    794  
    795         /* Alesis io14 RX0 claims to have six audio channels. Ignore it, just  
    796          * use 8 for Bus1-L+R .. Bus4-L+R. 
    797          */ 
    798         if ((FW_VENDORID_ALESIS == getConfigRom().getNodeVendorId()) && 
    799             (0x00000001 == getConfigRom().getModelId())) { 
    800             nb_audio=8; 
     795        if (FW_VENDORID_ALESIS == getConfigRom().getNodeVendorId()) { 
     796            /* Alesis io14 RX0 claims to have six audio channels. Ignore 
     797             * it, just use 8 for Bus1-L+R .. Bus4-L+R. 
     798             */ 
     799            if (0x00000001 == getConfigRom().getModelId()) { 
     800                nb_audio = 8; 
     801            } 
     802 
     803            /* Alesis Multimix16 RX0 only has two channels, Main-Out L+R */ 
     804            if (0x00000000 == getConfigRom().getModelId()) { 
     805                nb_audio = 2; 
     806            } 
    801807        } 
    802808 
     
    14681474 
    14691475    // FIXME: verify this and clean it up. 
    1470     /* special case for io14, which announces two receive transmitters, 
    1471      * but only has one 
     1476    /* special case for Alesis io14, which announces two receive transmitters, 
     1477     * but only has one. Same is true for Alesis Multimix16. 
    14721478     */ 
    1473     if ((FW_VENDORID_ALESIS == getConfigRom().getNodeVendorId()) && 
    1474             (0x00000001 == getConfigRom().getModelId())) { 
    1475         m_nb_rx = 1; 
     1479    if (FW_VENDORID_ALESIS == getConfigRom().getNodeVendorId()) { 
     1480        /* we may want to use a switch-case-statement some day... */ 
     1481        if ((0x00000001 == getConfigRom().getModelId()) || 
     1482            (0x00000000 == getConfigRom().getModelId())) { 
     1483            m_nb_rx = 1; 
     1484        } 
    14761485    } 
    14771486