From 67ca912efc891a32e0e9a7b70caa1e95360e0368 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 3 Apr 2015 15:38:50 +0200
Subject: [PATCH] Remove btpad.h

---
 apple/iOS/bluetooth/btpad.c   |  2 +-
 apple/iOS/bluetooth/btpad.h   | 24 ------------------------
 apple/iOS/bluetooth/btstack.h |  4 ++++
 apple/iOS/platform.m          |  3 +--
 4 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 apple/iOS/bluetooth/btpad.h

diff --git a/apple/iOS/bluetooth/btpad.c b/apple/iOS/bluetooth/btpad.c
index 159d583809..5c7d860617 100644
--- a/apple/iOS/bluetooth/btpad.c
+++ b/apple/iOS/bluetooth/btpad.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "btdynamic.h"
-#include "btpad.h"
+#include "btstack.h"
 #include "../input/connect/joypad_connection.h"
 
 extern joypad_connection_t *slots;
diff --git a/apple/iOS/bluetooth/btpad.h b/apple/iOS/bluetooth/btpad.h
deleted file mode 100644
index 3b917564cb..0000000000
--- a/apple/iOS/bluetooth/btpad.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __IOS_RARCH_BTPAD_H__
-#define __IOS_RARCH_BTPAD_H__
-
-#include "btstack.h"
-
-void btpad_set_inquiry_state(bool on);
-
-#endif
diff --git a/apple/iOS/bluetooth/btstack.h b/apple/iOS/bluetooth/btstack.h
index efdfd58407..ba0f572d4c 100644
--- a/apple/iOS/bluetooth/btstack.h
+++ b/apple/iOS/bluetooth/btstack.h
@@ -584,6 +584,10 @@ void bt_send_l2cap(uint16_t local_cid, uint8_t *data, uint16_t len);
 
 void bt_send_rfcomm(uint16_t rfcom_cid, uint8_t *data, uint16_t len);
 
+/* custom functions */
+
+void btpad_set_inquiry_state(bool on);
+
 #if defined __cplusplus
 }
 #endif
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index 2283cc9d14..cdd724bb79 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -26,9 +26,8 @@
 #include "../../menu/menu.h"
 
 #import "views.h"
-#include "bluetooth/btpad.h"
 #include "bluetooth/btdynamic.h"
-#include "bluetooth/btpad.h"
+#include "bluetooth/btstack.h"
 
 #include "../../menu/drivers/ios.h"