diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 81e2a699ed..1bb08e766a 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -125,17 +125,6 @@ const struct apple_key_name_map_entry apple_key_name_map[] = { "nul", 0x00}, }; -#if TARGET_OS_IPHONE -void cocoa_input_reset_icade_buttons(void) -{ - driver_t *driver = driver_get_ptr(); - cocoa_input_data_t *apple = (cocoa_input_data_t*)driver->input_data; - - if (apple) - apple->icade_buttons = 0; -} -#endif - int32_t cocoa_input_find_any_key(void) { unsigned i; @@ -160,10 +149,6 @@ static int cocoa_input_find_any_button_ret(cocoa_input_data_t *apple, { settings_t *settings = config_get_ptr(); unsigned i; -#if TARGET_OS_IPHONE - if (port == 0 && settings->input.icade_enable) - BIT32_SET(buttons, apple->icade_buttons); -#endif if (buttons) for (i = 0; i < 32; i++) @@ -263,11 +248,6 @@ static void cocoa_input_poll(void *data) if (apple->joypad) apple->joypad->poll(); -#if TARGET_OS_IPHONE - if (settings->input.icade_enable) - BIT32_SET(apple->buttons[0], apple->icade_buttons); -#endif - apple->mouse_x_last = apple->mouse_rel_x; apple->mouse_y_last = apple->mouse_rel_y; } diff --git a/input/drivers/cocoa_input.h b/input/drivers/cocoa_input.h index 818cac0a5e..a2a199699f 100644 --- a/input/drivers/cocoa_input.h +++ b/input/drivers/cocoa_input.h @@ -61,16 +61,11 @@ typedef struct #if TARGET_OS_IPHONE uint32_t mfi_buttons[MAX_USERS]; bool small_keyboard_active; - uint32_t icade_buttons; #endif const input_device_driver_t *joypad; } cocoa_input_data_t; -#if TARGET_OS_IPHONE -void cocoa_input_reset_icade_buttons(void); -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index 9c0ca8a8b2..323ba02bb6 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -261,8 +261,6 @@ static void RunActionSheet(const char* title, const struct string_list* items, [self.bindTimer invalidate]; self.bindTimer = nil; - - cocoa_input_reset_icade_buttons(); } - (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)buttonIndex diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 9957a61b8d..1ca03c4614 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -347,9 +347,7 @@ enum - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated { - cocoa_input_reset_icade_buttons(); [self setToolbarHidden:![[viewController toolbarItems] count] animated:YES]; - [self refreshSystemConfig]; }