From 02aaa403f1c44743f7d60c113c4654dec4c77788 Mon Sep 17 00:00:00 2001
From: Mark Charlebois <charlebm@gmail.com>
Date: Tue, 21 Apr 2015 23:20:59 -0700
Subject: [PATCH] Posix: removed PX4_DEVIOC* definitions

The following should not have been defined:

PX4_DIOC_GETPRIV
PX4_DEVIOCSPUBBLOCK
PX4_DEVIOCGPUBBLOCK
PX4_DEVIOCGDEVICEID

The actual defines are in drv_device.h and are:

DEVIOCSPUBBLOCK
DEVIOCGPUBBLOCK
DEVIOCGDEVICEID

DIOC_GETPRIV is defined by Nuttx, so mapped to SIOCDEVPRIVATE for POSIX

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
---
 src/drivers/device/device.cpp | 3 ++-
 src/drivers/device/vdev.cpp   | 9 +++++----
 src/drivers/drv_device.h      | 3 +++
 src/platforms/px4_posix.h     | 6 ------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/drivers/device/device.cpp b/src/drivers/device/device.cpp
index b4976250d4..34382263ac 100644
--- a/src/drivers/device/device.cpp
+++ b/src/drivers/device/device.cpp
@@ -41,6 +41,7 @@
 
 #include <px4_defines.h>
 #include <px4_posix.h>
+#include <drivers/drv_device.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -121,7 +122,7 @@ int
 Device::dev_ioctl(unsigned operation, unsigned &arg)
 {
         switch (operation) {
-        case PX4_DEVIOCGDEVICEID:
+        case DEVIOCGDEVICEID:
                 return (int)_device_id.devid;
         }
         return -ENODEV;
diff --git a/src/drivers/device/vdev.cpp b/src/drivers/device/vdev.cpp
index 0d02d2b420..0c1dc3abe9 100644
--- a/src/drivers/device/vdev.cpp
+++ b/src/drivers/device/vdev.cpp
@@ -298,19 +298,20 @@ VDev::ioctl(px4_dev_handle_t *handlep, int cmd, unsigned long arg)
 	switch (cmd) {
 
 		/* fetch a pointer to the driver's private data */
-	case PX4_DIOC_GETPRIV:
+	case DIOC_GETPRIV:
 		*(void **)(uintptr_t)arg = (void *)this;
 		ret = PX4_OK;
 		break;
-	case PX4_DEVIOCSPUBBLOCK:
+	case DEVIOCSPUBBLOCK:
 		_pub_blocked = (arg != 0);
 		ret = PX4_OK;
 		break;
-	case PX4_DEVIOCGPUBBLOCK:
+	case DEVIOCGPUBBLOCK:
 		ret = _pub_blocked;
 		break;
-        case PX4_DEVIOCGDEVICEID:
+        case DEVIOCGDEVICEID:
                 ret = (int)_device_id.devid;
+		printf("IOCTL DEVIOCGDEVICEID %d\n", ret);
 	default:
 		break;
 	}
diff --git a/src/drivers/drv_device.h b/src/drivers/drv_device.h
index 650b18bed5..3477dde9fd 100644
--- a/src/drivers/drv_device.h
+++ b/src/drivers/drv_device.h
@@ -65,5 +65,8 @@
  */
 #define DEVIOCGDEVICEID	_DEVICEIOC(2)
 
+#ifdef __PX4_POSIX
+#define DIOC_GETPRIV    SIOCDEVPRIVATE
+#endif
 
 #endif /* _DRV_DEVICE_H */
diff --git a/src/platforms/px4_posix.h b/src/platforms/px4_posix.h
index ed4edbb24e..18f4878878 100644
--- a/src/platforms/px4_posix.h
+++ b/src/platforms/px4_posix.h
@@ -49,12 +49,6 @@
 #define  PX4_F_RDONLY 1
 #define  PX4_F_WRONLY 2
 
-#define PX4_DEVIOCGDEVICEID	1
-
-#define PX4_DIOC_GETPRIV        2
-#define PX4_DEVIOCSPUBBLOCK     3
-#define PX4_DEVIOCGPUBBLOCK     4
-
 #define PX4_DEBUG(...)
 //#define PX4_DEBUG(...) printf(__VA_ARGS__)