notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rearrange globals
[picodrive.git]
/
platform
/
common
/
config_file.c
diff --git
a/platform/common/config_file.c
b/platform/common/config_file.c
index
f8f7fdf
..
2d1186d
100644
(file)
--- a/
platform/common/config_file.c
+++ b/
platform/common/config_file.c
@@
-266,9
+266,9
@@
static int custom_read(menu_entry *me, const char *var, const char *val)
if (*tmp == 'Z' || *tmp == 'z') tmp++;
while (*tmp == ' ') tmp++;
if (strcasecmp(tmp, "stereo") == 0) {
if (*tmp == 'Z' || *tmp == 'z') tmp++;
while (*tmp == ' ') tmp++;
if (strcasecmp(tmp, "stereo") == 0) {
- Pico
O
pt |= POPT_EN_STEREO;
+ Pico
In.o
pt |= POPT_EN_STEREO;
} else if (strcasecmp(tmp, "mono") == 0) {
} else if (strcasecmp(tmp, "mono") == 0) {
- Pico
O
pt &= ~POPT_EN_STEREO;
+ Pico
In.o
pt &= ~POPT_EN_STEREO;
} else
return 0;
return 1;
} else
return 0;
return 1;
@@
-279,40
+279,35
@@
static int custom_read(menu_entry *me, const char *var, const char *val)
{
const char *p = val + 5, *end = val + strlen(val);
int i;
{
const char *p = val + 5, *end = val + strlen(val);
int i;
- Pico
RegionOverride = PicoA
utoRgnOrder = 0;
+ Pico
In.regionOverride = PicoIn.a
utoRgnOrder = 0;
for (i = 0; p < end && i < 3; i++)
{
while (*p == ' ') p++;
if (p[0] == 'J' && p[1] == 'P') {
for (i = 0; p < end && i < 3; i++)
{
while (*p == ' ') p++;
if (p[0] == 'J' && p[1] == 'P') {
- Pico
A
utoRgnOrder |= 1 << (i*4);
+ Pico
In.a
utoRgnOrder |= 1 << (i*4);
} else if (p[0] == 'U' && p[1] == 'S') {
} else if (p[0] == 'U' && p[1] == 'S') {
- Pico
A
utoRgnOrder |= 4 << (i*4);
+ Pico
In.a
utoRgnOrder |= 4 << (i*4);
} else if (p[0] == 'E' && p[1] == 'U') {
} else if (p[0] == 'E' && p[1] == 'U') {
- Pico
A
utoRgnOrder |= 8 << (i*4);
+ Pico
In.a
utoRgnOrder |= 8 << (i*4);
}
while (*p != ' ' && *p != 0) p++;
if (*p == 0) break;
}
}
else if (strcasecmp(val, "Auto") == 0) {
}
while (*p != ' ' && *p != 0) p++;
if (*p == 0) break;
}
}
else if (strcasecmp(val, "Auto") == 0) {
- Pico
R
egionOverride = 0;
+ Pico
In.r
egionOverride = 0;
} else if (strcasecmp(val, "Japan NTSC") == 0) {
} else if (strcasecmp(val, "Japan NTSC") == 0) {
- Pico
R
egionOverride = 1;
+ Pico
In.r
egionOverride = 1;
} else if (strcasecmp(val, "Japan PAL") == 0) {
} else if (strcasecmp(val, "Japan PAL") == 0) {
- Pico
R
egionOverride = 2;
+ Pico
In.r
egionOverride = 2;
} else if (strcasecmp(val, "USA") == 0) {
} else if (strcasecmp(val, "USA") == 0) {
- Pico
R
egionOverride = 4;
+ Pico
In.r
egionOverride = 4;
} else if (strcasecmp(val, "Europe") == 0) {
} else if (strcasecmp(val, "Europe") == 0) {
- Pico
R
egionOverride = 8;
+ Pico
In.r
egionOverride = 8;
} else
return 0;
return 1;
} else
return 0;
return 1;
- case MA_CDOPT_READAHEAD:
- if (strcasecmp(var, "ReadAhead buffer") != 0) return 0;
- PicoCDBuffers = atoi(val) / 2;
- return 1;
-
case MA_32XOPT_MSH2_CYCLES:
currentConfig.msh2_khz = atoi(val);
Pico32xSetClocks(currentConfig.msh2_khz * 1000, 0);
case MA_32XOPT_MSH2_CYCLES:
currentConfig.msh2_khz = atoi(val);
Pico32xSetClocks(currentConfig.msh2_khz * 1000, 0);
@@
-323,6
+318,10
@@
static int custom_read(menu_entry *me, const char *var, const char *val)
Pico32xSetClocks(0, currentConfig.ssh2_khz * 1000);
return 1;
Pico32xSetClocks(0, currentConfig.ssh2_khz * 1000);
return 1;
+ case MA_OPT2_GAMMA:
+ currentConfig.gamma = atoi(val);
+ return 1;
+
/* PSP */
case MA_OPT3_SCALE:
if (strcasecmp(var, "Scale factor") != 0) return 0;
/* PSP */
case MA_OPT3_SCALE:
if (strcasecmp(var, "Scale factor") != 0) return 0;
@@
-418,7
+417,7
@@
static void keys_parse_all(FILE *f)
acts = parse_bind_val(val, &type);
if (acts == -1) {
lprintf("config: unhandled action \"%s\"\n", val);
acts = parse_bind_val(val, &type);
if (acts == -1) {
lprintf("config: unhandled action \"%s\"\n", val);
-
return
;
+
continue
;
}
mystrip(var + 5);
}
mystrip(var + 5);