ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(btstack.h) Cleanups

This commit is contained in:
twinaphex 2015-04-04 01:06:50 +02:00
parent 2b420f0b3e
commit 677723ba3c
2 changed files with 120 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
input/drivers_hid/btstack.h
View File

@ -60,36 +60,65 @@ typedef void (*btstack_packet_handler_t) (uint8_t packet_type,
/* Hardware state of Bluetooth controller */ /* Hardware state of Bluetooth controller */
typedef enum typedef enum
{ {
HCI_POWER_OFF = 0, HCI_POWER_OFF = 0,
HCI_POWER_ON, HCI_POWER_ON,
HCI_POWER_SLEEP HCI_POWER_SLEEP
} HCI_POWER_MODE; } HCI_POWER_MODE;
/* State of BTstack */ /* State of BTstack */
typedef enum typedef enum
{ {
HCI_STATE_OFF = 0, HCI_STATE_OFF = 0,
HCI_STATE_INITIALIZING, HCI_STATE_INITIALIZING,
HCI_STATE_WORKING, HCI_STATE_WORKING,
HCI_STATE_HALTING, HCI_STATE_HALTING,
HCI_STATE_SLEEPING, HCI_STATE_SLEEPING,
HCI_STATE_FALLING_ASLEEP HCI_STATE_FALLING_ASLEEP
} HCI_STATE; } HCI_STATE;
typedef enum typedef enum
{ {
RUN_LOOP_POSIX = 1, RUN_LOOP_POSIX = 1,
RUN_LOOP_COCOA, RUN_LOOP_COCOA,
RUN_LOOP_EMBEDDED RUN_LOOP_EMBEDDED
} RUN_LOOP_TYPE; } RUN_LOOP_TYPE;
/* compact HCI Command packet description */ /* compact HCI Command packet description */
typedef struct typedef struct
{ {
uint16_t opcode; uint16_t opcode;
const char *format; const char *format;
} hci_cmd_t; } hci_cmd_t;
typedef struct linked_item
{
struct linked_item *next; /* <-- next element in list, or NULL */
void *user_data; /* <-- pointer to struct base */
} linked_item_t;
typedef linked_item_t *linked_list_t;
typedef struct data_source
{
linked_item_t item;
/* File descriptor to watch or 0. */
int fd;
int (*process)(struct data_source *ds);
} data_source_t;
typedef struct timer
{
linked_item_t item;
/* Next timeout. */
struct timeval timeout;
#ifdef HAVE_TICK
/* Timeout in system ticks. */
uint32_t timeout;
#endif
void (*process)(struct timer *ts);
} timer_source_t;
/* btdynamic.h */ /* btdynamic.h */
@ -434,13 +463,6 @@ extern const hci_cmd_t rfcomm_persistent_channel_for_service;
/* linked_list.h */ /* linked_list.h */
typedef struct linked_item
{
struct linked_item *next; /* <-- next element in list, or NULL */
void *user_data; /* <-- pointer to struct base */
} linked_item_t;
typedef linked_item_t *linked_list_t;
void linked_item_set_user(linked_item_t *item, void *user_data); void linked_item_set_user(linked_item_t *item, void *user_data);
@ -460,27 +482,6 @@ void test_linked_list(void);
/* run_loop.h */ /* run_loop.h */
typedef struct data_source
{
linked_item_t item;
/* File descriptor to watch or 0. */
int fd;
int (*process)(struct data_source *ds);
} data_source_t;
typedef struct timer
{
linked_item_t item;
/* Next timeout. */
struct timeval timeout;
#ifdef HAVE_TICK
/* Timeout in system ticks. */
uint32_t timeout;
#endif
void (*process)(struct timer *ts);
} timer_source_t;
/* Set timer based on current time in milliseconds. */ /* Set timer based on current time in milliseconds. */

131
input/drivers_hid/btstack_hid.c
View File

@ -28,6 +28,72 @@
#include "../../dynamic.h" #include "../../dynamic.h"
#include "../connect/joypad_connection.h" #include "../connect/joypad_connection.h"
enum btpad_state
{
BTPAD_EMPTY = 0,
BTPAD_CONNECTING,
BTPAD_CONNECTED
};
struct btpad_queue_command
{
const hci_cmd_t* command;
union
{
struct
{
uint8_t on;
} btstack_set_power_mode;
struct
{
uint16_t handle;
uint8_t reason;
} hci_disconnect;
struct
{
uint32_t lap;
uint8_t length;
uint8_t num_responses;
} hci_inquiry;
struct
{
bd_addr_t bd_addr;
uint8_t page_scan_repetition_mode;
uint8_t reserved;
uint16_t clock_offset;
} hci_remote_name_request;
/* For wiimote only.
* TODO - should we repurpose this so
* that it's for more than just Wiimote?
* */
struct
{
bd_addr_t bd_addr;
bd_addr_t pin;
} hci_pin_code_request_reply;
};
};
struct pad_connection
{
uint32_t slot;
enum btpad_state state;
bool has_address;
bd_addr_t address;
uint16_t handle;
/* 0: Control, 1: Interrupt */
uint16_t channels[2];
};
#define GRAB(A) {#A, (void**)&A##_ptr} #define GRAB(A) {#A, (void**)&A##_ptr}
static struct static struct
@ -166,72 +232,7 @@ void btstack_set_poweron(bool on)
extern joypad_connection_t *slots; extern joypad_connection_t *slots;
/* Private interface. */
enum btpad_state
{
BTPAD_EMPTY,
BTPAD_CONNECTING,
BTPAD_CONNECTED
};
struct btpad_queue_command
{
const hci_cmd_t* command;
union
{
struct
{
uint8_t on;
} btstack_set_power_mode;
struct
{
uint16_t handle;
uint8_t reason;
} hci_disconnect;
struct
{
uint32_t lap;
uint8_t length;
uint8_t num_responses;
} hci_inquiry;
struct
{
bd_addr_t bd_addr;
uint8_t page_scan_repetition_mode;
uint8_t reserved;
uint16_t clock_offset;
} hci_remote_name_request;
/* For wiimote only.
* TODO - should we repurpose this so
* that it's for more than just Wiimote?
* */
struct
{
bd_addr_t bd_addr;
bd_addr_t pin;
} hci_pin_code_request_reply;
};
};
struct pad_connection
{
uint32_t slot;
enum btpad_state state;
bool has_address;
bd_addr_t address;
uint16_t handle;
/* 0: Control, 1: Interrupt */
uint16_t channels[2];
};
static bool inquiry_off; static bool inquiry_off;
static bool inquiry_running; static bool inquiry_running;