diff options
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/types/clock_config.hpp | 14 | ||||
| -rw-r--r-- | host/include/uhd/types/io_type.hpp | 10 | ||||
| -rw-r--r-- | host/include/uhd/types/otw_type.hpp | 8 | ||||
| -rw-r--r-- | host/include/uhd/types/tune_request.hpp | 6 | ||||
| -rw-r--r-- | host/include/uhd/usrp/dboard_iface.hpp | 24 |
5 files changed, 31 insertions, 31 deletions
diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp index 7301d43a0..577416d77 100644 --- a/host/include/uhd/types/clock_config.hpp +++ b/host/include/uhd/types/clock_config.hpp @@ -41,17 +41,17 @@ namespace uhd{ //------ advanced usage --------// enum ref_source_t { - REF_AUTO = 'a', //automatic (device specific) - REF_INT = 'i', //internal reference - REF_SMA = 's', //external sma port + REF_AUTO = int('a'), //automatic (device specific) + REF_INT = int('i'), //internal reference + REF_SMA = int('s'), //external sma port } ref_source; enum pps_source_t { - PPS_INT = 'i', //there is no internal - PPS_SMA = 's', //external sma port + PPS_INT = int('i'), //there is no internal + PPS_SMA = int('s'), //external sma port } pps_source; enum pps_polarity_t { - PPS_NEG = 'n', //negative edge - PPS_POS = 'p' //positive edge + PPS_NEG = int('n'), //negative edge + PPS_POS = int('p') //positive edge } pps_polarity; clock_config_t(void); }; diff --git a/host/include/uhd/types/io_type.hpp b/host/include/uhd/types/io_type.hpp index 990d701f9..ace643abc 100644 --- a/host/include/uhd/types/io_type.hpp +++ b/host/include/uhd/types/io_type.hpp @@ -34,15 +34,15 @@ namespace uhd{ */ enum tid_t{ //! Custom type (technically unsupported by implementation) - CUSTOM_TYPE = '?', + CUSTOM_TYPE = int('?'), //! Complex floating point (64-bit floats) range [-1.0, +1.0] - COMPLEX_FLOAT64 = 'd', + COMPLEX_FLOAT64 = int('d'), //! Complex floating point (32-bit floats) range [-1.0, +1.0] - COMPLEX_FLOAT32 = 'f', + COMPLEX_FLOAT32 = int('f'), //! Complex signed integer (16-bit integers) range [-32768, +32767] - COMPLEX_INT16 = 's', + COMPLEX_INT16 = int('s'), //! Complex signed integer (8-bit integers) range [-128, 127] - COMPLEX_INT8 = 'b' + COMPLEX_INT8 = int('b') }; /*! diff --git a/host/include/uhd/types/otw_type.hpp b/host/include/uhd/types/otw_type.hpp index 8e3e65d78..11a6af38e 100644 --- a/host/include/uhd/types/otw_type.hpp +++ b/host/include/uhd/types/otw_type.hpp @@ -49,10 +49,10 @@ namespace uhd{ * Constants for byte order (borrowed from numpy's dtype) */ enum /*bo_t*/ { - BO_NATIVE = '=', - BO_LITTLE_ENDIAN = '<', - BO_BIG_ENDIAN = '>', - BO_NOT_APPLICABLE = '|' + BO_NATIVE = int('='), + BO_LITTLE_ENDIAN = int('<'), + BO_BIG_ENDIAN = int('>'), + BO_NOT_APPLICABLE = int('|') } byteorder; /*! diff --git a/host/include/uhd/types/tune_request.hpp b/host/include/uhd/types/tune_request.hpp index 942b93251..b59f37c2e 100644 --- a/host/include/uhd/types/tune_request.hpp +++ b/host/include/uhd/types/tune_request.hpp @@ -51,11 +51,11 @@ namespace uhd{ //! Policy options for tunable elements in the RF chain. enum policy_t { //! Do not set this argument, use current setting. - POLICY_NONE = 'N', + POLICY_NONE = int('N'), //! Automatically determine the argument's value. - POLICY_AUTO = 'A', + POLICY_AUTO = int('A'), //! Use the argument's value for the setting. - POLICY_MANUAL = 'M' + POLICY_MANUAL = int('M') }; /*! diff --git a/host/include/uhd/usrp/dboard_iface.hpp b/host/include/uhd/usrp/dboard_iface.hpp index 1ec0fa1ff..ca5de5c2f 100644 --- a/host/include/uhd/usrp/dboard_iface.hpp +++ b/host/include/uhd/usrp/dboard_iface.hpp @@ -62,30 +62,30 @@ public: //! tells the host which unit to use enum unit_t{ - UNIT_RX = 'r', - UNIT_TX = 't' + UNIT_RX = int('r'), + UNIT_TX = int('t') }; //! possible atr registers enum atr_reg_t{ - ATR_REG_IDLE = 'i', - ATR_REG_TX_ONLY = 't', - ATR_REG_RX_ONLY = 'r', - ATR_REG_FULL_DUPLEX = 'f' + ATR_REG_IDLE = int('i'), + ATR_REG_TX_ONLY = int('t'), + ATR_REG_RX_ONLY = int('r'), + ATR_REG_FULL_DUPLEX = int('f') }; //! aux dac selection enums (per unit) enum aux_dac_t{ - AUX_DAC_A = 'a', - AUX_DAC_B = 'b', - AUX_DAC_C = 'c', - AUX_DAC_D = 'd' + AUX_DAC_A = int('a'), + AUX_DAC_B = int('b'), + AUX_DAC_C = int('c'), + AUX_DAC_D = int('d') }; //! aux adc selection enums (per unit) enum aux_adc_t{ - AUX_ADC_A = 'a', - AUX_ADC_B = 'b' + AUX_ADC_A = int('a'), + AUX_ADC_B = int('b') }; /*! |