diff --git a/platforms/common/include/px4_platform_common/posix.h b/platforms/common/include/px4_platform_common/posix.h index 8b8c16069f..a2af9057ad 100644 --- a/platforms/common/include/px4_platform_common/posix.h +++ b/platforms/common/include/px4_platform_common/posix.h @@ -117,7 +117,7 @@ __EXPORT int px4_open(const char *path, int flags, ...); __EXPORT int px4_close(int fd); __EXPORT ssize_t px4_read(int fd, void *buffer, size_t buflen); __EXPORT ssize_t px4_write(int fd, const void *buffer, size_t buflen); -__EXPORT int px4_ioctl(int fd, int cmd, uintptr_t arg); +__EXPORT int px4_ioctl(int fd, int cmd, unsigned long arg); __EXPORT int px4_poll(px4_pollfd_struct_t *fds, unsigned int nfds, int timeout); __EXPORT int px4_access(const char *pathname, int mode); __EXPORT px4_task_t px4_getpid(void); diff --git a/platforms/common/uORB/uORBDeviceNode.cpp b/platforms/common/uORB/uORBDeviceNode.cpp index 04f589bbbb..fd4ef60e63 100644 --- a/platforms/common/uORB/uORBDeviceNode.cpp +++ b/platforms/common/uORB/uORBDeviceNode.cpp @@ -209,7 +209,7 @@ uORB::DeviceNode::write(cdev::file_t *filp, const char *buffer, size_t buflen) } int -uORB::DeviceNode::ioctl(cdev::file_t *filp, int cmd, uintptr_t arg) +uORB::DeviceNode::ioctl(cdev::file_t *filp, int cmd, unsigned long arg) { switch (cmd) { case ORBIOCUPDATED: { diff --git a/platforms/common/uORB/uORBDeviceNode.hpp b/platforms/common/uORB/uORBDeviceNode.hpp index 9e296ab374..527c5ddf2b 100644 --- a/platforms/common/uORB/uORBDeviceNode.hpp +++ b/platforms/common/uORB/uORBDeviceNode.hpp @@ -114,7 +114,7 @@ public: /** * IOCTL control for the subscriber. */ - int ioctl(cdev::file_t *filp, int cmd, uintptr_t arg) override; + int ioctl(cdev::file_t *filp, int cmd, unsigned long arg) override; /** * Method to publish a data to this node. diff --git a/src/lib/cdev/CDev.hpp b/src/lib/cdev/CDev.hpp index 0e8b1a05a2..071ae618fe 100644 --- a/src/lib/cdev/CDev.hpp +++ b/src/lib/cdev/CDev.hpp @@ -146,7 +146,7 @@ public: * @param arg The ioctl argument value. * @return OK on success, or -errno otherwise. */ - virtual int ioctl(file_t *filep, int cmd, uintptr_t arg) { return -ENOTTY; }; + virtual int ioctl(file_t *filep, int cmd, unsigned long arg) { return -ENOTTY; }; /** * Perform a poll setup/teardown operation. diff --git a/src/lib/cdev/posix/cdev_platform.cpp b/src/lib/cdev/posix/cdev_platform.cpp index e18f6dcf17..0a977a1bba 100644 --- a/src/lib/cdev/posix/cdev_platform.cpp +++ b/src/lib/cdev/posix/cdev_platform.cpp @@ -312,7 +312,7 @@ extern "C" { return ret; } - int px4_ioctl(int fd, int cmd, uintptr_t arg) + int px4_ioctl(int fd, int cmd, unsigned long arg) { PX4_DEBUG("px4_ioctl fd = %d", fd); int ret = 0;