Merge pull request #1 from ltjax/do_not_expose_hid_api

Do not expose hid api

Author: ltjax

README.md

@@ -22,7 +22,7 @@ conan remote add ltjax https://api.bintray.com/conan/ltjax/conan
 
 Then you can add the dependency via
 ```
-steam_controller/1.0@ltjax/stable
+steam_controller/1.1@ltjax/stable
 ```
 
 # How to use

conanfile.py

@@ -3,7 +3,7 @@
 
 class SteamControllerConan(ConanFile):
     name = "steam_controller"
-    version = "1.0"
+    version = "1.1"
     license = "MIT"
     author = "Marius Elvert [email protected]"
     url = "https://github.com/ltjax/steam_controller"

externals/hidapi/hid_common.cpp

@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "hidapi.h"
+
+HID_API_NAMESPACE_BEGIN
+
+void HID_API_EXPORT hid_free_enumeration(struct hid_device_info* devs)
+{
+	struct hid_device_info* d = devs;
+	while (d) {
+		struct hid_device_info* next = d->next;
+		free(d->path);
+		free(d->serial_number);
+		free(d->manufacturer_string);
+		free(d->product_string);
+		free(d);
+		d = next;
+	}
+}
+
+hid_device* hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t* serial_number)
+{
+	struct hid_device_info* devs, * cur_dev;
+	const char* path_to_open = NULL;
+	hid_device* handle = NULL;
+
+	devs = hid_enumerate(vendor_id, product_id);
+	cur_dev = devs;
+	while (cur_dev) {
+		if (cur_dev->vendor_id == vendor_id &&
+			cur_dev->product_id == product_id) {
+			if (serial_number) {
+				if (wcscmp(serial_number, cur_dev->serial_number) == 0) {
+					path_to_open = cur_dev->path;
+					break;
+				}
+			}
+			else {
+				path_to_open = cur_dev->path;
+				break;
+			}
+		}
+		cur_dev = cur_dev->next;
+	}
+
+	if (path_to_open) {
+		/* Open the device */
+		handle = hid_open_path(path_to_open);
+	}
+
+	hid_free_enumeration(devs);
+
+	return handle;
+}
+
+HID_API_NAMESPACE_END

externals/hidapi/include/hidapi/hidapi.h

@@ -29,7 +29,17 @@
 
 #include <wchar.h>
 
-#ifdef _WIN32
+#ifdef APPLE
+#include <IOKit/hid/IOHIDManager.h>
+#include <IOKit/hid/IOHIDKeys.h>
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+#ifdef WIN32
       #define HID_API_EXPORT __declspec(dllexport)
       #define HID_API_CALL
 #else
@@ -39,9 +49,15 @@
 
 #define HID_API_EXPORT_CALL HID_API_EXPORT HID_API_CALL /**< API export and call macro*/
 
-#ifdef __cplusplus
-extern "C" {
+#ifndef HID_API_NAMESPACE_BEGIN
+      #error HID_API_NAMESPACE_BEGIN not defined
 #endif
+
+#ifndef HID_API_NAMESPACE_END
+      #error HID_API_NAMESPACE_END not defined
+#endif
+
+HID_API_NAMESPACE_BEGIN
 		struct hid_device_;
 		typedef struct hid_device_ hid_device; /**< opaque hidapi structure */
 		typedef void* hid_handle_t;
@@ -421,22 +437,14 @@ extern "C" {
 
 
 #ifdef APPLE
-
-#include <IOKit/hid/IOHIDManager.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <CoreFoundation/CoreFoundation.h>
-
 		int HID_API_EXPORT HID_API_CALL hid_dump_element_info(hid_device *dev);
 		IOHIDDeviceRef HID_API_EXPORT HID_API_CALL get_device_handle( hid_device *dev );
 #endif
 #ifdef WIN32
-    #include <windows.h>
         HANDLE HID_API_EXPORT HID_API_CALL get_device_handle(hid_device *dev);
 #endif
 
-#ifdef __cplusplus
-}
-#endif
+HID_API_NAMESPACE_END
 
 #endif
 

externals/hidapi/linux/hid.c renamed to externals/hidapi/linux/hid.cpp

@@ -45,6 +45,8 @@
 
 #include "hidapi.h"
 
+HID_API_NAMESPACE_BEGIN
+
 /* Definitions from linux/hidraw.h. Since these are new, some distros
    may not have header files which contain them. */
 #ifndef HIDIOCSFEATURE
@@ -103,7 +105,7 @@ static __u32 detect_kernel_version(void)
 
 static hid_device *new_hid_device(void)
 {
-	hid_device *dev = calloc(1, sizeof(hid_device));
+	hid_device *dev = reinterpret_cast<hid_device*>(calloc(1, sizeof(hid_device)));
 	dev->device_handle = -1;
 	dev->blocking = 1;
 	dev->uses_numbered_reports = 0;
@@ -122,7 +124,7 @@ static wchar_t *utf8_to_wchar_t(const char *utf8)
 		if ((size_t) -1 == wlen) {
 			return wcsdup(L"");
 		}
-		ret = calloc(wlen+1, sizeof(wchar_t));
+		ret = reinterpret_cast<wchar_t*>(calloc(wlen+1, sizeof(wchar_t)));
 		mbstowcs(ret, utf8, wlen+1);
 		ret[wlen] = 0x0000;
 	}
@@ -461,7 +463,7 @@ struct hid_device_info  HID_API_EXPORT *hid_enumerate(unsigned short vendor_id,
 			struct hid_device_info *tmp;
 
 			/* VID/PID match. Create the record. */
-			tmp = malloc(sizeof(struct hid_device_info));
+			tmp = reinterpret_cast<hid_device_info*>(malloc(sizeof(struct hid_device_info)));
 			if (cur_dev) {
 				cur_dev->next = tmp;
 			}
@@ -568,55 +570,6 @@ struct hid_device_info  HID_API_EXPORT *hid_enumerate(unsigned short vendor_id,
 	return root;
 }
 
-void  HID_API_EXPORT hid_free_enumeration(struct hid_device_info *devs)
-{
-	struct hid_device_info *d = devs;
-	while (d) {
-		struct hid_device_info *next = d->next;
-		free(d->path);
-		free(d->serial_number);
-		free(d->manufacturer_string);
-		free(d->product_string);
-		free(d);
-		d = next;
-	}
-}
-
-hid_device * hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number)
-{
-	struct hid_device_info *devs, *cur_dev;
-	const char *path_to_open = NULL;
-	hid_device *handle = NULL;
-
-	devs = hid_enumerate(vendor_id, product_id);
-	cur_dev = devs;
-	while (cur_dev) {
-		if (cur_dev->vendor_id == vendor_id &&
-		    cur_dev->product_id == product_id) {
-			if (serial_number) {
-				if (wcscmp(serial_number, cur_dev->serial_number) == 0) {
-					path_to_open = cur_dev->path;
-					break;
-				}
-			}
-			else {
-				path_to_open = cur_dev->path;
-				break;
-			}
-		}
-		cur_dev = cur_dev->next;
-	}
-
-	if (path_to_open) {
-		/* Open the device */
-		handle = hid_open_path(path_to_open);
-	}
-
-	hid_free_enumeration(devs);
-
-	return handle;
-}
-
 hid_device * HID_API_EXPORT hid_open_path(const char *path)
 {
 	hid_device *dev = NULL;
@@ -795,3 +748,5 @@ HID_API_EXPORT const wchar_t * HID_API_CALL  hid_error(hid_device *dev)
 {
 	return NULL;
 }
+
+HID_API_NAMESPACE_END