diff options
| author | Mark Charlebois <charlebm@gmail.com> | 2015-04-20 08:43:15 -0700 |
|---|---|---|
| committer | Mark Charlebois <charlebm@gmail.com> | 2015-04-20 11:37:51 -0700 |
| commit | b7a5e4df58246ebbfc9aae1585cc34ec75d4fcae (patch) | |
| tree | 4ba656c09cab7b61b1c0587abc6e28d40987f6aa /src | |
| parent | f44a23bc2648890a59358894a62a6e9361dbddfb (diff) | |
| download | px4-firmware-b7a5e4df58246ebbfc9aae1585cc34ec75d4fcae.tar.gz px4-firmware-b7a5e4df58246ebbfc9aae1585cc34ec75d4fcae.tar.bz2 px4-firmware-b7a5e4df58246ebbfc9aae1585cc34ec75d4fcae.zip | |
Linux: Fixed px4_ioctl calls that should be ::ioctl
If simulate is not true, then a read I2C device is present.
The global scope ioctl should be called on _fd, not px4_ioctl.
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/device/i2c_linux.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/drivers/device/i2c_linux.cpp b/src/drivers/device/i2c_linux.cpp index 3929c7979..2de830a52 100644 --- a/src/drivers/device/i2c_linux.cpp +++ b/src/drivers/device/i2c_linux.cpp @@ -67,7 +67,7 @@ I2C::I2C(const char *name, _address(address), _fd(-1) { - printf("I2C::I2C name = %s devname = %s\n", name, devname); + warnx("I2C::I2C name = %s devname = %s", name, devname); // fill in _device_id fields for a I2C device _device_id.devid_s.bus_type = DeviceBusType_I2C; _device_id.devid_s.bus = bus; @@ -163,11 +163,11 @@ I2C::transfer(const uint8_t *send, unsigned send_len, uint8_t *recv, unsigned re packets.nmsgs = msgs; if (simulate) { - printf("I2C SIM: transfer_4 on %s\n", get_devname()); + warnx("I2C SIM: transfer_4 on %s", get_devname()); ret = PX4_OK; } else { - ret = px4_ioctl(_fd, I2C_RDWR, (unsigned long)&packets); + ret = ::ioctl(_fd, I2C_RDWR, (unsigned long)&packets); if (ret < 0) { warnx("I2C transfer failed"); return 1; @@ -199,11 +199,11 @@ I2C::transfer(struct i2c_msg *msgv, unsigned msgs) packets.nmsgs = msgs; if (simulate) { - printf("I2C SIM: transfer_2 on %s\n", get_devname()); + warnx("I2C SIM: transfer_2 on %s", get_devname()); ret = PX4_OK; } else { - ret = px4_ioctl(_fd, I2C_RDWR, (unsigned long)&packets); + ret = ::ioctl(_fd, I2C_RDWR, (unsigned long)&packets); } if (ret < 0) { warnx("I2C transfer failed"); @@ -237,7 +237,7 @@ ssize_t I2C::read(px4_dev_handle_t *handlep, char *buffer, size_t buflen) { if (simulate) { // FIXME no idea what this should be - printf ("2C SIM I2C::read\n"); + warnx ("2C SIM I2C::read"); return 0; } @@ -247,6 +247,7 @@ ssize_t I2C::read(px4_dev_handle_t *handlep, char *buffer, size_t buflen) ssize_t I2C::write(px4_dev_handle_t *handlep, const char *buffer, size_t buflen) { if (simulate) { + warnx ("2C SIM I2C::write"); return buflen; } |