aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/px4io/px4io.cpp
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-07-14 11:44:46 -0700
committerpx4dev <px4@purgatory.org>2013-07-14 11:44:46 -0700
commit6c7f1e883e0e0e8f09618ba1a80075f39faadf0b (patch)
treea37ca8406b330646bf46e258fdd6b24a29befc96 /src/drivers/px4io/px4io.cpp
parent12b84597d8058412002de6292d5def559b19c7e6 (diff)
downloadpx4-firmware-6c7f1e883e0e0e8f09618ba1a80075f39faadf0b.tar.gz
px4-firmware-6c7f1e883e0e0e8f09618ba1a80075f39faadf0b.tar.bz2
px4-firmware-6c7f1e883e0e0e8f09618ba1a80075f39faadf0b.zip
Direct-access device functions return errors directly.
Move to using ::init rather than ::probe in keeping with device changes.
Diffstat (limited to 'src/drivers/px4io/px4io.cpp')
-rw-r--r--src/drivers/px4io/px4io.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp
index 1b4f20de0..904da84c4 100644
--- a/src/drivers/px4io/px4io.cpp
+++ b/src/drivers/px4io/px4io.cpp
@@ -1132,8 +1132,8 @@ PX4IO::io_reg_set(uint8_t page, uint8_t offset, const uint16_t *values, unsigned
}
int ret = _interface->write((page << 8) | offset, (void *)values, num_values);
- if (ret != OK)
- debug("io_reg_set(%u,%u,%u): error %d", page, offset, num_values, errno);
+ if (ret != num_values)
+ debug("io_reg_set(%u,%u,%u): error %d", page, offset, num_values, ret);
return ret;
}
@@ -1153,8 +1153,8 @@ PX4IO::io_reg_get(uint8_t page, uint8_t offset, uint16_t *values, unsigned num_v
}
int ret = _interface->read((page << 8) | offset, reinterpret_cast<void *>(values), num_values);
- if (ret != OK)
- debug("io_reg_get(%u,%u,%u): data error %d", page, offset, num_values, errno);
+ if (ret != num_values)
+ debug("io_reg_get(%u,%u,%u): data error %d", page, offset, num_values, ret);
return ret;
}
@@ -1617,7 +1617,7 @@ start(int argc, char *argv[])
if (interface == nullptr)
errx(1, "cannot alloc interface");
- if (interface->probe()) {
+ if (interface->init()) {
delete interface;
errx(1, "interface init failed");
}
@@ -1754,7 +1754,7 @@ if_test(unsigned mode)
if (interface == nullptr)
errx(1, "cannot alloc interface");
- if (interface->probe()) {
+ if (interface->init()) {
delete interface;
errx(1, "interface init failed");
} else {