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

ACCELSIM: fixed calls to open, close, ioctl

Browse Source 
The calls to open, close, ioctl should have been px4_open, px4_close
and px4_ioctl.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-04-20 11:35:48 -07:00
parent d137c09b0b
commit d264273d21
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/linux/drivers/accelsim/accelsim.cpp
+31 -20
View File
@@ -1268,29 +1268,40 @@ start(enum Rotation rotation)
goto fail; goto fail;
} }
if (OK != g_dev->init()) if (OK != g_dev->init()) {
warnx("failed init of ACCELSIM obj");
goto fail; goto fail;
/* set the poll rate to default, starts automatic data collection */
fd = open(ACCELSIM_DEVICE_PATH_ACCEL, O_RDONLY);
if (fd < 0)
goto fail;
if (ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0)
goto fail;
fd_mag = open(ACCELSIM_DEVICE_PATH_MAG, O_RDONLY);
/* don't fail if open cannot be opened */
if (0 <= fd_mag) {
if (ioctl(fd_mag, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
goto fail;
}
} }
close(fd); /* set the poll rate to default, starts automatic data collection */
close(fd_mag); fd = px4_open(ACCELSIM_DEVICE_PATH_ACCEL, O_RDONLY);
if (fd < 0) {
warnx("open %s failed", ACCELSIM_DEVICE_PATH_ACCEL);
goto fail;
}
if (px4_ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
warnx("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_ACCEL);
px4_close(fd);
goto fail;
}
fd_mag = px4_open(ACCELSIM_DEVICE_PATH_MAG, O_RDONLY);
/* don't fail if mag dev cannot be opened */
if (0 <= fd_mag) {
if (px4_ioctl(fd_mag, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT) < 0) {
warnx("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_ACCEL);
}
}
else
{
warnx("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_ACCEL);
}
px4_close(fd);
px4_close(fd_mag);
return 0; return 0;
fail: fail: