mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change VID/PID passing to autodetect function - now int32_t

Browse Source 
values
This commit is contained in:
twinaphex 2014-09-30 20:35:58 +02:00
parent b0ade7e010
commit ec9a217090
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/android_input.c
View File

@ -510,8 +510,10 @@ static void handle_hotplug(android_input_t *android,
{
strlcpy(g_settings.input.device_names[*port],
name_buf, sizeof(g_settings.input.device_names[*port]));
/* TODO - implement VID/PID? */
input_config_autoconfigure_joypad(*port, name_buf, 0, 0, android_joypad.ident);
input_config_autoconfigure_joypad(*port, name_buf,
vendorId, productId,
android_joypad.ident);
RARCH_LOG("Port %d: %s.\n", *port, name_buf);
}

21
input/input_autodetect.c
View File

@ -37,14 +37,13 @@ static void input_autoconfigure_joypad_conf(config_file_t *conf,
static bool input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
unsigned index, const char *name, const char *driver,
const char *vid, const char *pid, bool block_osd_spam)
int32_t vid, int32_t pid, bool block_osd_spam)
{
if (!conf)
return false;
char ident[PATH_MAX], ident_idx[PATH_MAX];
char input_driver[PATH_MAX], input_vid[PATH_MAX],
input_pid[PATH_MAX];
char ident[PATH_MAX], ident_idx[PATH_MAX], input_driver[PATH_MAX];
int input_vid, input_pid;
bool cond_found_idx, cond_found_general,
cond_found_vid = false, cond_found_pid = false;
@ -52,8 +51,8 @@ static bool input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
config_get_array(conf, "input_device", ident, sizeof(ident));
config_get_array(conf, "input_driver", input_driver, sizeof(input_driver));
config_get_array(conf, "input_vendor_id", input_vid, sizeof(input_vid));
config_get_array(conf, "input_product_id", input_pid, sizeof(input_pid));
config_get_int(conf, "input_vendor_id", &input_vid);
config_get_int(conf, "input_product_id", &input_pid);
snprintf(ident_idx, sizeof(ident_idx), "%s_p%u", ident, index);
@ -61,10 +60,10 @@ static bool input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
cond_found_idx = !strcmp(ident_idx, name);
cond_found_general = !strcmp(ident, name) && !strcmp(driver, input_driver);
if (vid != 0)
cond_found_vid = !strcmp(vid, input_vid);
if (pid != 0)
cond_found_pid = !strcmp(vid, input_pid);
if ((vid != 0) && (input_vid != 0))
cond_found_vid = (vid == input_vid);
if ((pid != 0) && (input_pid != 0))
cond_found_pid = (pid == input_pid);
/* If Vendor ID and Product ID matches, we've found our
* entry. */
@ -95,7 +94,7 @@ found:
}
void input_config_autoconfigure_joypad(unsigned index,
const char *name, const char *vid, const char *pid,
const char *name, int32_t vid, int32_t pid,
const char *driver)
{
size_t i;

4
input/input_autodetect.h
View File

@ -17,11 +17,13 @@
#ifndef _INPUT_AUTODETECT_H
#define _INPUT_AUTODETECT_H
#include <stdint.h>
const struct retro_keybind *input_get_auto_bind(unsigned port,
unsigned id);
void input_config_autoconfigure_joypad(unsigned index,
const char *name, const char *vid, const char *pid,
const char *name, int32_t vid, int32_t pid,
const char *driver);
extern const char* const input_builtin_autoconfs[];

7
tools/retroarch-joyconfig.c
View File

@ -431,9 +431,14 @@ static void parse_input(int argc, char *argv[])
}
void input_config_autoconfigure_joypad(unsigned index,
const char *name, const char *vid, const char *pid,
const char *name, int32_t vid, int32_t pid,
const char *driver)
{
(void)index;
(void)name;
(void)vid;
(void)pid;
(void)driver;
}
// Need SDL_main on OSX.