Changeset 587

Show
Ignore:
Timestamp:
08/29/07 08:09:34 (13 years ago)
Author:
ppalmers
Message:

- moved all vendor id's to one include file
- introduced the framework for the ECHO FireWorks? platform

Files:

Legend:

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

    r576 r587  
    3030        PathOption( "PREFIX", "The prefix where ffado will be installed to.", "/usr/local" ), 
    3131        BoolOption( "ENABLE_BEBOB", "Enable/Disable the bebob part.", True ), 
    32         BoolOption( "ENABLE_GENERICAVC", "Enable/Disable the generic avc part (apple).", True ), 
     32        BoolOption( "ENABLE_FIREWORKS", "Enable/Disable the ECHO Audio FireWorks avc part.", True ), 
    3333        BoolOption( "ENABLE_MOTU", "Enable/Disable the Motu part.", False ), 
    3434        BoolOption( "ENABLE_DICE", "Enable/Disable the DICE part.", False ), 
     
    147147if env['ENABLE_ALL']: 
    148148        env['ENABLE_BEBOB'] = True 
    149         env['ENABLE_GENERICAVC'] = True 
     149        env['ENABLE_FIREWORKS'] = True 
    150150        env['ENABLE_MOTU'] = True 
    151151        env['ENABLE_DICE'] = True 
     
    171171if env['ENABLE_BEBOB']: 
    172172        env.AppendUnique( CCFLAGS=["-DENABLE_BEBOB"] ) 
    173 if env['ENABLE_GENERICAVC']: 
    174         env.AppendUnique( CCFLAGS=["-DENABLE_GENERICAVC"] ) 
     173if env['ENABLE_FIREWORKS']: 
     174        env.AppendUnique( CCFLAGS=["-DENABLE_FIREWORKS"] ) 
    175175if env['ENABLE_MOTU']: 
    176176        env.AppendUnique( CCFLAGS=["-DENABLE_MOTU"] ) 
     
    183183if env['ENABLE_BOUNCE']: 
    184184        env.AppendUnique( CCFLAGS=["-DENABLE_BOUNCE"] ) 
     185 
     186# the GenericAVC code is used by these devices 
     187if env['ENABLE_BEBOB'] or env['ENABLE_DICE'] or env['ENABLE_BOUNCE'] or env['ENABLE_FIREWORKS']: 
     188        env.AppendUnique( CCFLAGS=["-DENABLE_GENERICAVC"] ) 
    185189 
    186190# 
  • trunk/libffado/src/bebob/bebob_avdevice.cpp

    r584 r587  
    5454namespace BeBoB { 
    5555 
    56 #define FW_VENDORID_TERRATEC  0x000aac 
    57 #define FW_VENDORID_MACKIE    0x00000f 
    58 #define FW_VENDORID_APOGEE    0x0003db 
    59 #define FW_VENDORID_BRIDGECO  0x0007f5 
    60 #define FW_VENDORID_PRESONUS  0x000a92 
    61 #define FW_VENDORID_ESI       0x000f1b 
    62 #define FW_VENDORID_FOCUSRITE 0x00130e 
    63 #define FW_VENDORID_EDIROL    0x0040ab 
    64 #define FW_VENDORID_MAUDIO    0x000d6c 
    65  
    6656static GenericAVC::VendorModelEntry supportedDeviceList[] = 
    6757{ 
  • trunk/libffado/src/bounce/bounce_avdevice.cpp

    r584 r587  
    4949static VendorModelEntry supportedDeviceList[] = 
    5050{ 
    51     {0x0B0001LU, 0x0B0001LU, 0x0B0001LU, "FFADO", "Bounce"}, 
     51    {FW_VENDORID_FFADO, 0x0B0001LU, 0x0B0001LU, "FFADO", "Bounce"}, 
    5252}; 
    5353 
  • trunk/libffado/src/bounce/bounce_slave_avdevice.cpp

    r583 r587  
    3838{ 
    3939  //{vendor_id, model_id, unit_specifier_id, vendor_name, model_name}, 
    40     {0x0B0001, 0x0B0001, 0x0B0001, "FFADO", "Bounce Slave"}, 
     40    {FW_VENDORID_FFADO, 0x0B0001, 0x0B0001, "FFADO", "Bounce Slave"}, 
    4141}; 
    4242 
  • trunk/libffado/src/debugmodule/debugmodule.cpp

    r554 r587  
    3232#include <time.h> 
    3333 
    34 //#define DO_MESSAGE_BUFFER_PRINT 
     34#define DO_MESSAGE_BUFFER_PRINT 
    3535 
    3636#ifndef DO_MESSAGE_BUFFER_PRINT 
  • trunk/libffado/src/devicemanager.cpp

    r583 r587  
    4242#ifdef ENABLE_GENERICAVC 
    4343    #include "genericavc/avc_avdevice.h" 
     44#endif 
     45 
     46#ifdef ENABLE_FIREWORKS 
     47    #include "fireworks/fireworks_device.h" 
    4448#endif 
    4549 
     
    322326} 
    323327 
    324  
    325328FFADODevice* 
    326329DeviceManager::getDriverForDevice( std::auto_ptr<ConfigRom>( configRom ), 
     
    338341    if ( GenericAVC::AvDevice::probe( *configRom.get() ) ) { 
    339342        return GenericAVC::AvDevice::createDevice( *m_1394Service, configRom ); 
     343    } 
     344#endif 
     345 
     346#ifdef ENABLE_FIREWORKS 
     347    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying ECHO Audio FireWorks...\n" ); 
     348    if ( FireWorks::Device::probe( *configRom.get() ) ) { 
     349        return FireWorks::Device::createDevice( *m_1394Service, configRom ); 
    340350    } 
    341351#endif 
  • trunk/libffado/src/dice/dice_avdevice.cpp

    r584 r587  
    4848{ 
    4949    // vendor id, model id, vendor name, model name 
    50     {0x00000166, 0x00000002, "TCAT", "DiceII EVM"}, 
     50    {FW_VENDORID_TCAT, 0x00000002, "TCAT", "DiceII EVM"}, 
    5151}; 
    5252 
  • trunk/libffado/src/ffadodevice.h

    r583 r587  
    2828#include "libutil/OptionContainer.h" 
    2929#include "libcontrol/BasicElements.h" 
     30 
     31#include "libieee1394/vendor_model_ids.h" 
    3032 
    3133class ConfigRom; 
  • trunk/libffado/src/genericavc/avc_avdevice.cpp

    r584 r587  
    5353static VendorModelEntry supportedDeviceList[] = 
    5454{ 
    55     {0x001486, 0x00000af2, "Echo", "AudioFire2"}, 
     55 
    5656}; 
    5757 
  • trunk/libffado/src/maudio/maudio_avdevice.cpp

    r584 r587  
    5555static VendorModelEntry supportedDeviceList[] = 
    5656{ 
    57     //{0x0007f5, 0x00010048, "BridgeCo", "RD Audio1", "refdesign.xml"}, 
     57    //{FW_VENDORID_BRIDGECO, 0x00010048, "BridgeCo", "RD Audio1", "refdesign.xml"}, 
    5858 
    59     {0x000d6c, 0x00010046, "M-Audio", "FW 410", "fw410.xml"}, 
    60     {0x000d6c, 0x00010058, "M-Audio", "FW 410", "fw410.xml"},       // Version 5.10.0.5036 
    61     {0x000d6c, 0x00010060, "M-Audio", "FW Audiophile", "fwap.xml"}, 
     59    {FW_VENDORID_MAUDIO, 0x00010046, "M-Audio", "FW 410", "fw410.xml"}, 
     60    {FW_VENDORID_MAUDIO, 0x00010058, "M-Audio", "FW 410", "fw410.xml"},       // Version 5.10.0.5036 
     61    {FW_VENDORID_MAUDIO, 0x00010060, "M-Audio", "FW Audiophile", "fwap.xml"}, 
    6262}; 
    6363 
  • trunk/libffado/src/motu/motu_avdevice.cpp

    r584 r587  
    5252{ 
    5353//  {vendor_id, model_id, unit_version, unit_specifier_id, model, vendor_name,model_name} 
    54     {0x000001f2, 0, 0x00000003, 0x000001f2, MOTUFW_MODEL_828mkII, "MOTU", "828MkII"}, 
    55     {0x000001f2, 0, 0x00000009, 0x000001f2, MOTUFW_MODEL_TRAVELER, "MOTU", "Traveler"}, 
     54    {FW_VENDORID_MOTU, 0, 0x00000003, 0x000001f2, MOTUFW_MODEL_828mkII, "MOTU", "828MkII"}, 
     55    {FW_VENDORID_MOTU, 0, 0x00000009, 0x000001f2, MOTUFW_MODEL_TRAVELER, "MOTU", "Traveler"}, 
    5656}; 
    5757 
  • trunk/libffado/src/rme/rme_avdevice.cpp

    r584 r587  
    4747static VendorModelEntry supportedDeviceList[] = 
    4848{ 
    49     {0x00000a35, 0x0001, "RME", "Fireface-800"},  // RME Fireface-800 
     49    {FW_VENDORID_RME, 0x0001, "RME", "Fireface-800"},  // RME Fireface-800 
    5050}; 
    5151 
  • trunk/libffado/src/SConscript

    r584 r587  
    9898' ) 
    9999 
     100fireworks_source =  env.Split( '\ 
     101        fireworks/fireworks_device.cpp \ 
     102        fireworks/audiofire/audiofire_device.cpp \ 
     103' ) 
     104 
    100105motu_source = env.Split( '\ 
    101106        motu/motu_avdevice.cpp \ 
     
    132137if env['ENABLE_BEBOB']: 
    133138        source += bebob_source 
    134 if env['ENABLE_GENERICAVC']: 
    135         source += genericavc_source 
     139if env['ENABLE_FIREWORKS']: 
     140        source += fireworks_source 
    136141if env['ENABLE_MOTU']: 
    137142        source += motu_source 
     
    145150        source += bounce_source 
    146151 
    147 if env['ENABLE_BEBOB'] or env['ENABLE_GENERICAVC'] or env['ENABLE_DICE'] or env['ENABLE_BOUNCE']: 
     152if env['ENABLE_BEBOB'] or env['ENABLE_DICE'] or env['ENABLE_BOUNCE'] or env['ENABLE_FIREWORKS']: 
    148153        source += amdtp_source 
     154        source += genericavc_source 
    149155 
    150156env1.MergeFlags( "-lrt" )