Changeset 1719
- Timestamp:
- 11/22/09 05:36:34 (14 years ago)
- Files:
-
- trunk/libffado/src/dice/dice_avdevice.h (modified) (2 diffs)
- trunk/libffado/src/dice/focusrite/saffire_pro24.cpp (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/dice/dice_avdevice.h
r1655 r1719 361 361 362 362 void show(); 363 void showApplication(); 363 364 enum eWaitReturn operationBusy(); 364 365 enum eWaitReturn waitForOperationEnd(int max_wait_time_ms = 100); … … 404 405 bool commandHelper(fb_quadlet_t cmd); 405 406 407 public: 406 408 bool readReg(enum eRegBase, unsigned offset, quadlet_t *); 407 409 bool writeReg(enum eRegBase, unsigned offset, quadlet_t); trunk/libffado/src/dice/focusrite/saffire_pro24.cpp
r1718 r1719 31 31 32 32 SaffirePro24::SaffirePro24( DeviceManager& d, 33 33 std::auto_ptr<ConfigRom>( configRom )) 34 34 : Dice::Device(d , configRom) 35 35 , m_ch1(NULL) … … 42 42 SaffirePro24::~SaffirePro24() 43 43 { 44 m_eap->deleteElement(m_ch1);45 m_eap->deleteElement(m_ch2);44 getEAP()->deleteElement(m_ch1); 45 getEAP()->deleteElement(m_ch2); 46 46 if (m_ch1) delete m_ch1; 47 47 if (m_ch2) delete m_ch2; 48 48 } 49 49 50 bool SaffirePro24::discover() { 50 51 if (Dice::Device::discover()) { 51 52 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)); 53 54 hexDumpQuadlets(tmp, 2); 54 55 … … 65 66 return false; 66 67 } 68 67 69 void SaffirePro24::showDevice() 68 70 { … … 70 72 Dice::Device::showDevice(); 71 73 } 74 72 75 bool 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() ); 74 77 } 78 75 79 std::string SaffirePro24::getNickName() { 76 80 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 ); 78 82 return std::string( name ); 79 83 } 80 81 84 82 85 SaffirePro24::LineInstSwitch::LineInstSwitch(Dice::Device::EAP* eap, std::string name, size_t offset, int activevalue ) … … 91 94 m_selected = (m_state_tmp&m_activevalue)?1:0; 92 95 } 96 93 97 int SaffirePro24::LineInstSwitch::selected() { 94 98 return m_selected; 95 99 } 100 96 101 bool SaffirePro24::LineInstSwitch::select(int n) { 97 102 if ( n != m_selected ) {