summaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2010-07-28 15:19:29 -0700
committerNick Foster <nick@nerdnetworks.org>2010-07-28 15:19:29 -0700
commite5722d61aa2b523991f5388d9bda0f56f43f79bd (patch)
tree816dbb2a6906d883f833c12a3e8a747aba0338ee /host
parentf0c6522efdf1899b654f48aa339398a1fc9fa73f (diff)
downloaduhd-e5722d61aa2b523991f5388d9bda0f56f43f79bd.tar.gz
uhd-e5722d61aa2b523991f5388d9bda0f56f43f79bd.tar.bz2
uhd-e5722d61aa2b523991f5388d9bda0f56f43f79bd.zip
ADC SPI works. ADC gain interface "works".
Diffstat (limited to 'host')
-rw-r--r--host/lib/usrp/usrp2/codec_ctrl.cpp2
-rw-r--r--host/lib/usrp/usrp2/usrp2_iface.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index b8f1df799..2e645dcec 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -120,7 +120,7 @@ private:
void send_ads62p44_reg(boost::uint8_t addr) {
boost::uint16_t reg = _ads62p44_regs.get_write_reg(addr);
_iface->transact_spi(
- SPI_SS_ADS62P44, spi_config_t::EDGE_RISE,
+ SPI_SS_ADS62P44, spi_config_t::EDGE_FALL,
reg, 16, false /*no rb*/
);
}
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 17ba75d85..2a380dc44 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -104,7 +104,7 @@ public:
//setup the out data
usrp2_ctrl_data_t out_data;
out_data.id = htonl(USRP2_CTRL_ID_TRANSACT_ME_SOME_SPI_BRO);
- out_data.data.spi_args.dev = which_slave;
+ out_data.data.spi_args.dev = htonl(which_slave);
out_data.data.spi_args.miso_edge = spi_edge_to_otw[config.miso_edge];
out_data.data.spi_args.mosi_edge = spi_edge_to_otw[config.mosi_edge];
out_data.data.spi_args.readback = (readback)? 1 : 0;