From 156cac65b6abed6835ba6fe1f0abf05abb3eb04c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 31 Mar 2018 11:35:31 -0700 Subject: [PATCH] Revert "Allow compilation on platforms without USBHID support" This reverts commit 7444cca876cf1637fd7c3d4ad1e48145b215aed8. The commit does what it advertises - but also breaks HID support everywhere else. Oops. Reported-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- src/scubapro_g2.c | 6 ------ src/suunto_eonsteel.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/scubapro_g2.c b/src/scubapro_g2.c index 765df6f..c33d902 100644 --- a/src/scubapro_g2.c +++ b/src/scubapro_g2.c @@ -26,9 +26,7 @@ #include "scubapro_g2.h" #include "context-private.h" #include "device-private.h" -#ifdef USBHID #include "usbhid.h" -#endif #include "array.h" #include "platform.h" @@ -250,11 +248,7 @@ scubapro_g2_device_open(dc_device_t **out, dc_context_t *context, const char *na status = DC_STATUS_IO; goto error_free; } -#ifdef USBHID status = dc_usbhid_custom_io(context, id->vendor, id->device); -#else - status = DC_STATUS_UNSUPPORTED; -#endif } if (status != DC_STATUS_SUCCESS) { diff --git a/src/suunto_eonsteel.c b/src/suunto_eonsteel.c index 6f6c7f2..f9ded4d 100644 --- a/src/suunto_eonsteel.c +++ b/src/suunto_eonsteel.c @@ -28,9 +28,7 @@ #include "context-private.h" #include "device-private.h" #include "array.h" -#ifdef USBHID #include "usbhid.h" -#endif #include "platform.h" #define EONSTEEL 0 @@ -771,11 +769,7 @@ suunto_eonsteel_device_open(dc_device_t **out, dc_context_t *context, const char /* We really need some way to specify USB ID's in the descriptor */ unsigned int vendor_id = 0x1493; unsigned int device_id = model ? 0x0033 : 0x0030; -#ifdef USBHID status = dc_usbhid_custom_io(context, vendor_id, device_id); -#else - status = DC_STATUS_UNSUPPORTED; -#endif } if (status != DC_STATUS_SUCCESS) {