mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(BTStack) Move btpad_set_inquery_state calls to btstack_hid.c

Browse Source
This commit is contained in:
twinaphex 2015-11-18 01:57:45 +01:00
parent 2a6f38a929
commit 37d45643f9
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/drivers_hid/btstack_hid.c
View File

@ -623,8 +623,6 @@ void bt_send_rfcomm(uint16_t rfcom_cid, uint8_t *data, uint16_t len);
/* custom functions */ /* custom functions */
void btpad_set_inquiry_state(bool on);
joypad_connection_t *slots; joypad_connection_t *slots;
typedef struct btstack_hid typedef struct btstack_hid
@ -1025,7 +1023,7 @@ static void btpad_connection_send_control(void *data,
bt_send_l2cap_ptr(connection->channels[0], data_buf, size); bt_send_l2cap_ptr(connection->channels[0], data_buf, size);
} }
void btpad_set_inquiry_state(bool on) static void btpad_set_inquiry_state(bool on)
{ {
inquiry_off = !on; inquiry_off = !on;
@ -1424,6 +1422,7 @@ static void btstack_hid_free(void *data)
return; return;
pad_connection_destroy(hid->slots); pad_connection_destroy(hid->slots);
btpad_set_inquiry_state(true);
if (hid) if (hid)
free(hid); free(hid);
@ -1442,6 +1441,7 @@ static void *btstack_hid_init(void)
goto error; goto error;
btstack_set_poweron(false); btstack_set_poweron(false);
btpad_set_inquiry_state(false);
return hid; return hid;

10
ui/drivers/ui_cocoatouch.m
View File

@ -37,9 +37,6 @@ static CFRunLoopObserverRef iterate_observer;
/* forward declaration */ /* forward declaration */
void apple_rarch_exited(void); void apple_rarch_exited(void);
#ifdef HAVE_BTSTACK
void btpad_set_inquiry_state(bool on);
#endif
static void rarch_enable_ui(void) static void rarch_enable_ui(void)
{ {
@ -282,10 +279,6 @@ enum
self.mainmenu.last_menu = self.mainmenu; self.mainmenu.last_menu = self.mainmenu;
[self pushViewController:self.mainmenu animated:NO]; [self pushViewController:self.mainmenu animated:NO];
#ifdef HAVE_BTSTACK
btpad_set_inquiry_state(false);
#endif
[self refreshSystemConfig]; [self refreshSystemConfig];
[self showGameView]; [self showGameView];
@ -454,9 +447,6 @@ void apple_rarch_exited(void)
if (!ap) if (!ap)
return; return;
[ap showPauseMenu:ap]; [ap showPauseMenu:ap];
#ifdef HAVE_BTSTACK
btpad_set_inquiry_state(true);
#endif
} }
typedef struct ui_companion_cocoatouch typedef struct ui_companion_cocoatouch