From ce6401f32763a8e56f644b71179c529eff2a5f2b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 8 Apr 2015 02:02:10 +0200 Subject: [PATCH] (DInput) Update --- input/drivers/dinput.c | 2 +- input/drivers_joypad/dinput_joypad.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c index 3edc272c20..e63501aae8 100644 --- a/input/drivers/dinput.c +++ b/input/drivers/dinput.c @@ -73,7 +73,7 @@ struct dinput_input struct pointer_status pointer_head; /* dummy head for easier iteration */ }; -static void dinput_destroy_context(void) +void dinput_destroy_context(void) { if (!g_dinput_ctx) return; diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c index 1c055d4fc3..3bbce3b53c 100644 --- a/input/drivers_joypad/dinput_joypad.c +++ b/input/drivers_joypad/dinput_joypad.c @@ -38,7 +38,6 @@ struct dinput_joypad static struct dinput_joypad g_pads[MAX_USERS]; static unsigned g_joypad_cnt; static unsigned g_last_xinput_pad_idx; -LPDIRECTINPUT8 g_dinput_ctx; static const GUID common_xinput_guids[] = { {MAKELONG(0x28DE, 0x11FF),0x0000,0x0000,{0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44}}, /* Valve streaming pad */ @@ -46,6 +45,11 @@ static const GUID common_xinput_guids[] = { {MAKELONG(0x045E, 0x028E),0x0000,0x0000,{0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44}} /* wireless 360 pad */ }; +/* forward declarations */ +void dinput_destroy_context(void); +bool g_xinput_block_pads; +LPDIRECTINPUT8 g_dinput_ctx; + static void dinput_joypad_destroy(void) { unsigned i;