U2P: Ripped out the mboard_rev_t structure in favor of an enum in usrp2_regs.hpp and some logic.

Also change ethernet.c to move generic code to eth_lib.

1 files changed, 5 insertions, 5 deletions

diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index 533534bd0..8680c285a 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -59,7 +59,7 @@ public:
         }
 
         //power-up adc
-        if(!_iface->get_hw_rev().is_usrp2p()) { //if we're on a USRP2
+        if(!_iface->is_usrp2p()) { //if we're on a USRP2
           _iface->poke32(_iface->regs.misc_ctrl_adc, U2_FLAG_MISC_CTRL_ADC_ON);
         } else { //we're on a USRP2+
           _ads62p44_regs.reset = 1;
@@ -77,7 +77,7 @@ public:
         this->send_ad9777_reg(0);
 
         //power-down adc
-        if(!_iface->get_hw_rev().is_usrp2p()) { //if we're on a USRP2
+        if(!_iface->is_usrp2p()) { //if we're on a USRP2
           _iface->poke32(_iface->regs.misc_ctrl_adc, U2_FLAG_MISC_CTRL_ADC_OFF);
         } else { //we're on a USRP2+
           //send a global power-down to the ADC here... it will get lifted on reset
@@ -87,21 +87,21 @@ public:
     }
 
     void set_rx_digital_gain(float gain) {  //fine digital gain
-      if(_iface->get_hw_rev().is_usrp2p()) {
+      if(_iface->is_usrp2p()) {
         _ads62p44_regs.fine_gain = int(gain/0.5);
         this->send_ads62p44_reg(0x17);
       } else UHD_THROW_INVALID_CODE_PATH(); //should never have been called for USRP2
     }
 
     void set_rx_digital_fine_gain(float gain) { //gain correction      
-      if(_iface->get_hw_rev().is_usrp2p()) {
+      if(_iface->is_usrp2p()) {
         _ads62p44_regs.gain_correction = int(gain / 0.05);
         this->send_ads62p44_reg(0x1A);
       } else UHD_THROW_INVALID_CODE_PATH(); //should never have been called for USRP2
     }
 
     void set_rx_analog_gain(bool gain) { //turns on/off analog 3.5dB preamp
-      if(_iface->get_hw_rev().is_usrp2p()) {
+      if(_iface->is_usrp2p()) {
         _ads62p44_regs.coarse_gain = gain ? ads62p44_regs_t::COARSE_GAIN_3_5DB : ads62p44_regs_t::COARSE_GAIN_0DB;
         this->send_ads62p44_reg(0x14);
       } else UHD_THROW_INVALID_CODE_PATH();