Changeset 2336

Show
Ignore:
Timestamp:
06/21/13 05:41:56 (11 years ago)
Author:
jwoithe
Message:

rme: fix issues at shutdown when an unsupported RME device is detected. Create model identifiers for the UFX and UCX.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/rme/rme_avdevice.cpp

    r2319 r2336  
    5555#define RME_UNITVERSION_FF800  0x0001 
    5656#define RME_UNITVERSION_FF400  0x0002 
     57#define RME_UNITVERSION_UFX    0x0003 
     58#define RME_UNITVERSION_UCX    0x0004 
    5759 
    5860namespace Rme { 
     
    8284    : FFADODevice( d, configRom ) 
    8385    , m_rme_model( RME_MODEL_NONE ) 
     86    , settings( NULL ) 
     87    , tco_settings( NULL ) 
     88    , dev_config ( NULL ) 
    8489    , num_channels( 0 ) 
    8590    , frames_per_packet( 0 ) 
     
    370375    } 
    371376 
    372     if (unitVersion == RME_UNITVERSION_FF800) { 
    373         m_rme_model = RME_MODEL_FIREFACE800
    374     } else 
    375     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: 
    378383        debugError("Unsupported model\n"); 
    379384        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; 
    380390    } 
    381391 
  • trunk/libffado/src/rme/rme_avdevice.h

    r2309 r2336  
    5151    RME_MODEL_FIREFACE800   = 0x0001, 
    5252    RME_MODEL_FIREFACE400   = 0x0002, 
     53    RME_MODEL_FIREFACE_UFX  = 0x0003, 
     54    RME_MODEL_FIREFACE_UCX  = 0x0004, 
    5355}; 
    5456