diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/usrp/n230/n230_frontend_ctrl.cpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/n230/n230_frontend_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/n230/n230_frontend_ctrl.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/host/lib/usrp/n230/n230_frontend_ctrl.cpp b/host/lib/usrp/n230/n230_frontend_ctrl.cpp index e0820d9b2..3d81721ec 100644 --- a/host/lib/usrp/n230/n230_frontend_ctrl.cpp +++ b/host/lib/usrp/n230/n230_frontend_ctrl.cpp @@ -27,29 +27,29 @@ namespace uhd { namespace usrp { namespace n230 { /* ATR Control Bits */ -static const boost::uint32_t TX_ENABLE = (1 << 7); -static const boost::uint32_t SFDX_RX = (1 << 6); -static const boost::uint32_t SFDX_TX = (1 << 5); -static const boost::uint32_t SRX_RX = (1 << 4); -static const boost::uint32_t SRX_TX = (1 << 3); -static const boost::uint32_t LED_RX = (1 << 2); -static const boost::uint32_t LED_TXRX_RX = (1 << 1); -static const boost::uint32_t LED_TXRX_TX = (1 << 0); +static const uint32_t TX_ENABLE = (1 << 7); +static const uint32_t SFDX_RX = (1 << 6); +static const uint32_t SFDX_TX = (1 << 5); +static const uint32_t SRX_RX = (1 << 4); +static const uint32_t SRX_TX = (1 << 3); +static const uint32_t LED_RX = (1 << 2); +static const uint32_t LED_TXRX_RX = (1 << 1); +static const uint32_t LED_TXRX_TX = (1 << 0); /* ATR State Definitions. */ -static const boost::uint32_t STATE_OFF = 0x00; -static const boost::uint32_t STATE_RX_RX2 = (SFDX_RX +static const uint32_t STATE_OFF = 0x00; +static const uint32_t STATE_RX_RX2 = (SFDX_RX | SFDX_TX | LED_RX); -static const boost::uint32_t STATE_RX_TXRX = (SRX_RX +static const uint32_t STATE_RX_TXRX = (SRX_RX | SRX_TX | LED_TXRX_RX); -static const boost::uint32_t STATE_FDX_TXRX = (TX_ENABLE +static const uint32_t STATE_FDX_TXRX = (TX_ENABLE | SFDX_RX | SFDX_TX | LED_TXRX_TX | LED_RX); -static const boost::uint32_t STATE_TX_TXRX = (TX_ENABLE +static const uint32_t STATE_TX_TXRX = (TX_ENABLE | SFDX_RX | SFDX_TX | LED_TXRX_TX); |