aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/device/spi.cpp
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-07-12 21:35:46 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-07-12 21:35:46 +0200
commit5a22ef1c28abfeb0076532a847a9178f9dc1361e (patch)
tree323c0a6f48d53b6703a851546d6b7320517dd6ca /src/drivers/device/spi.cpp
parent0d1ac4235411e8f05f96bcbe51558d92f0d86cf6 (diff)
parent5f8baed876a805c2cfae7c0ed0250ae20b501336 (diff)
downloadpx4-firmware-5a22ef1c28abfeb0076532a847a9178f9dc1361e.tar.gz
px4-firmware-5a22ef1c28abfeb0076532a847a9178f9dc1361e.tar.bz2
px4-firmware-5a22ef1c28abfeb0076532a847a9178f9dc1361e.zip
Merge branch 'master' of github.com:PX4/Firmware into airspeed_test_fix
Diffstat (limited to 'src/drivers/device/spi.cpp')
-rw-r--r--src/drivers/device/spi.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/drivers/device/spi.cpp b/src/drivers/device/spi.cpp
index 57cef34d2..200acac05 100644
--- a/src/drivers/device/spi.cpp
+++ b/src/drivers/device/spi.cpp
@@ -69,12 +69,18 @@ SPI::SPI(const char *name,
// protected
locking_mode(LOCK_PREEMPTION),
// private
- _bus(bus),
_device(device),
_mode(mode),
_frequency(frequency),
- _dev(nullptr)
+ _dev(nullptr),
+ _bus(bus)
{
+ // fill in _device_id fields for a SPI device
+ _device_id.devid_s.bus_type = DeviceBusType_SPI;
+ _device_id.devid_s.bus = bus;
+ _device_id.devid_s.address = (uint8_t)device;
+ // devtype needs to be filled in by the driver
+ _device_id.devid_s.devtype = 0;
}
SPI::~SPI()