mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

only use libusb code if we have support for it

Browse Source
This commit is contained in:
Brad Parker 2017-11-28 22:32:41 -05:00
parent def24ef8eb
commit 5a2dff0ff1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasks/task_autodetect.c
View File

@ -25,11 +25,13 @@
#include <file/config_file.h> #include <file/config_file.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#ifdef HAVE_LIBUSB
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <libusb.h> #include <libusb.h>
#else #else
#include <libusb-1.0/libusb.h> #include <libusb-1.0/libusb.h>
#endif #endif
#endif
#include "../input/input_driver.h" #include "../input/input_driver.h"
#include "../input/include/blissbox.h" #include "../input/include/blissbox.h"
@ -50,7 +52,9 @@
/* only one blissbox per machine is currently supported */ /* only one blissbox per machine is currently supported */
static const blissbox_pad_type_t *blissbox_pads[BLISSBOX_MAX_PADS] = {NULL}; static const blissbox_pad_type_t *blissbox_pads[BLISSBOX_MAX_PADS] = {NULL};
#ifdef HAVE_LIBUSB
static struct libusb_device_handle *autoconfig_libusb_handle = NULL; static struct libusb_device_handle *autoconfig_libusb_handle = NULL;
#endif
typedef struct autoconfig_disconnect autoconfig_disconnect_t; typedef struct autoconfig_disconnect autoconfig_disconnect_t;
typedef struct autoconfig_params autoconfig_params_t; typedef struct autoconfig_params autoconfig_params_t;
@ -424,13 +428,14 @@ static const blissbox_pad_type_t* input_autoconfigure_get_blissbox_pad_type(int
RARCH_LOG("[Autoconf]: Could not find connected pad in Bliss-Box port#%d.\n", pid - BLISSBOX_PID); RARCH_LOG("[Autoconf]: Could not find connected pad in Bliss-Box port#%d.\n", pid - BLISSBOX_PID);
return NULL; return NULL;
#else
return NULL;
#endif
error: error:
libusb_close(autoconfig_libusb_handle); libusb_close(autoconfig_libusb_handle);
libusb_exit(NULL); libusb_exit(NULL);
return NULL; return NULL;
#else
return NULL;
#endif
} }
static void input_autoconfigure_override_handler(autoconfig_params_t *params) static void input_autoconfigure_override_handler(autoconfig_params_t *params)