Changeset 1719

Show
Ignore:
Timestamp:
11/22/09 05:36:34 (14 years ago)
Author:
ppalmers
Message:

fix some compilation issues with the PRO24 code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/dice/dice_avdevice.h

    r1655 r1719  
    361361 
    362362        void show(); 
     363        void showApplication(); 
    363364        enum eWaitReturn operationBusy(); 
    364365        enum eWaitReturn waitForOperationEnd(int max_wait_time_ms = 100); 
     
    404405        bool commandHelper(fb_quadlet_t cmd); 
    405406 
     407    public: 
    406408        bool readReg(enum eRegBase, unsigned offset, quadlet_t *); 
    407409        bool writeReg(enum eRegBase, unsigned offset, quadlet_t); 
  • trunk/libffado/src/dice/focusrite/saffire_pro24.cpp

    r1718 r1719  
    3131 
    3232SaffirePro24::SaffirePro24( DeviceManager& d, 
    33                                         std::auto_ptr<ConfigRom>( configRom )) 
     33                            std::auto_ptr<ConfigRom>( configRom )) 
    3434    : Dice::Device(d , configRom) 
    3535    , m_ch1(NULL) 
     
    4242SaffirePro24::~SaffirePro24() 
    4343{ 
    44     m_eap->deleteElement(m_ch1); 
    45     m_eap->deleteElement(m_ch2); 
     44    getEAP()->deleteElement(m_ch1); 
     45    getEAP()->deleteElement(m_ch2); 
    4646    if (m_ch1) delete m_ch1; 
    4747    if (m_ch2) delete m_ch2; 
    4848} 
     49 
    4950bool SaffirePro24::discover() { 
    5051    if (Dice::Device::discover()) { 
    5152        fb_quadlet_t* tmp = (fb_quadlet_t *)calloc(2, sizeof(fb_quadlet_t)); 
    52         m_eap->readRegBlock(Dice::Device::EAP::eRT_Application, 0x58, tmp, 2*sizeof(fb_quadlet_t)); 
     53        getEAP()->readRegBlock(Dice::Device::EAP::eRT_Application, 0x58, tmp, 2*sizeof(fb_quadlet_t)); 
    5354        hexDumpQuadlets(tmp, 2); 
    5455 
     
    6566    return false; 
    6667} 
     68 
    6769void SaffirePro24::showDevice() 
    6870{ 
     
    7072    Dice::Device::showDevice(); 
    7173} 
     74 
    7275bool SaffirePro24::setNickName( std::string name ) { 
    73     return m_eap->writeRegBlock( Dice::Device::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name.c_str(), name.size() ); 
     76    return getEAP()->writeRegBlock( Dice::Device::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name.c_str(), name.size() ); 
    7477} 
     78 
    7579std::string SaffirePro24::getNickName() { 
    7680    char name[16]; 
    77     m_eap->readRegBlock( Dice::Device::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name, 16 ); 
     81    getEAP()->readRegBlock( Dice::Device::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name, 16 ); 
    7882    return std::string( name ); 
    7983} 
    80  
    8184 
    8285SaffirePro24::LineInstSwitch::LineInstSwitch(Dice::Device::EAP* eap, std::string name, size_t offset, int activevalue ) 
     
    9194    m_selected = (m_state_tmp&m_activevalue)?1:0; 
    9295} 
     96 
    9397int SaffirePro24::LineInstSwitch::selected() { 
    9498    return m_selected; 
    9599} 
     100 
    96101bool SaffirePro24::LineInstSwitch::select(int n) { 
    97102    if ( n != m_selected ) {