diff options
| author | Josh Blum <josh@joshknows.com> | 2013-08-23 18:21:45 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2013-08-23 18:21:45 -0700 |
| commit | 970afec3803677c739ecef0e37e45f77323820dd (patch) | |
| tree | de2ddf65da970ccbec6cef12142d41a1c93b8439 | |
| parent | 6881172a421b2d3bfd489eef04599d6439b1ea35 (diff) | |
| parent | 7b9a7e74dcc4b40bcedc59695c827e4d1d1e7d59 (diff) | |
| download | uhd-970afec3803677c739ecef0e37e45f77323820dd.tar.gz uhd-970afec3803677c739ecef0e37e45f77323820dd.tar.bz2 uhd-970afec3803677c739ecef0e37e45f77323820dd.zip | |
Merge branch 'maint'
| -rw-r--r-- | firmware/zpu/lib/memory_map.h | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/zpu/lib/memory_map.h b/firmware/zpu/lib/memory_map.h index 4290ee20a..b50a4433e 100644 --- a/firmware/zpu/lib/memory_map.h +++ b/firmware/zpu/lib/memory_map.h @@ -300,7 +300,7 @@ typedef struct { // --- VITA RX CTRL regs --- typedef struct { - volatile uint32_t _pad[3]; + volatile uint32_t _pad[8]; volatile uint32_t clear; } sr_rx_ctrl_t; diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index 7e3de1497..337a1ad6f 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 10 #define USRP2_FW_COMPAT_NUM 12 -#define USRP2_FW_VER_MINOR 3 +#define USRP2_FW_VER_MINOR 4 //used to differentiate control packets over data port #define USRP2_INVALID_VRT_HEADER 0 |