Changeset 2345

Show
Ignore:
Timestamp:
07/16/13 04:16:56 (7 years ago)
Author:
adi
Message:

Use verbal driver names in configuration files

Patch by Jano Svitok <jan.svitok@gmail.com>

Orig message:
This patch allows driver names to be used in the configuration file. The
old way (using numbers) is kept. Configuration file is converted to
names and the entries are properly aligned.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/configuration

    r2340 r2345  
    55    vendorname  = "Mackie"; 
    66    modelname   = "Onyx Firewire"; 
    7     driver      = 1; # BeBoB 
     7    driver      = "BEBOB"; 
    88    xmit_max_cycles_early_transmit = 4; 
    99}, 
     
    1313    vendorname  = "Mackie"; 
    1414    modelname   = "Onyx Firewire"; 
    15     driver      = 1; # BeBoB 
     15    driver      = "BEBOB"; 
    1616    mixer       = "MackieOnyx"; 
    1717    xmit_max_cycles_early_transmit = 4; 
     
    2222    vendorname  = "Tascam";   
    2323    modelname   = "IFFWDM";   
    24     driver      = 1; # BeBoB   
     24    driver      = "BEBOB"; 
    2525}, 
    2626{ # entries provided by Holger Dehnhardt 
     
    2929    vendorname  = "Loud Technologies Inc."; 
    3030    modelname   = "Onyx-i"; 
    31     driver      = 4; # Oxford 
     31    driver      = "OXFORD"; 
    3232    xmit_transfer_delay = 11776; 
    3333}, 
     
    3737    vendorname  = "Behringer"; 
    3838    modelname   = "X32"; 
    39     driver      = 1; # BeBoB 
     39    driver      = "BEBOB"; 
    4040    xmit_max_cycles_early_transmit = 4; 
    4141}, 
     
    4545    vendorname  = "Apogee Electronics"; 
    4646    modelname   = "Rosetta 200"; 
    47     driver      = 1; # BeBoB 
     47    driver      = "BEBOB"; 
    4848    xmit_max_cycles_early_transmit = 4; 
    4949}, 
     
    5353    vendorname  = "BridgeCo"; 
    5454    modelname   = "RD Audio1"; 
    55     driver      = 1; # BeBoB 
     55    driver      = "BEBOB"; 
    5656    xmit_max_cycles_early_transmit = 4; 
    5757}, 
     
    6161    vendorname  = "BridgeCo"; 
    6262    modelname   = "Audio 5"; 
    63     driver      = 1; # BeBoB 
     63    driver      = "BEBOB"; 
    6464    mixer       = "BCoAudio5Control"; 
    6565    xmit_max_cycles_early_transmit = 4; 
     
    7070    vendorname  = "PreSonus"; 
    7171    modelname   = "FIREBOX"; 
    72     driver      = 1; # BeBoB 
     72    driver      = "BEBOB"; 
    7373    mixer       = "Presonus_Experimental"; 
    7474    xmit_max_cycles_early_transmit = 4; 
     
    7979    vendorname  = "PreSonus"; 
    8080    modelname   = "FirePOD"; 
    81     driver      = 1; # BeBoB 
     81    driver      = "BEBOB"; 
    8282    mixer       = "Presonus_Experimental"; 
    8383    xmit_max_cycles_early_transmit = 4; 
    8484}, 
    8585{ # Presonus Firestudio 26x26, Bob Hamil via jaimes on the forums 
    86     vendorid = 0x000a92; 
    87     modelid = 0x00000008; 
    88     vendorname = "Presonus"; 
    89     modelname = "Firestudio 26x26"; 
    90     mixer = "Generic_Dice_EAP"; 
    91     driver = 20
     86    vendorid    = 0x000a92; 
     87    modelid     = 0x00000008; 
     88    vendorname = "Presonus"; 
     89    modelname   = "Firestudio 26x26"; 
     90    mixer       = "Generic_Dice_EAP"; 
     91    driver      = "DICE"
    9292}, 
    9393{ # Presonus Firestudio Project, from Walt Baldwin 
    94     vendorid = 0x000a92; 
    95     modelid = 0x0000000b; 
    96     vendorname = "Presonus"; 
    97     modelname = "Firestudio Project"; 
    98     mixer = "Generic_Dice_EAP"; 
    99     driver = 20
     94    vendorid    = 0x000a92; 
     95    modelid     = 0x0000000b; 
     96    vendorname = "Presonus"; 
     97    modelname   = "Firestudio Project"; 
     98    mixer       = "Generic_Dice_EAP"; 
     99    driver      = "DICE"
    100100}, 
    101101{ # Presonus Firestudio Tube, from Tobi Kraus 
    102     vendorid = 0x000a92; 
    103     modelid = 0x0000000c; 
    104     vendorname = "Presonus"; 
    105     modelname = "Firestudio Tube"; 
    106     mixer = "Generic_Dice_EAP"; 
    107     driver = 20
     102    vendorid    = 0x000a92; 
     103    modelid     = 0x0000000c; 
     104    vendorname = "Presonus"; 
     105    modelname   = "Firestudio Tube"; 
     106    mixer       = "Generic_Dice_EAP"; 
     107    driver      = "DICE"
    108108}, 
    109109{ # Entry for Firestudio mobile provided by "Pule" via the forums. 
     
    112112    vendorname  = "PreSonus"; 
    113113    modelname   = "Firestudio Mobile"; 
    114     driver      = 20
     114    driver = "DICE"
    115115}, 
    116116{ # Entry for StudioLive 2442, from Walt Baldwin 
    117     vendorid = 0x00000A92; 
    118     modelid = 0x00000012; 
    119     vendorname = "PreSonus"; 
    120     modelname = "STUDIOLIVE_2442"; 
    121     driver = 20
     117    vendorid    = 0x00000A92; 
     118    modelid     = 0x00000012; 
     119    vendorname = "PreSonus"; 
     120    modelname   = "STUDIOLIVE_2442"; 
     121    driver      = "DICE"
    122122}, 
    123123{ 
     
    126126    vendorname  = "TerraTec Electronic GmbH"; 
    127127    modelname   = "Phase 88 FW"; 
    128     driver      = 1; # BeBoB 
     128    driver      = "BEBOB"; 
    129129    mixer       = "Phase88Control"; 
    130130    xmit_max_cycles_early_transmit = 4; 
     
    135135    vendorname  = "TerraTec Electronic GmbH"; 
    136136    modelname   = "Phase X24 FW (model version 4)"; 
    137     driver      = 1; # BeBoB 
     137    driver      = "BEBOB"; 
    138138    mixer       = "Phase24Control"; 
    139139    xmit_max_cycles_early_transmit = 4; 
     
    144144    vendorname  = "TerraTec Electronic GmbH"; 
    145145    modelname   = "Phase X24 FW (model version 7)"; 
    146     driver      = 1; # BeBoB 
     146    driver      = "BEBOB"; 
    147147    mixer       = "Phase24Control"; 
    148148    xmit_max_cycles_early_transmit = 4; 
     
    153153    vendorname  = "ESI"; 
    154154    modelname   = "Quatafire 610"; 
    155     driver      = 1; # BeBoB 
     155    driver      = "BEBOB"; 
    156156    mixer       = "QuataFire"; 
    157157    xmit_max_cycles_early_transmit = 4; 
     
    162162    vendorname  = "Focusrite"; 
    163163    modelname   = "Saffire Pro26IO"; 
    164     driver      = 1; # BeBoB 
     164    driver      = "BEBOB"; 
    165165    mixer       = "SaffirePro"; 
    166166    xmit_max_cycles_early_transmit = 4; 
     
    171171    vendorname  = "Focusrite"; 
    172172    modelname   = "Saffire Pro10IO"; 
    173     driver      = 1; # BeBoB 
     173    driver      = "BEBOB"; 
    174174    mixer       = "SaffirePro"; 
    175175    xmit_max_cycles_early_transmit = 4; 
     
    180180    vendorname  = "Focusrite"; 
    181181    modelname   = "Saffire (LE)"; 
    182     driver      = 1; # BeBoB 
     182    driver      = "BEBOB"; 
    183183    mixer       = "Saffire"; 
    184184    cmd_interval_time = 10000; 
     
    190190    vendorname  = "EDIROL"; 
    191191    modelname   = "FA-66"; 
    192     driver      = 1; # BeBoB 
     192    driver      = "BEBOB"; 
    193193    mixer       = "EdirolFa66Control"; 
    194194    xmit_max_cycles_early_transmit = 4; 
     
    199199    vendorname  = "EDIROL"; 
    200200    modelname   = "FA-101"; 
    201     driver      = 1; # BeBoB 
     201    driver      = "BEBOB"; 
    202202    mixer       = "EdirolFa101Control"; 
    203203    xmit_max_cycles_early_transmit = 4; 
     
    208208    vendorname  = "M-Audio"; 
    209209    modelname   = "Ozonic"; 
    210     driver      = 1; # BeBoB 
     210    driver      = "BEBOB"; 
    211211    mixer       = "Ozonic"; 
    212212    xmit_max_cycles_early_transmit = 4; 
     
    217217    vendorname  = "M-Audio"; 
    218218    modelname   = "FW Solo"; 
    219     driver      = 1; # BeBoB 
     219    driver      = "BEBOB"; 
    220220    xmit_max_cycles_early_transmit = 4; 
    221221}, 
     
    225225    vendorname  = "M-Audio"; 
    226226    modelname   = "NRV10"; 
    227     driver      = 1; # BeBoB 
     227    driver      = "BEBOB"; 
    228228    xmit_max_cycles_early_transmit = 4; 
    229229}, 
     
    233233    vendorname  = "M-Audio"; 
    234234    modelname   = "FW Audiophile"; 
    235     driver      = 1; # BeBoB 
     235    driver      = "BEBOB"; 
    236236    xmit_max_cycles_early_transmit = 4; 
    237237}, 
     
    241241    vendorname  = "M-Audio"; 
    242242    modelname   = "ProFire Lightbridge"; 
    243     driver      = 1; # BeBoB 
     243    driver      = "BEBOB"; 
    244244    xmit_max_cycles_early_transmit = 4; 
    245245}, 
     
    249249    vendorname  = "M-Audio"; 
    250250    modelname   = "ProFire 2626"; 
    251     driver      = 20
     251    driver = "DICE"
    252252    mixer       = "Generic_Dice_EAP"; 
    253253}, 
     
    257257    vendorname  = "M-Audio"; 
    258258    modelname   = "ProFire 610"; 
    259     driver      = 20
     259    driver = "DICE"
    260260    mixer       = "Generic_Dice_EAP"; 
    261261}, 
     
    265265    vendorname  = "Acoustic Reality"; 
    266266    modelname   = "eAR Master One"; 
    267     driver      = 1; # BeBoB 
    268     xmit_max_cycles_early_transmit = 4; 
    269 }, 
    270 { 
    271     vendorid = 0x0000000A; 
    272     modelid = 0x00030000; 
    273     vendorname = "CME"; 
    274     modelname = "Matrix K FW"; 
    275     driver = 1; # BeBoB 
    276     xmit_max_cycles_early_transmit = 4; 
    277 },  
    278 { 
    279     vendorid = 0x1486; 
    280     modelid = 0xAF2; 
    281     vendorname = "Echo"; 
    282     modelname = "AudioFire2"; 
    283     driver = 2
    284     mixer = "AudioFire"; 
    285     xmit_max_cycles_early_transmit = 2; 
    286 },  
    287 { 
    288     vendorid = 0x1486; 
    289     modelid = 0xAF4; 
    290     vendorname = "Echo"; 
    291     modelname = "AudioFire4"; 
    292     driver = 2
    293     mixer = "AudioFire"; 
    294     xmit_max_cycles_early_transmit = 4; 
    295 },  
    296 { 
    297     vendorid = 0x1486; 
    298     modelid = 0xAF8; 
    299     vendorname = "Echo"; 
    300     modelname = "AudioFire8"; 
    301     driver = 2
    302     mixer = "AudioFire"; 
    303     xmit_max_cycles_early_transmit = 2; 
    304 },  
    305 { 
    306     vendorid = 0x1486; 
    307     modelid = 0xAF9; 
    308     vendorname = "Echo"; 
    309     modelname = "AudioFire8a"; 
    310     driver = 2
    311     mixer = "AudioFire"; 
    312     xmit_max_cycles_early_transmit = 2; 
    313 },  
    314 { 
    315     vendorid = 0x1486; 
    316     modelid = 0xAF12; 
    317     vendorname = "Echo"; 
    318     modelname = "AudioFire12"; 
    319     driver = 2
    320     mixer = "AudioFire"; 
    321     xmit_max_cycles_early_transmit = 2; 
    322 },  
    323 { 
    324     vendorid = 0x1486; 
    325     modelid = 0xAF12D; 
    326     vendorname = "Echo"; 
    327     modelname = "AudioFire12HD"; 
    328     driver = 2
    329     xmit_max_cycles_early_transmit = 2; 
    330 },  
    331 { 
    332     vendorid = 0x1486; 
    333     modelid = 0xF8; 
    334     vendorname = "Echo"; 
    335     modelname = "Fireworks 8"; 
    336     driver = 2
    337     xmit_max_cycles_early_transmit = 2; 
    338 },  
    339 { 
    340     vendorid = 0x1486; 
    341     modelid = 0xAFD1; 
    342     vendorname = "Echo"; 
    343     modelname = "FW HDMI"; 
    344     driver = 2
    345     xmit_max_cycles_early_transmit = 2; 
    346 },  
    347 { 
    348     vendorid = 0xFF2; 
    349     modelid = 0x400F; 
    350     vendorname = "Mackie"; 
    351     modelname = "Onyx 400F"; 
    352     driver = 2
    353     xmit_max_cycles_early_transmit = 2; 
    354 },  
    355 { 
    356     vendorid = 0xFF2; 
    357     modelid = 0x1200F; 
    358     vendorname = "Mackie"; 
    359     modelname = "Onyx 1200F"; 
    360     driver = 2
    361     xmit_max_cycles_early_transmit = 2; 
    362 }, 
    363 { 
    364     vendorid = 0x1564; 
    365     modelid = 0xFC22; 
    366     vendorname = "Behringer"; 
    367     modelname = "FCA202"; 
    368     driver = 4
    369 }, 
    370 { 
    371     vendorid = 0x00001260; 
    372     modelid = 0x00001000; 
    373     vendorname = "Stanton DJ"; 
    374     modelname = "SCS.1m"; 
    375     driver = 3
     267    driver      = "BEBOB"; 
     268    xmit_max_cycles_early_transmit = 4; 
     269}, 
     270{ 
     271    vendorid    = 0x0000000A; 
     272    modelid     = 0x00030000; 
     273    vendorname = "CME"; 
     274    modelname   = "Matrix K FW"; 
     275    driver      = "BEBOB"; 
     276    xmit_max_cycles_early_transmit = 4; 
     277},  
     278{ 
     279    vendorid    = 0x1486; 
     280    modelid     = 0xAF2; 
     281    vendorname = "Echo"; 
     282    modelname   = "AudioFire2"; 
     283    driver      = "FIREWORKS"
     284    mixer       = "AudioFire"; 
     285    xmit_max_cycles_early_transmit = 2; 
     286},  
     287{ 
     288    vendorid    = 0x1486; 
     289    modelid     = 0xAF4; 
     290    vendorname = "Echo"; 
     291    modelname   = "AudioFire4"; 
     292    driver      = "FIREWORKS"
     293    mixer       = "AudioFire"; 
     294    xmit_max_cycles_early_transmit = 4; 
     295},  
     296{ 
     297    vendorid    = 0x1486; 
     298    modelid     = 0xAF8; 
     299    vendorname = "Echo"; 
     300    modelname   = "AudioFire8"; 
     301    driver      = "FIREWORKS"
     302    mixer       = "AudioFire"; 
     303    xmit_max_cycles_early_transmit = 2; 
     304},  
     305{ 
     306    vendorid    = 0x1486; 
     307    modelid     = 0xAF9; 
     308    vendorname = "Echo"; 
     309    modelname   = "AudioFire8a"; 
     310    driver      = "FIREWORKS"
     311    mixer       = "AudioFire"; 
     312    xmit_max_cycles_early_transmit = 2; 
     313},  
     314{ 
     315    vendorid    = 0x1486; 
     316    modelid     = 0xAF12; 
     317    vendorname = "Echo"; 
     318    modelname   = "AudioFire12"; 
     319    driver      = "FIREWORKS"
     320    mixer       = "AudioFire"; 
     321    xmit_max_cycles_early_transmit = 2; 
     322},  
     323{ 
     324    vendorid    = 0x1486; 
     325    modelid     = 0xAF12D; 
     326    vendorname = "Echo"; 
     327    modelname   = "AudioFire12HD"; 
     328    driver      = "FIREWORKS"
     329    xmit_max_cycles_early_transmit = 2; 
     330},  
     331{ 
     332    vendorid    = 0x1486; 
     333    modelid     = 0xF8; 
     334    vendorname = "Echo"; 
     335    modelname   = "Fireworks 8"; 
     336    driver      = "FIREWORKS"
     337    xmit_max_cycles_early_transmit = 2; 
     338},  
     339{ 
     340    vendorid    = 0x1486; 
     341    modelid     = 0xAFD1; 
     342    vendorname = "Echo"; 
     343    modelname   = "FW HDMI"; 
     344    driver      = "FIREWORKS"
     345    xmit_max_cycles_early_transmit = 2; 
     346},  
     347{ 
     348    vendorid    = 0xFF2; 
     349    modelid     = 0x400F; 
     350    vendorname = "Mackie"; 
     351    modelname   = "Onyx 400F"; 
     352    driver      = "FIREWORKS"
     353    xmit_max_cycles_early_transmit = 2; 
     354},  
     355{ 
     356    vendorid    = 0xFF2; 
     357    modelid     = 0x1200F; 
     358    vendorname = "Mackie"; 
     359    modelname   = "Onyx 1200F"; 
     360    driver      = "FIREWORKS"
     361    xmit_max_cycles_early_transmit = 2; 
     362}, 
     363{ 
     364    vendorid    = 0x1564; 
     365    modelid     = 0xFC22; 
     366    vendorname = "Behringer"; 
     367    modelname   = "FCA202"; 
     368    driver      = "OXFORD"
     369}, 
     370{ 
     371    vendorid    = 0x00001260; 
     372    modelid     = 0x00001000; 
     373    vendorname = "Stanton DJ"; 
     374    modelname   = "SCS.1m"; 
     375    driver      = "GENERICAVC"
    376376    xmit_max_cycles_early_transmit = 4; 
    377377    xmit_sp_dll_bw = 1.0; 
     
    379379}, 
    380380{ # added by arnonym from ffado-mixers list 
    381     vendorid = 0x0001f2; 
    382     modelid = 0x00000000; 
    383     vendorname = "Motu"; 
    384     modelname = "All of them"; 
    385     driver = 10; 
    386     mixer = "Motu"; 
     381    vendorid    = 0x0001f2; 
     382    modelid     = 0x00000000; 
     383    vendorname  = "Motu"; 
     384    modelname   = "All of them"; 
     385    driver      = "MOTU"; 
     386    mixer       = "Motu"; 
     387}, 
     388
     389    vendorid    = 0x000a35; 
     390    # Note: RME detection code compares the modelid field against the 
     391    # device's unit version since RME seem to use the configrom modelid 
     392    # for other things not necessarily related to device differentiation. 
     393    modelid     = 0x0001; 
     394    vendorname  = "RME"; 
     395    modelname   = "FireFace800"; 
     396    driver      = "RME"; 
     397    mixer       = "Rme"; 
     398}, 
     399
     400    vendorid    = 0x000a35; 
     401    # Note: RME detection code compares the modelid field against the 
     402    # device's unit version since RME seem to use the configrom modelid 
     403    # for other things not necessarily related to device differentiation. 
     404    modelid     = 0x0002; 
     405    vendorname  = "RME"; 
     406    modelname   = "FireFace400"; 
     407    driver      = "RME"; 
     408    mixer       = "Rme"; 
    387409}, 
    388410{ 
     
    391413    # device's unit version since RME seem to use the configrom modelid 
    392414    # for other things not necessarily related to device differentiation. 
    393     modelid = 0x0001; 
    394     vendorname = "RME"; 
    395     modelname = "FireFace800"; 
    396     driver = 40; 
    397     mixer = "Rme"; 
    398 }, 
    399 
    400     vendorid = 0x000a35; 
    401     # Note: RME detection code compares the modelid field against the 
    402     # device's unit version since RME seem to use the configrom modelid 
    403     # for other things not necessarily related to device differentiation. 
    404     modelid = 0x0002; 
    405     vendorname = "RME"; 
    406     modelname = "FireFace400"; 
    407     driver = 40; 
    408     mixer = "Rme"; 
    409 }, 
    410 
    411     vendorid = 0x000a35; 
    412     # Note: RME detection code compares the modelid field against the 
    413     # device's unit version since RME seem to use the configrom modelid 
    414     # for other things not necessarily related to device differentiation. 
    415     modelid = 0x0003; 
    416     vendorname = "RME"; 
    417     modelname = "FireFace UFX"; 
    418     driver = 40; 
    419     mixer = "Rme"; 
    420 }, 
    421 
    422     vendorid = 0x000a35; 
     415    modelid     = 0x0003; 
     416    vendorname  = "RME"; 
     417    modelname   = "FireFace UFX"; 
     418    driver      = "RME"; 
     419    mixer       = "Rme"; 
     420}, 
     421
     422    vendorid    = 0x000a35; 
    423423    # Note: RME detection code compares the modelid field against the 
    424424    # device's unit version since RME seem to use the configrom modelid 
     
    426426    # Unit version (0x04) provided by Florian Hanisch. 
    427427    modelid = 0x0004; 
    428     vendorname = "RME"; 
    429     modelname = "FireFace UCX"; 
    430     driver = 40
    431     mixer = "Rme"; 
    432 }, 
    433 { 
    434     vendorid = 0x000166; 
    435     modelid = 0x0001; 
    436     vendorname = "TCAT"; 
    437     modelname = "DiceII EVM (1)"; 
    438     driver = 20
    439 }, 
    440 { 
    441     vendorid = 0x000166; 
    442     modelid = 0x0002; 
    443     vendorname = "TCAT"; 
    444     modelname = "DiceII EVM (2)"; 
    445     driver = 20
    446 }, 
    447 { 
    448     vendorid = 0x000166; 
    449     modelid = 0x0004; 
    450     vendorname = "TCAT"; 
    451     modelname = "DiceII EVM (4)"; 
    452     driver = 20
    453 }, 
    454 { 
    455     vendorid = 0x000166; 
    456     modelid = 0x00000020; 
    457     vendorname = "TC Electronic"; 
    458     modelname = "Konnekt 24D"; 
    459     driver = 20
    460 }, 
    461 { 
    462     vendorid = 0x000166; 
    463     modelid = 0x00000021; 
    464     vendorname = "TC Electronic"; 
    465     modelname = "Konnekt 8"; 
    466     driver = 20
     428    vendorname = "RME"; 
     429    modelname   = "FireFace UCX"; 
     430    driver      = "RME"
     431    mixer       = "Rme"; 
     432}, 
     433{ 
     434    vendorid    = 0x000166; 
     435    modelid     = 0x0001; 
     436    vendorname = "TCAT"; 
     437    modelname   = "DiceII EVM (1)"; 
     438    driver      = "DICE"
     439}, 
     440{ 
     441    vendorid    = 0x000166; 
     442    modelid     = 0x0002; 
     443    vendorname = "TCAT"; 
     444    modelname   = "DiceII EVM (2)"; 
     445    driver      = "DICE"
     446}, 
     447{ 
     448    vendorid    = 0x000166; 
     449    modelid     = 0x0004; 
     450    vendorname = "TCAT"; 
     451    modelname   = "DiceII EVM (4)"; 
     452    driver      = "DICE"
     453}, 
     454{ 
     455    vendorid    = 0x000166; 
     456    modelid     = 0x00000020; 
     457    vendorname = "TC Electronic"; 
     458    modelname   = "Konnekt 24D"; 
     459    driver      = "DICE"
     460}, 
     461{ 
     462    vendorid    = 0x000166; 
     463    modelid     = 0x00000021; 
     464    vendorname = "TC Electronic"; 
     465    modelname   = "Konnekt 8"; 
     466    driver      = "DICE"
    467467}, 
    468468{ # Details provided by "Juanramon" in a comment post on the website 
    469     vendorid = 0x000166; 
    470     modelid = 0x00000022; 
    471     vendorname = "TC Electronic"; 
    472     modelname = "Studio Konnekt 48"; 
    473     driver = 20
    474 }, 
    475 { 
    476     vendorid = 0x000166; 
    477     modelid = 0x00000023; 
    478     vendorname = "TC Electronic"; 
    479     modelname = "Konnekt Live"; 
    480     driver = 20
    481 }, 
    482 { 
    483     vendorid = 0x000166; 
    484     modelid = 0x00000024; 
    485     vendorname = "TC Electronic"; 
    486     modelname = "Desktop Konnekt 6"; 
    487     driver = 20
     469    vendorid    = 0x000166; 
     470    modelid     = 0x00000022; 
     471    vendorname = "TC Electronic"; 
     472    modelname   = "Studio Konnekt 48"; 
     473    driver      = "DICE"
     474}, 
     475{ 
     476    vendorid    = 0x000166; 
     477    modelid     = 0x00000023; 
     478    vendorname = "TC Electronic"; 
     479    modelname   = "Konnekt Live"; 
     480    driver      = "DICE"
     481}, 
     482{ 
     483    vendorid    = 0x000166; 
     484    modelid     = 0x00000024; 
     485    vendorname = "TC Electronic"; 
     486    modelname   = "Desktop Konnekt 6"; 
     487    driver      = "DICE"
    488488}, 
    489489{  
    490     vendorid = 0x000166;  
    491     modelid = 0x00000027;  
    492     vendorname = "TC Electronic";  
    493     modelname = "ImpactTwin";  
    494     driver = 20;  
    495 },  
    496 { 
    497     vendorid = 0x000595; 
    498     modelid = 0x00000001; 
    499     vendorname = "Alesis"; 
    500     modelname = "io|14"; 
    501     driver = 20
    502 }, 
    503 { 
    504     vendorid = 0x000595; 
    505     modelid = 0x00000000; 
    506     vendorname = "Alesis"; 
    507     modelname = "Multimix16 Firewire"; 
    508     driver = 20
     490    vendorid    = 0x000166;  
     491    modelid     = 0x00000027;  
     492    vendorname = "TC Electronic";  
     493    modelname   = "ImpactTwin";  
     494    driver      = "DICE"; 
     495},  
     496{ 
     497    vendorid    = 0x000595; 
     498    modelid     = 0x00000001; 
     499    vendorname = "Alesis"; 
     500    modelname   = "io|14"; 
     501    driver      = "DICE"
     502}, 
     503{ 
     504    vendorid    = 0x000595; 
     505    modelid     = 0x00000000; 
     506    vendorname = "Alesis"; 
     507    modelname   = "Multimix16 Firewire"; 
     508    driver      = "DICE"
    509509}, 
    510510{   # Studiolive 16.4.2, provided by Johan Landman 
     
    513513    vendorname  = "PreSonus"; 
    514514    modelname   = "STUDIOLIVE_1642"; 
    515     driver      = 20; # DICE 
     515    driver      = "DICE"; 
    516516    xmit_transfer_delay = 4; 
    517517}, 
    518518{ 
    519     vendorid = 0x00130e; 
    520     modelid = 0x00000005; 
    521     vendorname = "Focusrite"; 
    522     modelname = "Saffire PRO 40"; 
    523     driver = 20
    524     mixer = "Saffire_Dice"; 
    525 }, 
    526 { 
    527     vendorid = 0x00130e; 
    528     modelid = 0x00000007; 
    529     vendorname = "Focusrite"; 
    530     modelname = "Saffire PRO 24"; 
    531     driver = 20
    532     mixer = "Saffire_Dice"; 
    533 }, 
    534 { 
    535     vendorid = 0x00130e; 
    536     modelid = 0x00000008; 
    537     vendorname = "Focusrite"; 
    538     modelname = "Saffire PRO 24 DSP"; 
    539     driver = 20
    540     mixer = "Saffire_Dice"; 
    541 }, 
    542 { 
    543     vendorid = 0x00130e; 
    544     modelid = 0x00000009; 
    545     vendorname = "Focusrite"; 
    546     modelname = "Saffire PRO 14"; 
    547     driver = 20
    548     mixer = "Saffire_Dice"; 
    549 }, 
    550 { 
    551     vendorid = 0x001C6A; 
    552     modelid = 0x00000001; 
    553     vendorname = "Weiss Engineering Ltd."; 
    554     modelname = "ADC 2"; 
    555     driver = 20
    556 }, 
    557 { 
    558     vendorid = 0x001C6A; 
    559     modelid = 0x00000002; 
    560     vendorname = "Weiss Engineering Ltd."; 
    561     modelname = "Vesta"; 
    562     driver = 20
    563 }, 
    564 { 
    565     vendorid = 0x001C6A; 
    566     modelid = 0x00000003; 
    567     vendorname = "Weiss Engineering Ltd."; 
    568     modelname = "Minerva"; 
    569     driver = 20
    570 }, 
    571 { 
    572     vendorid = 0x001C6A; 
    573     modelid = 0x00000004; 
    574     vendorname = "Weiss Engineering Ltd."; 
    575     modelname = "AFI 1"; 
    576     driver = 20
    577 }, 
    578 { 
    579     vendorid = 0x001C6A; 
    580     modelid = 0x00000005; 
    581     vendorname = "Weiss Engineering Ltd."; 
    582     modelname = "TAG DAC1"; 
    583     driver = 20
    584 }, 
    585 { 
    586     vendorid = 0x001C6A; 
    587     modelid = 0x00000006; 
    588     vendorname = "Weiss Engineering Ltd."; 
    589     modelname = "INT 202"; 
    590     driver = 20
    591 }, 
    592 { 
    593     vendorid = 0x001C6A; 
    594     modelid = 0x00000007; 
    595     vendorname = "Weiss Engineering Ltd."; 
    596     modelname = "DAC 202"; 
    597     driver = 20
     519    vendorid    = 0x00130e; 
     520    modelid     = 0x00000005; 
     521    vendorname = "Focusrite"; 
     522    modelname   = "Saffire PRO 40"; 
     523    driver      = "DICE"
     524    mixer       = "Saffire_Dice"; 
     525}, 
     526{ 
     527    vendorid    = 0x00130e; 
     528    modelid     = 0x00000007; 
     529    vendorname = "Focusrite"; 
     530    modelname   = "Saffire PRO 24"; 
     531    driver      = "DICE"
     532    mixer       = "Saffire_Dice"; 
     533}, 
     534{ 
     535    vendorid    = 0x00130e; 
     536    modelid     = 0x00000008; 
     537    vendorname = "Focusrite"; 
     538    modelname   = "Saffire PRO 24 DSP"; 
     539    driver      = "DICE"
     540    mixer       = "Saffire_Dice"; 
     541}, 
     542{ 
     543    vendorid    = 0x00130e; 
     544    modelid     = 0x00000009; 
     545    vendorname = "Focusrite"; 
     546    modelname   = "Saffire PRO 14"; 
     547    driver      = "DICE"
     548    mixer       = "Saffire_Dice"; 
     549}, 
     550{ 
     551    vendorid    = 0x001C6A; 
     552    modelid     = 0x00000001; 
     553    vendorname = "Weiss Engineering Ltd."; 
     554    modelname   = "ADC 2"; 
     555    driver      = "DICE"
     556}, 
     557{ 
     558    vendorid    = 0x001C6A; 
     559    modelid     = 0x00000002; 
     560    vendorname = "Weiss Engineering Ltd."; 
     561    modelname   = "Vesta"; 
     562    driver      = "DICE"
     563}, 
     564{ 
     565    vendorid    = 0x001C6A; 
     566    modelid     = 0x00000003; 
     567    vendorname = "Weiss Engineering Ltd."; 
     568    modelname   = "Minerva"; 
     569    driver      = "DICE"
     570}, 
     571{ 
     572    vendorid    = 0x001C6A; 
     573    modelid     = 0x00000004; 
     574    vendorname = "Weiss Engineering Ltd."; 
     575    modelname   = "AFI 1"; 
     576    driver      = "DICE"
     577}, 
     578{ 
     579    vendorid    = 0x001C6A; 
     580    modelid     = 0x00000005; 
     581    vendorname = "Weiss Engineering Ltd."; 
     582    modelname   = "TAG DAC1"; 
     583    driver      = "DICE"
     584}, 
     585{ 
     586    vendorid    = 0x001C6A; 
     587    modelid     = 0x00000006; 
     588    vendorname = "Weiss Engineering Ltd."; 
     589    modelname   = "INT 202"; 
     590    driver      = "DICE"
     591}, 
     592{ 
     593    vendorid    = 0x001C6A; 
     594    modelid     = 0x00000007; 
     595    vendorname = "Weiss Engineering Ltd."; 
     596    modelname   = "DAC 202"; 
     597    driver      = "DICE"
    598598}, 
    599599{ # Added by david@wwns.com 
    600    vendorid   = 0x001c2d; 
    601    modelid    = 0x00000001; 
    602    vendorname = "FlexRadio_Systems"; 
    603    modelname  = "Flex-5000"; 
    604    driver      = 20
    605    xmit_max_cycles_early_transmit = 4; 
     600    vendorid  = 0x001c2d; 
     601    modelid   = 0x00000001; 
     602    vendorname        = "FlexRadio_Systems"; 
     603    modelname = "Flex-5000"; 
     604    driver      = "DICE"
     605    xmit_max_cycles_early_transmit = 4; 
    606606}, 
    607607{ # Phonic HelixBoard 24 Universal (PHHB24U), provided by Steffen Klein 
    608    vendorid    = 0x001496; 
    609    modelid     = 0x000000; 
    610    vendorname  = "Phonic"; 
    611    modelname   = "HB 24U"; 
    612    driver      = 1; # BeBoB 
    613    xmit_max_cycles_early_transmit = 4; 
     608    vendorid    = 0x001496; 
     609    modelid     = 0x000000; 
     610    vendorname  = "Phonic"; 
     611    modelname   = "HB 24U"; 
     612    driver      = "BEBOB"; 
     613    xmit_max_cycles_early_transmit = 4; 
    614614}, 
    615615{ # Yamaha GO46, provided by Luis Pablo Gasparotto 
    616    vendorid = 0x0000A0DE; 
    617    modelid = 0x0010000C; 
    618    vendorname = "Yamaha"; 
    619    modelname = "GO46"; 
    620    driver = 1; # BeBoB 
    621    mixer = "Phase24Control"; 
    622    xmit_max_cycles_early_transmit = 4; 
     616    vendorid    = 0x0000A0DE; 
     617    modelid    = 0x0010000C; 
     618    vendorname = "Yamaha"; 
     619    modelname  = "GO46"; 
     620    driver      = "BEBOB"; 
     621    mixer      = "Phase24Control"; 
     622    xmit_max_cycles_early_transmit = 4; 
    623623}, 
    624624{ # DnR - Axum_FireWire_IO_card_16x16 
    625    vendorid    = 0x00000F64; 
    626    modelid     = 0x00000003; 
    627    vendorname  = "DnR"; 
    628    modelname   = "Axum_FireWire_IO_card_16x16"; 
    629    driver      = 20; # DICE 
     625    vendorid    = 0x00000F64; 
     626    modelid     = 0x00000003; 
     627    vendorname  = "DnR"; 
     628    modelname   = "Axum_FireWire_IO_card_16x16"; 
     629    driver      = "DICE"; 
    630630}, 
    631631{ # Lexicon Onix-FW810S, provided by gerradblock 
     
    634634    vendorname  = "Lexicon"; 
    635635    modelname   = "I-ONIX_FW810S"; 
    636     driver      = 20
     636    driver      = "DICE"
    637637    mixer       = "Generic_Dice_EAP"; 
    638638}, 
  • trunk/libffado/src/libutil/Configuration.cpp

    r1888 r2345  
    424424                tmp = s["modelname"]; 
    425425                vme.model_name = tmp; 
    426                 vme.driver = s["driver"]; 
     426 
     427                if (!s.lookupValue("driver", vme.driver)) 
     428                { 
     429                    std::string driver = s["driver"]; 
     430                    vme.driver = convertDriver(driver); 
     431                } 
    427432                return vme; 
    428433            } else { 
     
    487492} 
    488493 
     494unsigned int 
     495Configuration::convertDriver(const std::string& driver) const { 
     496    if(driver == "BEBOB") 
     497        return 1; 
     498    if(driver == "FIREWORKS") 
     499        return 2; 
     500    if(driver == "GENERICAVC") 
     501        return 3; 
     502    if(driver == "OXFORD") 
     503        return 4; 
     504    if(driver == "MAUDIO") 
     505        return 5; 
     506    if(driver == "MOTU") 
     507        return 10; 
     508    if(driver == "DICE") 
     509        return 20; 
     510    if(driver == "METRICHALO") 
     511        return 30; 
     512    if(driver == "RME") 
     513        return 40; 
     514    if(driver == "BOUNCE") 
     515        return 50; 
     516    if(driver == "DIGIDESIGN") 
     517        return 60; 
     518    return 0; // Unknown 
     519} 
     520 
    489521void 
    490522Configuration::ConfigFile::readFile() 
  • trunk/libffado/src/libutil/Configuration.h

    r1959 r2345  
    4242public: 
    4343    // driver ID's to be used in the config file 
     44    // Note: When changing this enum, please update convertDriver code as well! 
    4445    enum eDrivers { 
    4546        eD_Unknown     = 0, 
     
    160161    int findFileName(std::string s); 
    161162 
     163    unsigned int convertDriver(const std::string & driver) const; 
     164     
    162165    // important: keep 1-1 mapping for these two! 
    163166    // cannot use map since we need the vector order to