From f20baeb2215a39bc7a5550436ec8cde353258312 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 4 Oct 2014 15:37:09 +0200 Subject: [PATCH] (Apple) Joypad refactor pt. 2 --- input/apple_joypad_hid.c | 2 +- input/apple_joypad_ios.c | 2 +- input/input_common.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/input/apple_joypad_hid.c b/input/apple_joypad_hid.c index 643df32591..176cdd0109 100644 --- a/input/apple_joypad_hid.c +++ b/input/apple_joypad_hid.c @@ -229,7 +229,7 @@ static const char *apple_joypad_name(unsigned joypad) return NULL; } -rarch_joypad_driver_t apple_joypad = { +rarch_joypad_driver_t apple_hid_joypad = { apple_joypad_init, apple_joypad_query_pad, apple_joypad_destroy, diff --git a/input/apple_joypad_ios.c b/input/apple_joypad_ios.c index 7f95c1fbd8..b2adcc1c46 100644 --- a/input/apple_joypad_ios.c +++ b/input/apple_joypad_ios.c @@ -229,7 +229,7 @@ static const char *apple_joypad_name(unsigned joypad) return NULL; } -rarch_joypad_driver_t apple_joypad = { +rarch_joypad_driver_t apple_ios_joypad = { apple_joypad_init, apple_joypad_query_pad, apple_joypad_destroy, diff --git a/input/input_common.h b/input/input_common.h index d73819473b..58e740babf 100644 --- a/input/input_common.h +++ b/input/input_common.h @@ -134,7 +134,8 @@ extern rarch_joypad_driver_t ps3_joypad; extern rarch_joypad_driver_t psp_joypad; extern rarch_joypad_driver_t xdk_joypad; extern rarch_joypad_driver_t gx_joypad; -extern rarch_joypad_driver_t apple_joypad; +extern rarch_joypad_driver_t apple_hid_joypad; +extern rarch_joypad_driver_t apple_ios_joypad; extern rarch_joypad_driver_t android_joypad; extern rarch_joypad_driver_t qnx_joypad;