eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input: make unique mapping per port.

Browse Source
This commit is contained in:
Sorgelig
2023-05-21 02:28:34 +08:00
parent 0ebf137532
commit d6eefdcbdc
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfg.cpp
View File

@@ -119,7 +119,7 @@ static const ini_var_t ini_vars[] =
{ "HDR_AVG_NITS", (void*)(&(cfg.hdr_avg_nits)), UINT16, 100, 10000},
{ "VGA_MODE", (void*)(&(cfg.vga_mode)), STRING, 0, sizeof(cfg.vga_mode) - 1 },
{ "NTSC_MODE", (void *)(&(cfg.ntsc_mode)), UINT8, 0, 2},
{ "UNIQUE_MAPPING", (void *)(&(cfg.unique_mapping)), UINT8, 0, 1},
{ "CONTROLLER_UNIQUE_MAPPING", (void *)(&(cfg.controller_unique_mapping)), UINT8, 0, 1},
};
static const int nvars = (int)(sizeof(ini_vars) / sizeof(ini_var_t));

2
cfg.h
View File

@@ -91,7 +91,7 @@ typedef struct {
char vga_mode[16];
char vga_mode_int;
char ntsc_mode;
uint8_t unique_mapping;
uint8_t controller_unique_mapping;
} cfg_t;
extern cfg_t cfg;

11
input.cpp
View File

@@ -1443,8 +1443,8 @@ static char *get_map_name(int dev, int def)
{
static char name[128];
char id[32];
if (cfg.unique_mapping) sprintfz(id, "%08x", input[dev].unique_hash);
if (cfg.controller_unique_mapping) sprintfz(id, "%08x", input[dev].unique_hash);
else strcpyz(id, input[dev].idstr);
if (def || is_menu()) sprintf(name, "input_%s%s_v3.map", id, input[dev].mod ? "_m" : "");
@@ -1455,10 +1455,10 @@ static char *get_map_name(int dev, int def)
static char *get_kbdmap_name(int dev)
{
static char name[128];
if (cfg.unique_mapping) sprintfz(name, "kbd_%08x.map", input[dev].unique_hash);
if (cfg.controller_unique_mapping) sprintfz(name, "kbd_%08x.map", input[dev].unique_hash);
else sprintfz(name, "kbd_%s.map", input[dev].idstr);
return name;
}
@@ -3399,6 +3399,7 @@ void mergedevs()
int unique_hash = str_hash(input[i].id);
unique_hash = str_hash(input[i].mac, unique_hash);
unique_hash = str_hash(input[i].idstr, unique_hash);
unique_hash = str_hash(input[i].sysfs, unique_hash);
input[i].unique_hash = unique_hash;
input[i].timeout = (strlen(uniq) && strstr(sysfs, "bluetooth")) ? (cfg.bt_auto_disconnect * 10) : 0;

2
str_util.cpp
View File

@@ -38,7 +38,7 @@ unsigned int str_hash(const char *s, unsigned int initial)
unsigned int hash = initial;
int c;
while( c = *s++ )
while((c = *s++))
{
hash = ((hash << 5) + hash) + c;
}