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 <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
9cda25a98b
commit
156cac65b6
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user