Changeset 929
- Timestamp:
- 03/10/08 16:15:09 (16 years ago)
- Files:
-
- trunk/libffado/src/rme/rme_avdevice.cpp (modified) (6 diffs)
- trunk/libffado/src/rme/rme_avdevice.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/rme/rme_avdevice.cpp
r908 r929 47 47 static VendorModelEntry supportedDeviceList[] = 48 48 { 49 {FW_VENDORID_RME, 0x0001, "RME", "Fireface-800"}, // RME Fireface-800 49 {FW_VENDORID_RME, 0x0001, RME_MODEL_FIREFACE800, "RME", "Fireface-800"}, 50 {FW_VENDORID_RME, 0x0002, RME_MODEL_FIREFACE400, "RME", "Fireface-400"}, 50 51 }; 51 52 … … 54 55 : FFADODevice( d, configRom ) 55 56 , m_model( NULL ) 57 , m_rme_model( RME_MODEL_NONE ) 56 58 { 57 59 debugOutput( DEBUG_LEVEL_VERBOSE, "Created Rme::RmeDevice (NodeID %d)\n", … … 68 70 { 69 71 unsigned int vendorId = configRom.getNodeVendorId(); 70 unsigned int modelId = configRom.getModelId();72 unsigned int unitVersion = configRom.getUnitVersion(); 71 73 72 74 for ( unsigned int i = 0; … … 75 77 { 76 78 if ( ( supportedDeviceList[i].vendor_id == vendorId ) 77 && ( supportedDeviceList[i]. model_id == modelId)79 && ( supportedDeviceList[i].unit_version == unitVersion ) 78 80 ) 79 81 { … … 95 97 { 96 98 unsigned int vendorId = getConfigRom().getNodeVendorId(); 97 unsigned int modelId = getConfigRom().getModelId();99 unsigned int unitVersion = getConfigRom().getUnitVersion(); 98 100 99 101 for ( unsigned int i = 0; … … 102 104 { 103 105 if ( ( supportedDeviceList[i].vendor_id == vendorId ) 104 && ( supportedDeviceList[i]. model_id == modelId)106 && ( supportedDeviceList[i].unit_version == unitVersion ) 105 107 ) 106 108 { 107 109 m_model = &(supportedDeviceList[i]); 110 m_rme_model = supportedDeviceList[i].model; 108 111 } 109 112 } trunk/libffado/src/rme/rme_avdevice.h
r908 r929 38 38 namespace Rme { 39 39 40 // Note: the values in this enum do not have to correspond to the unit 41 // version reported by the respective devices. It just so happens that they 42 // currently do for the Fireface-800 and Fireface-400. 43 enum ERmeModel { 44 RME_MODEL_NONE = 0x0000, 45 RME_MODEL_FIREFACE800 = 0x0001, 46 RME_MODEL_FIREFACE400 = 0x0002, 47 }; 48 40 49 // struct to define the supported devices 41 50 struct VendorModelEntry { 42 51 unsigned int vendor_id; 43 unsigned int model_id; 52 unsigned int unit_version; 53 enum ERmeModel model; 44 54 char *vendor_name; 45 55 char *model_name; … … 80 90 protected: 81 91 struct VendorModelEntry *m_model; 92 enum ERmeModel m_rme_model; 82 93 }; 83 94