diff options
| -rw-r--r-- | firmware/zpu/lib/memory_map.h | 11 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/firmware/zpu/lib/memory_map.h b/firmware/zpu/lib/memory_map.h index 8d5de794e..75727bb23 100644 --- a/firmware/zpu/lib/memory_map.h +++ b/firmware/zpu/lib/memory_map.h @@ -126,7 +126,7 @@ typedef struct { typedef struct { volatile uint32_t _padding[8]; volatile uint32_t status; - volatile uint32_t hw_config; // see below + volatile uint32_t _unused; volatile uint32_t time64_secs_rb; volatile uint32_t time64_ticks_rb; volatile uint32_t compat_num; @@ -135,18 +135,13 @@ typedef struct { #define router_status ((router_status_t *) READBACK_BASE) -// The hw_config register - -#define HWC_SIMULATION 0x80000000 -#define HWC_WB_CLK_DIV_MASK 0x0000000f - /*! * \brief return non-zero if we're running under the simulator */ inline static int hwconfig_simulation_p(void) { - return router_status->hw_config & HWC_SIMULATION; + return 0; } /*! @@ -156,7 +151,7 @@ hwconfig_simulation_p(void) inline static int hwconfig_wishbone_divisor(void) { - return router_status->hw_config & HWC_WB_CLK_DIV_MASK; + return 2; } /////////////////////////////////////////////////// diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index 83f4a1048..46a57fc95 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -32,7 +32,7 @@ extern "C" { //fpga and firmware compatibility numbers #define USRP2_FPGA_COMPAT_NUM 7 #define USRP2_FW_COMPAT_NUM 10 -#define USRP2_FW_VER_MINOR 1 +#define USRP2_FW_VER_MINOR 2 //used to differentiate control packets over data port #define USRP2_INVALID_VRT_HEADER 0 |