rearrange globals

[picodrive.git] / platform / common / config_file.c

diff --git a/platform/common/config_file.c b/platform/common/config_file.c
index 324c993..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) {
-                               PicoOpt |=  POPT_EN_STEREO;
+                               PicoIn.opt |=  POPT_EN_STEREO;
                        } else if (strcasecmp(tmp, "mono") == 0) {
-                               PicoOpt &= ~POPT_EN_STEREO;
+                               PicoIn.opt &= ~POPT_EN_STEREO;
                        } 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;
-                               PicoRegionOverride = PicoAutoRgnOrder = 0;
+                               PicoIn.regionOverride = PicoIn.autoRgnOrder = 0;
                                for (i = 0; p < end && i < 3; i++)
                                {
                                        while (*p == ' ') p++;
                                        if        (p[0] == 'J' && p[1] == 'P') {
-                                               PicoAutoRgnOrder |= 1 << (i*4);
+                                               PicoIn.autoRgnOrder |= 1 << (i*4);
                                        } else if (p[0] == 'U' && p[1] == 'S') {
-                                               PicoAutoRgnOrder |= 4 << (i*4);
+                                               PicoIn.autoRgnOrder |= 4 << (i*4);
                                        } else if (p[0] == 'E' && p[1] == 'U') {
-                                               PicoAutoRgnOrder |= 8 << (i*4);
+                                               PicoIn.autoRgnOrder |= 8 << (i*4);
                                        }
                                        while (*p != ' ' && *p != 0) p++;
                                        if (*p == 0) break;
                                }
                        }
                        else   if (strcasecmp(val, "Auto") == 0) {
-                               PicoRegionOverride = 0;
+                               PicoIn.regionOverride = 0;
                        } else if (strcasecmp(val, "Japan NTSC") == 0) {
-                               PicoRegionOverride = 1;
+                               PicoIn.regionOverride = 1;
                        } else if (strcasecmp(val, "Japan PAL") == 0) {
-                               PicoRegionOverride = 2;
+                               PicoIn.regionOverride = 2;
                        } else if (strcasecmp(val, "USA") == 0) {
-                               PicoRegionOverride = 4;
+                               PicoIn.regionOverride = 4;
                        } else if (strcasecmp(val, "Europe") == 0) {
-                               PicoRegionOverride = 8;
+                               PicoIn.regionOverride = 8;
                        } 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);
@@ -422,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);
-                       return;
+                       continue;
                }
 
                mystrip(var + 5);