From 2ec55fd974a63b705a4777c256d2222c874fa043 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 31 Jan 2019 18:38:35 +0800 Subject: *SDL project --- Source/3rdParty/SDL2/src/joystick/android/SDL_sysjoystick_c.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Source/3rdParty/SDL2/src/joystick/android/SDL_sysjoystick_c.h') diff --git a/Source/3rdParty/SDL2/src/joystick/android/SDL_sysjoystick_c.h b/Source/3rdParty/SDL2/src/joystick/android/SDL_sysjoystick_c.h index c2cbc4e..20d7381 100644 --- a/Source/3rdParty/SDL2/src/joystick/android/SDL_sysjoystick_c.h +++ b/Source/3rdParty/SDL2/src/joystick/android/SDL_sysjoystick_c.h @@ -32,7 +32,7 @@ extern int Android_OnPadDown(int device_id, int keycode); extern int Android_OnPadUp(int device_id, int keycode); extern int Android_OnJoy(int device_id, int axisnum, float value); extern int Android_OnHat(int device_id, int hat_id, int x, int y); -extern int Android_AddJoystick(int device_id, const char *name, const char *desc, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs); +extern int Android_AddJoystick(int device_id, const char *name, const char *desc, int vendor_id, int product_id, SDL_bool is_accelerometer, int button_mask, int naxes, int nhats, int nballs); extern int Android_RemoveJoystick(int device_id); /* A linked list of available joysticks */ @@ -45,10 +45,8 @@ typedef struct SDL_joylist_item SDL_bool is_accelerometer; SDL_Joystick *joystick; int nbuttons, naxes, nhats, nballs; + int dpad_state; - /* Steam Controller support */ - SDL_bool m_bSteamController; - struct SDL_joylist_item *next; } SDL_joylist_item; -- cgit v1.1-26-g67d0