diff options
| author | Josh Blum <josh@joshknows.com> | 2012-06-07 14:00:36 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-06-07 14:00:36 -0700 |
| commit | 49d4f8e479534d856a242c2271d1b930487aea6c (patch) | |
| tree | 1c365075d11e6c311b80fb7f95daeceb1f22c3e4 | |
| parent | 98074d0c29e818f3aa08edf451f4e7351116deae (diff) | |
| download | uhd-49d4f8e479534d856a242c2271d1b930487aea6c.tar.gz uhd-49d4f8e479534d856a242c2271d1b930487aea6c.tar.bz2 uhd-49d4f8e479534d856a242c2271d1b930487aea6c.zip | |
usrp2: fix fw bug for spi transact (order of operations)
| -rw-r--r-- | firmware/zpu/apps/txrx_uhd.c | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/zpu/apps/txrx_uhd.c b/firmware/zpu/apps/txrx_uhd.c index 0142aa3d4..30efc9518 100644 --- a/firmware/zpu/apps/txrx_uhd.c +++ b/firmware/zpu/apps/txrx_uhd.c @@ -181,8 +181,8 @@ static void handle_udp_ctrl_packet( ctrl_data_in->data.spi_args.dev, //which device ctrl_data_in->data.spi_args.data, //32 bit data ctrl_data_in->data.spi_args.num_bits, //length in bits - (ctrl_data_in->data.spi_args.mosi_edge == USRP2_CLK_EDGE_RISE)? SPI_PUSH_FALL : SPI_PUSH_RISE | - (ctrl_data_in->data.spi_args.miso_edge == USRP2_CLK_EDGE_RISE)? SPI_LATCH_RISE : SPI_LATCH_FALL + ((ctrl_data_in->data.spi_args.mosi_edge == USRP2_CLK_EDGE_RISE)? SPI_PUSH_FALL : SPI_PUSH_RISE) | + ((ctrl_data_in->data.spi_args.miso_edge == USRP2_CLK_EDGE_RISE)? SPI_LATCH_RISE : SPI_LATCH_FALL) ); //load output diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index acd5d1f3a..8fb8a0865 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 2 +#define USRP2_FW_VER_MINOR 3 //used to differentiate control packets over data port #define USRP2_INVALID_VRT_HEADER 0 |