Changeset 2336
- Timestamp:
- 06/21/13 05:41:56 (11 years ago)
- Files:
-
- trunk/libffado/src/rme/rme_avdevice.cpp (modified) (3 diffs)
- trunk/libffado/src/rme/rme_avdevice.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/rme/rme_avdevice.cpp
r2319 r2336 55 55 #define RME_UNITVERSION_FF800 0x0001 56 56 #define RME_UNITVERSION_FF400 0x0002 57 #define RME_UNITVERSION_UFX 0x0003 58 #define RME_UNITVERSION_UCX 0x0004 57 59 58 60 namespace Rme { … … 82 84 : FFADODevice( d, configRom ) 83 85 , m_rme_model( RME_MODEL_NONE ) 86 , settings( NULL ) 87 , tco_settings( NULL ) 88 , dev_config ( NULL ) 84 89 , num_channels( 0 ) 85 90 , frames_per_packet( 0 ) … … 370 375 } 371 376 372 if (unitVersion == RME_UNITVERSION_FF800) {373 m_rme_model = RME_MODEL_FIREFACE800;374 } else375 if (unitVersion == RME_MODEL_FIREFACE400) {376 m_rme_model = RME_MODEL_FIREFACE400;377 } else {377 switch (unitVersion) { 378 case RME_UNITVERSION_FF800: m_rme_model = RME_MODEL_FIREFACE800; break; 379 case RME_UNITVERSION_FF400: m_rme_model = RME_MODEL_FIREFACE400; break; 380 case RME_UNITVERSION_UFX: m_rme_model = RME_MODEL_FIREFACE_UFX; break; 381 case RME_UNITVERSION_UCX: m_rme_model = RME_MODEL_FIREFACE_UCX; break; 382 default: 378 383 debugError("Unsupported model\n"); 379 384 return false; 385 } 386 387 if (m_rme_model==RME_MODEL_FIREFACE_UFX || m_rme_model==RME_MODEL_FIREFACE_UCX) { 388 debugError("Fireface UFX/UCX are not currently supported\n"); 389 return false; 380 390 } 381 391 trunk/libffado/src/rme/rme_avdevice.h
r2309 r2336 51 51 RME_MODEL_FIREFACE800 = 0x0001, 52 52 RME_MODEL_FIREFACE400 = 0x0002, 53 RME_MODEL_FIREFACE_UFX = 0x0003, 54 RME_MODEL_FIREFACE_UCX = 0x0004, 53 55 }; 54 56