Don't memset autoconfig_params_t

This commit is contained in:
twinaphex 2016-12-17 14:26:13 +01:00
parent d4796caabd
commit aafae944cb
17 changed files with 84 additions and 42 deletions

View File

@ -642,7 +642,7 @@ static void handle_hotplug(android_input_data_t *android_data,
char device_name[256];
char device_model[256];
char name_buf[256];
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
int vendorId = 0;
int productId = 0;
settings_t *settings = config_get_ptr();
@ -895,6 +895,7 @@ static void handle_hotplug(android_input_data_t *android_data,
params.idx = *port;
params.vid = vendorId;
params.pid = productId;
params.display_name[0] = '\0';
strlcpy(params.driver, android_joypad.ident, sizeof(params.driver));
input_autoconfigure_connect(&params);

View File

@ -298,11 +298,12 @@ static void iohidmanager_hid_device_add_autodetect(unsigned idx,
const char *device_name, const char *driver_name,
uint16_t dev_vid, uint16_t dev_pid)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
params.idx = idx;
params.vid = dev_vid;
params.pid = dev_pid;
params.display_name[0] = '\0';
strlcpy(params.name, device_name, sizeof(params.name));
strlcpy(params.driver, driver_name, sizeof(params.driver));

View File

@ -141,11 +141,12 @@ static void libusb_hid_device_add_autodetect(unsigned idx,
const char *device_name, const char *driver_name,
uint16_t dev_vid, uint16_t dev_pid)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
params.idx = idx;
params.vid = dev_vid;
params.pid = dev_pid;
params.display_name[0] = '\0';
strlcpy(params.name, device_name, sizeof(params.name));
strlcpy(params.driver, driver_name, sizeof(params.driver));

View File

@ -139,11 +139,12 @@ static void wiiusb_hid_device_add_autodetect(unsigned idx,
const char *device_name, const char *driver_name,
uint16_t dev_vid, uint16_t dev_pid)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
params.idx = idx;
params.vid = dev_vid;
params.pid = dev_pid;
params.display_name[0] = '\0';
strlcpy(params.name, device_name, sizeof(params.name));
strlcpy(params.driver, driver_name, sizeof(params.driver));

View File

@ -45,10 +45,14 @@ static const char *ctr_joypad_name(unsigned pad)
static void ctr_joypad_autodetect_add(unsigned autoconf_pad)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
params.vid = 0;
params.pid = 0;
params.display_name[0] = '\0';
strlcpy(params.name, ctr_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, ctr_joypad.ident, sizeof(params.driver));

View File

@ -264,7 +264,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
if (!is_xinput_pad)
#endif
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
strlcpy(params.name,
dinput_joypad_name(g_joypad_cnt),

View File

@ -144,10 +144,13 @@ static void handle_hotplug(unsigned port, uint32_t ptype)
if (ptype != WPAD_EXP_NOCONTROLLER)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
/* TODO - implement VID/PID? */
params.idx = port;
params.vid = 0;
params.pid = 0;
params.display_name[0] = '\0';
strlcpy(params.name, gx_joypad_name(port), sizeof(params.name));
strlcpy(params.driver, gx_joypad.ident, sizeof(params.driver));
input_autoconfigure_connect(&params);

View File

@ -136,7 +136,7 @@ static void handle_plugged_pad(void)
for (i = 0; i < rc; i += event->len + sizeof(struct inotify_event))
{
unsigned idx;
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
event = (struct inotify_event*)&event_buf[i];
@ -147,6 +147,12 @@ static void handle_plugged_pad(void)
if (idx >= MAX_USERS)
continue;
/* TODO - implement VID/PID? */
params.display_name[0] = '\0';
params.vid = 0;
params.pid = 0;
params.idx = idx;
if (event->mask & IN_DELETE)
{
if (linuxraw_pads[idx].fd >= 0)
@ -160,8 +166,6 @@ static void handle_plugged_pad(void)
linuxraw_pads[idx].fd = -1;
*linuxraw_pads[idx].ident = '\0';
/* TODO - implement VID/PID? */
params.idx = idx;
input_autoconfigure_connect(&params);
}
@ -178,10 +182,8 @@ static void handle_plugged_pad(void)
if ( !string_is_empty(linuxraw_pads[idx].ident)
&& linuxraw_joypad_init_pad(path, &linuxraw_pads[idx]))
{
params.idx = idx;
strlcpy(params.name, linuxraw_pads[idx].ident, sizeof(params.name));
strlcpy(params.driver, linuxraw_joypad.ident, sizeof(params.driver));
/* TODO - implement VID/PID? */
input_autoconfigure_connect(&params);
}

View File

@ -232,12 +232,12 @@ static void parport_free_pad(struct parport_joypad *pad)
static bool parport_joypad_init(void *data)
{
unsigned i, j;
autoconfig_params_t params;
bool found_enabled_button = false;
bool found_disabled_button = false;
char buf[PARPORT_NUM_BUTTONS * 3 + 1] = {0};
char pin[3 + 1] = {0};
settings_t *settings = config_get_ptr();
autoconfig_params_t params = {{0}};
(void)data;
@ -254,6 +254,9 @@ static bool parport_joypad_init(void *data)
snprintf(path, sizeof(path), "/dev/parport%u", i);
params.idx = i;
params.display_name[0] = '\0';
params.vid = 0;
params.pid = 0;
if (parport_joypad_init_pad(path, pad))
{

View File

@ -43,10 +43,14 @@ static const char *ps3_joypad_name(unsigned pad)
static void ps3_joypad_autodetect_add(unsigned autoconf_pad)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
params.display_name[0] = '\0';
params.vid = 0;
params.pid = 0;
strlcpy(params.name, ps3_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, ps3_joypad.ident, sizeof(params.driver));

View File

@ -72,10 +72,14 @@ static const char *psp_joypad_name(unsigned pad)
static void psp_joypad_autodetect_add(unsigned autoconf_pad)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
params.display_name[0] = '\0';
params.vid = 0;
params.pid = 0;
strlcpy(params.name, psp_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, psp_joypad.ident, sizeof(params.driver));

View File

@ -33,10 +33,14 @@ static bool qnx_joypad_init(void *data)
for (autoconf_pad = 0; autoconf_pad < MAX_USERS; autoconf_pad++)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
params.vid = 0;
params.pid = 0;
params.display_name[0] = '\0';
strlcpy(params.name, qnx_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, qnx_joypad.ident, sizeof(params.driver));

View File

@ -94,11 +94,11 @@ static int16_t sdl_pad_get_axis(sdl_joypad_t *pad, unsigned axis)
static void sdl_pad_connect(unsigned id)
{
autoconfig_params_t params;
sdl_joypad_t *pad = (sdl_joypad_t*)&sdl_pads[id];
bool success = false;
int32_t product = 0;
int32_t vendor = 0;
autoconfig_params_t params = {{0}};
#ifdef HAVE_SDL2
SDL_JoystickGUID guid;
@ -147,6 +147,7 @@ static void sdl_pad_connect(unsigned id)
params.idx = id;
params.vid = vendor;
params.pid = product;
params.display_name[0] = '\0';
input_autoconfigure_connect(&params);

View File

@ -202,6 +202,7 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
{
int i;
struct stat st;
autoconfig_params_t params;
int ret = 0;
const char *buf = NULL;
unsigned buttons = 0;
@ -211,7 +212,6 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
unsigned long keybit[NBITS(KEY_MAX)] = {0};
unsigned long absbit[NBITS(ABS_MAX)] = {0};
unsigned long ffbit[NBITS(FF_MAX)] = {0};
autoconfig_params_t params = {{0}};
settings_t *settings = config_get_ptr();
strlcpy(pad->ident, settings->input.device_names[p], sizeof(pad->ident));
@ -283,6 +283,7 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
{
strlcpy(params.name, pad->ident, sizeof(params.name));
params.display_name[0] = '\0';
params.idx = p;
params.vid = pad->vid;
params.pid = pad->pid;

View File

@ -47,10 +47,14 @@ static const char *wiiu_joypad_name(unsigned pad)
static void wiiu_joypad_autodetect_add(unsigned autoconf_pad)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
params.display_name[0] = '\0';
params.vid = 0;
params.pid = 0;
strlcpy(params.name, wiiu_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, wiiu_joypad.ident, sizeof(params.driver));

View File

@ -44,11 +44,15 @@ static const char *xdk_joypad_name(unsigned pad)
static void xdk_joypad_autodetect_add(unsigned autoconf_pad)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
settings_t *settings = config_get_ptr();
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
params.vid = 0;
params.pid = 0;
params.display_name[0] = '\0';
strlcpy(params.name, xdk_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, xdk_joypad.ident, sizeof(params.driver));
input_autoconfigure_connect(&params);

View File

@ -256,10 +256,14 @@ static bool xinput_joypad_init(void *data)
{
if (pad_index_to_xuser_index(autoconf_pad) > -1)
{
autoconfig_params_t params = {{0}};
autoconfig_params_t params;
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
params.display_name[0] = '\0';
params.vid = 0;
params.pid = 0;
strlcpy(params.name, xinput_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, xinput_joypad.ident, sizeof(params.driver));
input_autoconfigure_connect(&params);