From 83b38cd5c1e4a86d112e27decedb8c20bf2a5f5a Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 16 Nov 2015 03:55:55 +0100 Subject: [PATCH] Remove mfi_hid.h too --- input/drivers_hid/btstack_hid.c | 5 ++--- input/drivers_hid/mfi_hid.h | 23 ----------------------- ui/drivers/ui_cocoatouch.m | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 input/drivers_hid/mfi_hid.h diff --git a/input/drivers_hid/btstack_hid.c b/input/drivers_hid/btstack_hid.c index 9b396ec60e..3394973dc1 100644 --- a/input/drivers_hid/btstack_hid.c +++ b/input/drivers_hid/btstack_hid.c @@ -21,9 +21,6 @@ #ifdef __APPLE__ #include #endif -#ifdef HAVE_MFI -#include "mfi_hid.h" -#endif #include #include @@ -33,6 +30,8 @@ #include "btstack_hid.h" #include "../connect/joypad_connection.h" +joypad_connection_t *slots; + typedef struct btstack_hid { joypad_connection_t *slots; diff --git a/input/drivers_hid/mfi_hid.h b/input/drivers_hid/mfi_hid.h deleted file mode 100644 index 890065fb43..0000000000 --- a/input/drivers_hid/mfi_hid.h +++ /dev/null @@ -1,23 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2013-2014 - Jason Fetters - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __APPLE_RARCH_GAMECONTROLLER_H__ -#define __APPLE_RARCH_GAMECONTROLLER_H__ - -#include "../../input/connect/joypad_connection.h" - -joypad_connection_t *slots; - -#endif diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 11a9fb33d6..0bbc1ddeab 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -28,10 +28,6 @@ #include "../../menu/menu_setting.h" #include "../../retroarch.h" -#ifdef HAVE_MFI -#include "../../input/drivers_hid/mfi_hid.h" -#endif - #include "../../input/drivers_hid/btstack_hid.h" #include "../../frontend/frontend.h" #include "../../runloop_data.h"