From: <tr...@ff...> - 2009-07-23 11:18:47
|
Author: jwoithe Date: 2009-07-23 04:18:42 -0700 (Thu, 23 Jul 2009) New Revision: 1604 Modified: trunk/libffado/src/rme/rme_avdevice.cpp Log: RME: remove some macros which are unlikely to be used anymore. Modified: trunk/libffado/src/rme/rme_avdevice.cpp =================================================================== --- trunk/libffado/src/rme/rme_avdevice.cpp 2009-07-23 11:12:27 UTC (rev 1603) +++ trunk/libffado/src/rme/rme_avdevice.cpp 2009-07-23 11:18:42 UTC (rev 1604) @@ -76,21 +76,6 @@ } #endif -// Template for an RME Device object method which intelligently returns a -// register or value applicable to the connected model and warns if something -// isn't quite right. -#define MODEL_SELECTOR(_name,_ff400_arg,_ff800_arg) \ -unsigned long long int \ -Device::_name() { \ - switch (m_rme_model) { \ - case RME_MODEL_FIREFACE400: return _ff400_arg; \ - case RME_MODEL_FIREFACE800: return _ff800_arg; \ - default: \ - debugOutput( DEBUG_LEVEL_WARNING, "Bad RME model %d\n", m_rme_model ); \ - } \ - return 0xffffffffffffffffLL; \ -} - Device::Device( DeviceManager& d, std::auto_ptr<ConfigRom>( configRom )) : FFADODevice( d, configRom ) @@ -112,15 +97,6 @@ } -MODEL_SELECTOR(cmd_buffer_addr, RME_FF400_CMD_BUFFER, RME_FF800_CMD_BUFFER) -MODEL_SELECTOR(stream_init_reg, RME_FF400_STREAM_INIT_REG, RME_FF800_STREAM_INIT_REG) -MODEL_SELECTOR(stream_start_reg, RME_FF400_STREAM_START_REG, RME_FF800_STREAM_START_REG) -MODEL_SELECTOR(stream_end_reg, RME_FF400_STREAM_END_REG, RME_FF800_STREAM_END_REG) -MODEL_SELECTOR(flash_settings_addr, RME_FF400_FLASH_SETTINGS_ADDR, RME_FF800_FLASH_SETTINGS_ADDR) -MODEL_SELECTOR(flash_mixer_vol_addr, RME_FF400_FLASH_MIXER_VOLUME_ADDR, RME_FF800_FLASH_MIXER_VOLUME_ADDR) -MODEL_SELECTOR(flash_mixer_pan_addr, RME_FF400_FLASH_MIXER_PAN_ADDR, RME_FF800_FLASH_MIXER_PAN_ADDR) -MODEL_SELECTOR(flash_mixer_hw_addr, RME_FF400_FLASH_MIXER_HW_ADDR, RME_FF800_FLASH_MIXER_HW_ADDR) - bool Device::probe( Util::Configuration& c, ConfigRom& configRom, bool generic ) { |