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

Move apple_joypad_connect_gcapi to apple_gamecontroller.m and 

make it a static function
This commit is contained in:
twinaphex 2015-04-04 23:33:01 +02:00
parent 0651a925c1
commit 31b6323094
3 changed files with 112 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apple/common/apple_gamecontroller.m
View File

@ -121,6 +121,24 @@ static void apple_gamecontroller_register(GCGamepad *gamepad)
}
static int32_t apple_joypad_connect_gcapi(joypad_connection_t *joyconn)
{
int pad = pad_connection_find_vacant_pad(joyconn);
if (pad >= 0 && pad < MAX_USERS)
{
joypad_connection_t *s = (joypad_connection_t*)&joyconn[pad];
if (s)
{
s->connected = true;
s->is_gcapi = true;
}
}
return pad;
}
static void apple_gamecontroller_connect(GCController *controller)
{
int32_t slot = apple_joypad_connect_gcapi(slots);

18
input/connect/joypad_connection.c
View File

@ -105,24 +105,6 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
return pad;
}
int32_t apple_joypad_connect_gcapi(joypad_connection_t *joyconn)
{
int pad = pad_connection_find_vacant_pad(joyconn);
if (pad >= 0 && pad < MAX_USERS)
{
joypad_connection_t *s = (joypad_connection_t*)&joyconn[pad];
if (s)
{
s->connected = true;
s->is_gcapi = true;
}
}
return pad;
}
void pad_connection_pad_deinit(joypad_connection_t *s, uint32_t pad)
{
if (!s || !s->connected)

2
input/connect/joypad_connection.h
View File

@ -51,8 +51,6 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
const char* name, uint16_t vid, uint16_t pid,
void *data, send_control_t ptr);
int32_t apple_joypad_connect_gcapi(joypad_connection_t *joyconn);
void *pad_connection_init(unsigned pads);
void pad_connection_destroy(joypad_connection_t *joyconn);