Rename input_autoconfigure_joypad to input_autoconfigure_connect

This commit is contained in:
twinaphex 2016-12-01 18:57:44 +01:00
parent e689d55414
commit 76d0380e45
20 changed files with 39 additions and 34 deletions

View File

@ -895,6 +895,7 @@ static void handle_hotplug(android_input_data_t *android_data,
params.vid, params.pid);
strlcpy(params.name, name_buf, sizeof(params.name));
params.idx = *port;
params.vid = vendorId;
params.pid = productId;
@ -902,7 +903,7 @@ static void handle_hotplug(android_input_data_t *android_data,
settings->input.vid[*port] = params.vid;
strlcpy(params.driver, android_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
if (!string_is_empty(name_buf))

View File

@ -220,7 +220,7 @@ static void qnx_input_autodetect_gamepad(qnx_input_t *qnx,
strlcpy(params.driver, qnx->joypad->ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
controller->port = port;
qnx->port_device[port] = controller;

View File

@ -309,7 +309,7 @@ static void iohidmanager_hid_device_add_autodetect(unsigned idx,
strlcpy(params.name, device_name, sizeof(params.name));
strlcpy(params.driver, driver_name, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
RARCH_LOG("Port %d: %s.\n", idx, device_name);
}

View File

@ -150,7 +150,7 @@ static void libusb_hid_device_add_autodetect(unsigned idx,
strlcpy(params.name, device_name, sizeof(params.name));
strlcpy(params.driver, driver_name, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
static void libusb_get_description(struct libusb_device *device,

View File

@ -152,7 +152,7 @@ static void wiiusb_hid_device_add_autodetect(unsigned idx,
strlcpy(settings->input.device_names[idx], device_name,
sizeof(settings->input.device_names[idx]));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
static void wiiusb_get_description(usb_device_entry *device,

View File

@ -56,7 +56,7 @@ static void ctr_joypad_autodetect_add(unsigned autoconf_pad)
strlcpy(params.name, ctr_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, ctr_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
static bool ctr_joypad_init(void *data)

View File

@ -277,7 +277,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
params.vid = dinput_joypad_vid(g_joypad_cnt);
params.pid = dinput_joypad_pid(g_joypad_cnt);
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
settings->input.pid[g_joypad_cnt] = params.pid;
settings->input.vid[g_joypad_cnt] = params.vid;

View File

@ -158,7 +158,7 @@ static void handle_hotplug(unsigned port, uint32_t ptype)
params.idx = port;
strlcpy(params.name, gx_joypad_name(port), sizeof(params.name));
strlcpy(params.driver, gx_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
}

View File

@ -175,7 +175,7 @@ static void handle_plugged_pad(void)
/* TODO - implement VID/PID? */
params.idx = idx;
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
}
/* Sometimes, device will be created before access to it is established. */
@ -195,7 +195,7 @@ static void handle_plugged_pad(void)
strlcpy(params.driver, linuxraw_joypad.ident, sizeof(params.driver));
/* TODO - implement VID/PID? */
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
}
}
@ -254,11 +254,11 @@ static bool linuxraw_joypad_init(void *data)
strlcpy(params.driver, "linuxraw", sizeof(params.driver));
/* TODO - implement VID/PID? */
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
linuxraw_poll_pad(pad);
}
else
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
linuxraw_inotify = inotify_init();

View File

@ -307,7 +307,7 @@ static bool parport_joypad_init(void *data)
}
}
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
return true;

View File

@ -54,7 +54,7 @@ static void ps3_joypad_autodetect_add(unsigned autoconf_pad)
strlcpy(params.name, ps3_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, ps3_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
static bool ps3_joypad_init(void *data)

View File

@ -83,7 +83,8 @@ static void psp_joypad_autodetect_add(unsigned autoconf_pad)
params.idx = autoconf_pad;
strlcpy(params.name, psp_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, psp_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
static bool psp_joypad_init(void *data)

View File

@ -44,7 +44,7 @@ static bool qnx_joypad_init(void *data)
strlcpy(params.name, qnx_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, qnx_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
return true;

View File

@ -144,13 +144,14 @@ static void sdl_pad_connect(unsigned id)
product = guid_ptr[1];
#endif
#endif
params.idx = id;
strlcpy(params.name, sdl_pad_name(id), sizeof(params.name));
params.vid = vendor;
params.pid = product;
strlcpy(params.driver, sdl_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
params.idx = id;
params.vid = vendor;
params.pid = product;
input_autoconfigure_connect(&params);
RARCH_LOG("[SDL]: Device #%u (%04x:%04x) connected: %s.\n", id, vendor,
product, sdl_pad_name(id));

View File

@ -282,15 +282,17 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
if (!string_is_empty(pad->ident))
{
params.idx = p;
strlcpy(params.name, pad->ident, sizeof(params.name));
params.idx = p;
params.vid = pad->vid;
params.pid = pad->pid;
settings->input.pid[p] = params.pid;
settings->input.vid[p] = params.vid;
strlcpy(settings->input.device_names[p], params.name, sizeof(settings->input.device_names[p]));
strlcpy(params.driver, udev_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
ret = 1;
}

View File

@ -63,7 +63,7 @@ static void wiiu_joypad_autodetect_add(unsigned autoconf_pad)
strlcpy(params.name, wiiu_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, wiiu_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
static bool wiiu_joypad_button(unsigned port_num, uint16_t key)

View File

@ -55,7 +55,7 @@ static void xdk_joypad_autodetect_add(unsigned autoconf_pad)
params.idx = autoconf_pad;
strlcpy(params.name, xdk_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, xdk_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
static bool xdk_joypad_init(void *data)

View File

@ -268,7 +268,7 @@ static bool xinput_joypad_init(void *data)
params.idx = autoconf_pad;
strlcpy(params.name, xinput_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, xinput_joypad.ident, sizeof(params.driver));
input_autoconfigure_joypad(&params);
input_autoconfigure_connect(&params);
}
}

View File

@ -295,7 +295,7 @@ static bool input_autoconfigure_joypad_init(autoconfig_params_t *params)
return true;
}
bool input_autoconfigure_joypad(autoconfig_params_t *params)
bool input_autoconfigure_connect(autoconfig_params_t *params)
{
char msg[255];

View File

@ -32,7 +32,7 @@ typedef struct autoconfig_params
int32_t pid;
} autoconfig_params_t;
bool input_autoconfigure_joypad(autoconfig_params_t *params);
bool input_autoconfigure_connect(autoconfig_params_t *params);
void input_autoconfigure_disconnect(unsigned i, const char *ident);