fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 18:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-enabling code to handle DF framework

Browse Source 
Updated to latest DriverFramework and changed ioctl args to
unsigned int from void *.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-11-16 13:51:39 -08:00
parent 40b488d693
commit dbe3b0e52b
7 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/drivers/accelsim/accelsim.cpp
+2 -2
View File
@@ -1101,7 +1101,7 @@ start(enum Rotation rotation)
goto fail;
}
if (h.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) {
if (h.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
PX4_ERR("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_ACCEL);
DevMgr::releaseHandle(h);
goto fail;
@@ -1111,7 +1111,7 @@ start(enum Rotation rotation)
/* don't fail if mag dev cannot be opened */
if (h_mag.isValid()) {
if (h_mag.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) {
if (h_mag.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
PX4_ERR("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_MAG);
}
src/platforms/posix/drivers/barosim/baro.cpp
+6 -6
View File
@@ -834,7 +834,7 @@ start_bus(struct barosim_bus_option &bus)
return false;
}
if (h.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) {
if (h.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
DevMgr::releaseHandle(h);
PX4_ERR("failed setting default poll rate");
return false;
@@ -904,14 +904,14 @@ test()
PX4_INFO("time: %lld", (long long)report.timestamp);
/* set the queue depth to 10 */
if (OK != h.ioctl(SENSORIOCSQUEUEDEPTH, (void *)10UL)) {
if (OK != h.ioctl(SENSORIOCSQUEUEDEPTH, 10UL)) {
PX4_ERR("failed to set queue depth");
DevMgr::releaseHandle(h);
return 1;
}
/* start the sensor polling at 2Hz */
if (OK != h.ioctl(SENSORIOCSPOLLRATE, (void *)2UL)) {
if (OK != h.ioctl(SENSORIOCSPOLLRATE, 2UL)) {
PX4_ERR("failed to set 2Hz poll rate");
DevMgr::releaseHandle(h);
return 1;
@@ -971,7 +971,7 @@ reset()
return 1;
}
if (h.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) {
if (h.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
PX4_ERR("driver poll restart failed");
return 1;
}
@@ -1017,7 +1017,7 @@ calibrate(unsigned altitude)
}
/* start the sensor polling at max */
if (OK != h.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_MAX)) {
if (OK != h.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_MAX)) {
PX4_ERR("failed to set poll rate");
return 1;
}
@@ -1068,7 +1068,7 @@ calibrate(unsigned altitude)
/* save as integer Pa */
p1 *= 1000.0f;
if (h.ioctl(BAROIOCSMSLPRESSURE, (void *)((unsigned long)(p1))) != OK) {
if (h.ioctl(BAROIOCSMSLPRESSURE, (unsigned long)(p1)) != OK) {
PX4_WARN("BAROIOCSMSLPRESSURE");
return 1;
}
src/platforms/posix/drivers/gyrosim/gyrosim.cpp
+4 -4
View File
@@ -1253,7 +1253,7 @@ start(enum Rotation rotation)
goto fail;
}
if (h.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) {
if (h.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
DevMgr::releaseHandle(h);
goto fail;
}
@@ -1321,7 +1321,7 @@ test()
}
/* reset to manual polling */
if (h_accel.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_MANUAL) < 0) {
if (h_accel.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_MANUAL) < 0) {
PX4_ERR("reset to manual polling");
return 1;
}
@@ -1394,12 +1394,12 @@ reset()
}
if (h.ioctl(SENSORIOCRESET, (void *)0) < 0) {
if (h.ioctl(SENSORIOCRESET, 0) < 0) {
PX4_ERR("driver reset failed");
goto reset_fail;
}
if (h.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) {
if (h.ioctl(SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
PX4_ERR("driver poll restart failed");
goto reset_fail;
}