diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 13:49:24 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 13:49:24 +0200 |
commit | a6b52f1c9f720a8dd31099e7adeedee694f60729 (patch) | |
tree | 17a838cb1e8a74ddfed720245ab5c0cc3609be4b | |
parent | 26513272059589eb9481aff266623fd87632e10e (diff) | |
download | px4-firmware-a6b52f1c9f720a8dd31099e7adeedee694f60729.tar.gz px4-firmware-a6b52f1c9f720a8dd31099e7adeedee694f60729.tar.bz2 px4-firmware-a6b52f1c9f720a8dd31099e7adeedee694f60729.zip |
HMC5883 post merge cleanup
-rw-r--r-- | src/drivers/device/spi.cpp | 4 | ||||
-rw-r--r-- | src/drivers/hmc5883/hmc5883.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/drivers/device/spi.cpp b/src/drivers/device/spi.cpp index fed6c312c..0b232e158 100644 --- a/src/drivers/device/spi.cpp +++ b/src/drivers/device/spi.cpp @@ -69,11 +69,11 @@ 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) { } diff --git a/src/drivers/hmc5883/hmc5883.cpp b/src/drivers/hmc5883/hmc5883.cpp index 72d6bdd95..c2e4700d8 100644 --- a/src/drivers/hmc5883/hmc5883.cpp +++ b/src/drivers/hmc5883/hmc5883.cpp @@ -1266,7 +1266,7 @@ int calibrate(int bus); * Start the driver. */ void -start(enum Rotation rotation) +start(int bus, enum Rotation rotation) { int fd; @@ -1528,6 +1528,7 @@ int hmc5883_main(int argc, char *argv[]) { int ch; + int bus = -1; enum Rotation rotation = ROTATION_NONE; bool calibrate = false; |