X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fconfig.c;h=e47a40131273a496ada148dbc6b66d859de43bc1;hb=45deb4099e6d20780376e6425d43107120a10bc6;hp=534fb4000dea7abad9d5df987933a38f3fc32f86;hpb=367b6f1f939dcd7930d372aee0ca900b0b8790b1;p=libpicofe.git

diff --git a/common/config.c b/common/config.c
index 534fb40..e47a401 100644
--- a/common/config.c
+++ b/common/config.c
@@ -1,43 +1,27 @@
 /*
  * Human-readable config file management for PicoDrive
- * (c)
+ * (c) notaz, 2008
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef __EPOC32__
+#include <unistd.h>
+#endif
 #include "config.h"
-#include "menu.h"
-#include "emu.h"
+#include "input.h"
 #include "lprintf.h"
-#include <Pico/Pico.h>
-
-extern menu_entry opt_entries[];
-extern menu_entry opt2_entries[];
-extern menu_entry cdopt_entries[];
-extern const int opt_entry_count;
-extern const int opt2_entry_count;
-extern const int cdopt_entry_count;
-
-static menu_entry *cfg_opts[] = { opt_entries, opt2_entries, cdopt_entries };
-static const int *cfg_opt_counts[] = { &opt_entry_count, &opt2_entry_count, &cdopt_entry_count };
-
-#define NL "\n"
 
+static char *mystrip(char *str);
 
-static void mystrip(char *str)
-{
-	int i, len;
+#ifndef _MSC_VER
 
-	len = strlen(str);
-	for (i = 0; i < len; i++)
-		if (str[i] != ' ') break;
-	if (i > 0) memmove(str, str + i, len - i + 1);
-	len = strlen(str);
-	for (i = len - 1; i >= 0; i--)
-		if (str[i] != ' ') break;
-	str[i+1] = 0;
-}
+#include "menu.h"
+#include "emu.h"
+#include <pico/pico.h>
 
+#define NL "\r\n"
 
 static int seek_sect(FILE *f, const char *section)
 {
@@ -62,64 +46,10 @@ static int seek_sect(FILE *f, const char *section)
 
 static void custom_write(FILE *f, const menu_entry *me, int no_def)
 {
-	char *str, str24[24];
+	char str24[24];
 
 	switch (me->id)
 	{
-		case MA_OPT_RENDERER:
-			if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&0x10) &&
-				!((defaultConfig.EmuOpt^currentConfig.EmuOpt)&0x80)) return;
-			if (PicoOpt&0x10)
-				str = "8bit fast";
-			else if (currentConfig.EmuOpt&0x80)
-				str = "16bit accurate";
-			else
-				str = "8bit accurate";
-			fprintf(f, "Renderer = %s", str);
-			break;
-
-		case MA_OPT_SCALING:
-			if (no_def && defaultConfig.scaling == currentConfig.scaling) return;
-			switch (currentConfig.scaling) {
-				default: str = "OFF"; break;
-				case 1:  str = "hw horizontal";     break;
-				case 2:  str = "hw horiz. + vert."; break;
-				case 3:  str = "sw horizontal";     break;
-			}
-			fprintf(f, "Scaling = %s", str);
-			break;
-		case MA_OPT_FRAMESKIP:
-			if (no_def && defaultConfig.Frameskip == currentConfig.Frameskip) return;
-			if (currentConfig.Frameskip < 0)
-			     strcpy(str24, "Auto");
-			else sprintf(str24, "%i", currentConfig.Frameskip);
-			fprintf(f, "Frameskip = %s", str24);
-			break;
-		case MA_OPT_SOUND_QUALITY:
-			if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&8) &&
-				defaultConfig.s_PsndRate == PsndRate) return;
-			str = (PicoOpt&0x08)?"stereo":"mono";
-			fprintf(f, "Sound Quality = %i %s", PsndRate, str);
-			break;
-		case MA_OPT_REGION:
-			if (no_def && defaultConfig.s_PicoRegion == PicoRegionOverride &&
-				defaultConfig.s_PicoAutoRgnOrder == PicoAutoRgnOrder) return;
-			fprintf(f, "Region = %s", me_region_name(PicoRegionOverride, PicoAutoRgnOrder));
-			break;
-		case MA_OPT_CONFIRM_STATES:
-			if (no_def && !((defaultConfig.EmuOpt^currentConfig.EmuOpt)&(5<<9))) return;
-			switch ((currentConfig.EmuOpt >> 9) & 5) {
-				default: str = "OFF";    break;
-				case 1:  str = "writes"; break;
-				case 4:  str = "loads";  break;
-				case 5:  str = "both";   break;
-			}
-			fprintf(f, "Confirm savestate = %s", str);
-			break;
-		case MA_OPT_CPU_CLOCKS:
-			if (no_def && defaultConfig.CPUclock == currentConfig.CPUclock) return;
-			fprintf(f, "GP2X CPU clocks = %i", currentConfig.CPUclock);
-			break;
 		case MA_OPT2_GAMMA:
 			if (no_def && defaultConfig.gamma == currentConfig.gamma) return;
 			fprintf(f, "Gamma correction = %.3f", (double)currentConfig.gamma / 100.0);
@@ -133,6 +63,38 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
 			sprintf(str24, "%i", PicoCDBuffers * 2);
 			fprintf(f, "ReadAhead buffer = %s", str24);
 			break;
+		/* PSP */
+		case MA_OPT3_SCALE:
+			if (no_def && defaultConfig.scale == currentConfig.scale) return;
+			fprintf(f, "Scale factor = %.2f", currentConfig.scale);
+			break;
+		case MA_OPT3_HSCALE32:
+			if (no_def && defaultConfig.hscale32 == currentConfig.hscale32) return;
+			fprintf(f, "Hor. scale (for low res. games) = %.2f", currentConfig.hscale32);
+			break;
+		case MA_OPT3_HSCALE40:
+			if (no_def && defaultConfig.hscale40 == currentConfig.hscale40) return;
+			fprintf(f, "Hor. scale (for hi res. games) = %.2f", currentConfig.hscale40);
+			break;
+		case MA_OPT3_FILTERING:
+			if (no_def && defaultConfig.scaling == currentConfig.scaling) return;
+			fprintf(f, "Bilinear filtering = %i", currentConfig.scaling);
+			break;
+		case MA_OPT3_GAMMAA:
+			if (no_def && defaultConfig.gamma == currentConfig.gamma) return;
+			fprintf(f, "Gamma adjustment = %i", currentConfig.gamma);
+			break;
+		case MA_OPT3_BLACKLVL:
+			if (no_def && defaultConfig.gamma2 == currentConfig.gamma2) return;
+			fprintf(f, "Black level = %i", currentConfig.gamma2);
+			break;
+		case MA_OPT3_VSYNC:
+			if (no_def && (defaultConfig.EmuOpt&0x12000) == (currentConfig.gamma2&0x12000)) return;
+			strcpy(str24, "never");
+			if (currentConfig.EmuOpt & 0x2000)
+				strcpy(str24, (currentConfig.EmuOpt & 0x10000) ? "sometimes" : "always");
+			fprintf(f, "Wait for vsync = %s", str24);
+			break;
 
 		default:
 			lprintf("unhandled custom_write: %i\n", me->id);
@@ -142,47 +104,60 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def)
 }
 
 
-static const char *joyKeyNames[32] =
-{
-	"UP", "DOWN", "LEFT", "RIGHT", "b1", "b2", "b3", "b4",
-	"b5",  "b6",  "b7",  "b8",  "b9",  "b10", "b11", "b12",
-	"b13", "b14", "b15", "b16", "b17", "b19", "b19", "b20",
-	"b21", "b22", "b23", "b24", "b25", "b26", "b27", "b28"
-};
-
-static void keys_write(FILE *fn, const char *bind_str, const int binds[32],
-		const int def_binds[32], const char *names[32], int no_defaults)
+static void keys_write(FILE *fn, const char *bind_str, int dev_id, const int *binds, int no_defaults)
 {
-	int t, i;
 	char act[48];
+	int key_count, k, i;
+	const int *def_binds;
 
-	for (t = 0; t < 32; t++)
+	key_count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
+	def_binds = in_get_dev_def_binds(dev_id);
+
+	for (k = 0; k < key_count; k++)
 	{
+		const char *name;
+		int t, mask;
 		act[0] = act[31] = 0;
-		if (no_defaults && binds[t] == def_binds[t])
+
+		for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+			if (binds[IN_BIND_OFFS(k, t)] != def_binds[IN_BIND_OFFS(k, t)])
+				break;
+
+		if (no_defaults && t == IN_BINDTYPE_COUNT)
+			continue;	/* no change from defaults */
+
+		name = in_get_key_name(dev_id, k);
+
+		for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+			if (binds[IN_BIND_OFFS(k, t)] != 0 || def_binds[IN_BIND_OFFS(k, t)] == 0)
+				break;
+
+		if (t == IN_BINDTYPE_COUNT) {
+			/* key has default bind removed */
+			fprintf(fn, "%s %s =" NL, bind_str, name);
 			continue;
-		if (strcmp(names[t], "???") == 0) continue;
-#ifdef __GP2X__
-		if (strcmp(names[t], "SELECT") == 0) continue;
-#endif
+		}
+
 		for (i = 0; i < sizeof(me_ctrl_actions) / sizeof(me_ctrl_actions[0]); i++) {
-			if (me_ctrl_actions[i].mask & binds[t]) {
-				sprintf(act, "player%i ", ((binds[t]>>16)&1)+1);
-				strncpy(act + 8, me_ctrl_actions[i].name, 31);
-				break;
+			mask = me_ctrl_actions[i].mask;
+			if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_PLAYER12)]) {
+				strncpy(act, me_ctrl_actions[i].name, 31);
+				fprintf(fn, "%s %s = player1 %s" NL, bind_str, name, mystrip(act));
+			}
+			mask = me_ctrl_actions[i].mask << 16;
+			if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_PLAYER12)]) {
+				strncpy(act, me_ctrl_actions[i].name, 31);
+				fprintf(fn, "%s %s = player2 %s" NL, bind_str, name, mystrip(act));
 			}
 		}
-		if (act[0] == 0)
-		{
-			for (i = 0; emuctrl_actions[i].name != NULL; i++)
-				if (emuctrl_actions[i].mask & binds[t]) {
-					strncpy(act, emuctrl_actions[i].name, 31);
-					break;
-				}
-		}
-		mystrip(act);
 
-		fprintf(fn, "%s %s = %s" NL, bind_str, names[t], act);
+		for (i = 0; emuctrl_actions[i].name != NULL; i++) {
+			mask = emuctrl_actions[i].mask;
+			if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_EMU)]) {
+				strncpy(act, emuctrl_actions[i].name, 31);
+				fprintf(fn, "%s %s = %s" NL, bind_str, name, mystrip(act));
+			}
+		}
 	}
 }
 
@@ -217,6 +192,10 @@ static int default_var(const menu_entry *me)
 		case MA_CDOPT_LEDS:
 			return defaultConfig.EmuOpt;
 
+		case MA_CTRL_TURBO_RATE: return defaultConfig.turbo_rate;
+		case MA_OPT_SCALING:     return defaultConfig.scaling;
+		case MA_OPT_ROTATION:    return defaultConfig.rotation;
+
 		case MA_OPT_SAVE_SLOT:
 		default:
 			return 0;
@@ -228,7 +207,7 @@ int config_writesect(const char *fname, const char *section)
 	FILE *fo = NULL, *fn = NULL; // old and new
 	int no_defaults = 0; // avoid saving defaults
 	menu_entry *me;
-	int t, i, tlen, ret;
+	int t, tlen, ret;
 	char line[128], *tmp;
 
 	if (section != NULL)
@@ -297,31 +276,62 @@ write:
 	if (section != NULL)
 		fprintf(fn, "[%s]" NL, section);
 
-	for (t = 0; t < sizeof(cfg_opts) / sizeof(cfg_opts[0]); t++)
+	me = me_list_get_first();
+	while (me != NULL)
 	{
-		me = cfg_opts[t];
-		tlen = *(cfg_opt_counts[t]);
-		for (i = 0; i < tlen; i++, me++)
-		{
-			if (!me->need_to_save) continue;
-			if ((me->beh != MB_ONOFF && me->beh != MB_RANGE) || me->name == NULL)
-				custom_write(fn, me, no_defaults);
-			else if (me->beh == MB_ONOFF) {
-				if (!no_defaults || ((*(int *)me->var ^ default_var(me)) & me->mask))
-					fprintf(fn, "%s = %i" NL, me->name, (*(int *)me->var & me->mask) ? 1 : 0);
-			} else if (me->beh == MB_RANGE) {
-				if (!no_defaults || ((*(int *)me->var ^ default_var(me)) & me->mask))
-					fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var);
-			}
-		}
+		int dummy;
+		if (!me->need_to_save)
+			goto next;
+		if (me->beh == MB_OPT_ONOFF) {
+			if (!no_defaults || ((*(int *)me->var ^ default_var(me)) & me->mask))
+				fprintf(fn, "%s = %i" NL, me->name, (*(int *)me->var & me->mask) ? 1 : 0);
+		} else if (me->beh == MB_OPT_RANGE) {
+			if (!no_defaults || (*(int *)me->var ^ default_var(me)))
+				fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var);
+		} else if (me->name != NULL && me->generate_name != NULL) {
+			strncpy(line, me->generate_name(0, &dummy), sizeof(line));
+			line[sizeof(line) - 1] = 0;
+			mystrip(line);
+			fprintf(fn, "%s = %s" NL, me->name, line);
+		} else
+			custom_write(fn, me, no_defaults);
+next:
+		me = me_list_get_next();
 	}
 
-	// save key config
-	keys_write(fn, "bind", currentConfig.KeyBinds, defaultConfig.KeyBinds, keyNames, no_defaults);
-	keys_write(fn, "bind_joy0", currentConfig.JoyBinds[0], defaultConfig.JoyBinds[0], joyKeyNames, 1);
-	keys_write(fn, "bind_joy1", currentConfig.JoyBinds[1], defaultConfig.JoyBinds[1], joyKeyNames, 1);
-	keys_write(fn, "bind_joy2", currentConfig.JoyBinds[2], defaultConfig.JoyBinds[2], joyKeyNames, 1);
-	keys_write(fn, "bind_joy3", currentConfig.JoyBinds[3], defaultConfig.JoyBinds[3], joyKeyNames, 1);
+	/* input: save device names */
+	for (t = 0; t < IN_MAX_DEVS; t++)
+	{
+		const int  *binds = in_get_dev_binds(t);
+		const char *name =  in_get_dev_name(t, 0, 0);
+		if (binds == NULL || name == NULL)
+			continue;
+
+		fprintf(fn, "input%d = %s" NL, t, name);
+	}
+
+	/* input: save binds */
+	for (t = 0; t < IN_MAX_DEVS; t++)
+	{
+		const int *binds = in_get_dev_binds(t);
+		const char *name = in_get_dev_name(t, 0, 0);
+		char strbind[16];
+		int count;
+
+		if (binds == NULL || name == NULL)
+			continue;
+
+		sprintf(strbind, "bind%d", t);
+		if (t == 0) strbind[4] = 0;
+
+		count = in_get_dev_info(t, IN_INFO_BIND_COUNT);
+		keys_write(fn, strbind, t, binds, no_defaults);
+	}
+
+#ifndef PSP
+	if (section == NULL)
+		fprintf(fn, "Sound Volume = %i" NL, currentConfig.volume);
+#endif
 
 	fprintf(fn, NL);
 
@@ -351,7 +361,7 @@ int config_writelrom(const char *fname)
 	int size;
 	FILE *f;
 
-	if (strlen(lastRomFile) == 0) return 0;
+	if (strlen(rom_fname_loaded) == 0) return -1;
 
 	f = fopen(fname, "r");
 	if (f != NULL)
@@ -384,7 +394,7 @@ int config_writelrom(const char *fname)
 		fwrite(old_data, 1, optr - old_data, f);
 		free(old_data);
 	}
-	fprintf(f, "LastUsedROM = %s" NL, lastRomFile);
+	fprintf(f, "LastUsedROM = %s" NL, rom_fname_loaded);
 	fclose(f);
 	return 0;
 }
@@ -415,9 +425,9 @@ int config_readlrom(const char *fname)
 		tmp++;
 		mystrip(tmp);
 
-		len = sizeof(lastRomFile);
-		strncpy(lastRomFile, tmp, len);
-		lastRomFile[len-1] = 0;
+		len = sizeof(rom_fname_loaded);
+		strncpy(rom_fname_loaded, tmp, len);
+		rom_fname_loaded[len-1] = 0;
 		ret = 0;
 		break;
 	}
@@ -435,15 +445,15 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 	{
 		case MA_OPT_RENDERER:
 			if (strcasecmp(var, "Renderer") != 0) return 0;
-			if      (strcasecmp(val, "8bit fast") == 0) {
-				PicoOpt |=  0x10;
+			if      (strcasecmp(val, "8bit fast") == 0 || strcasecmp(val, "fast") == 0) {
+				PicoOpt |=  POPT_ALT_RENDERER;
 			}
-			else if (strcasecmp(val, "16bit accurate") == 0) {
-				PicoOpt &= ~0x10;
+			else if (strcasecmp(val, "16bit accurate") == 0 || strcasecmp(val, "accurate") == 0) {
+				PicoOpt &= ~POPT_ALT_RENDERER;
 				currentConfig.EmuOpt |=  0x80;
 			}
 			else if (strcasecmp(val, "8bit accurate") == 0) {
-				PicoOpt &= ~0x10;
+				PicoOpt &= ~POPT_ALT_RENDERER;
 				currentConfig.EmuOpt &= ~0x80;
 			}
 			else
@@ -451,18 +461,22 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 			return 1;
 
 		case MA_OPT_SCALING:
+#ifdef __GP2X__
 			if (strcasecmp(var, "Scaling") != 0) return 0;
 			if        (strcasecmp(val, "OFF") == 0) {
-				currentConfig.scaling = 0;
+				currentConfig.scaling = EOPT_SCALE_NONE;
 			} else if (strcasecmp(val, "hw horizontal") == 0) {
-				currentConfig.scaling = 1;
+				currentConfig.scaling = EOPT_SCALE_HW_H;
 			} else if (strcasecmp(val, "hw horiz. + vert.") == 0) {
-				currentConfig.scaling = 2;
+				currentConfig.scaling = EOPT_SCALE_HW_HV;
 			} else if (strcasecmp(val, "sw horizontal") == 0) {
-				currentConfig.scaling = 3;
+				currentConfig.scaling = EOPT_SCALE_SW_H;
 			} else
 				return 0;
 			return 1;
+#else
+			return 0;
+#endif
 
 		case MA_OPT_FRAMESKIP:
 			if (strcasecmp(var, "Frameskip") != 0) return 0;
@@ -478,9 +492,9 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 				PsndRate = 22050;
 			while (*tmp == ' ') tmp++;
 			if        (strcasecmp(tmp, "stereo") == 0) {
-				PicoOpt |=  8;
+				PicoOpt |=  POPT_EN_STEREO;
 			} else if (strcasecmp(tmp, "mono") == 0) {
-				PicoOpt &= ~8;
+				PicoOpt &= ~POPT_EN_STEREO;
 			} else
 				return 0;
 			return 1;
@@ -537,10 +551,16 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 				return 0;
 			return 1;
 
+#if 0 // TODO rm?
 		case MA_OPT_CPU_CLOCKS:
+#ifdef __GP2X__
 			if (strcasecmp(var, "GP2X CPU clocks") != 0) return 0;
+#elif defined(PSP)
+			if (strcasecmp(var, "PSP CPU clock") != 0) return 0;
+#endif
 			currentConfig.CPUclock = atoi(val);
 			return 1;
+#endif
 
 		case MA_OPT2_GAMMA:
 			if (strcasecmp(var, "Gamma correction") != 0) return 0;
@@ -559,6 +579,44 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 			PicoCDBuffers = atoi(val) / 2;
 			return 1;
 
+		/* PSP */
+		case MA_OPT3_SCALE:
+			if (strcasecmp(var, "Scale factor") != 0) return 0;
+			currentConfig.scale = atof(val);
+			return 1;
+		case MA_OPT3_HSCALE32:
+			if (strcasecmp(var, "Hor. scale (for low res. games)") != 0) return 0;
+			currentConfig.hscale32 = atof(val);
+			return 1;
+		case MA_OPT3_HSCALE40:
+			if (strcasecmp(var, "Hor. scale (for hi res. games)") != 0) return 0;
+			currentConfig.hscale40 = atof(val);
+			return 1;
+		case MA_OPT3_FILTERING:
+			if (strcasecmp(var, "Bilinear filtering") != 0) return 0;
+			currentConfig.scaling = atoi(val);
+			return 1;
+		case MA_OPT3_GAMMAA:
+			if (strcasecmp(var, "Gamma adjustment") != 0) return 0;
+			currentConfig.gamma = atoi(val);
+			return 1;
+		case MA_OPT3_BLACKLVL:
+			if (strcasecmp(var, "Black level") != 0) return 0;
+			currentConfig.gamma2 = atoi(val);
+			return 1;
+		case MA_OPT3_VSYNC:
+			if (strcasecmp(var, "Wait for vsync") != 0) return 0;
+			if        (strcasecmp(val, "never") == 0) {
+				currentConfig.EmuOpt &= ~0x12000;
+			} else if (strcasecmp(val, "sometimes") == 0) {
+				currentConfig.EmuOpt |=  0x12000;
+			} else if (strcasecmp(val, "always") == 0) {
+				currentConfig.EmuOpt &= ~0x12000;
+				currentConfig.EmuOpt |=  0x02000;
+			} else
+				return 0;
+			return 1;
+
 		default:
 			lprintf("unhandled custom_read: %i\n", me->id);
 			return 0;
@@ -566,102 +624,143 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 }
 
 
-static void keys_parse(const char *var, const char *val, int binds[32], const char *names[32])
-{
-	int t, i, keys_encountered = 0;
-	unsigned int player;
+static unsigned int keys_encountered = 0;
 
-	for (t = 0; t < 32; t++)
-	{
-		if (strcmp(names[t], var) == 0) break;
-	}
-	if (t == 32) {
-		lprintf("unhandled bind \"%s\"\n", var);
-		return;
-	}
+static int parse_bind_val(const char *val, int *type)
+{
+	int i;
 
-	if (!(keys_encountered & (1<<t))) {
-		binds[t] = 0;
-		keys_encountered |= 1<<t;
-	}
+	*type = IN_BINDTYPE_NONE;
 	if (val[0] == 0)
-		return;
+		return 0;
+	
 	if (strncasecmp(val, "player", 6) == 0)
 	{
+		int player, shift = 0;
 		player = atoi(val + 6) - 1;
-		if (player > 1) goto fail;
+
+		if (player > 1)
+			return -1;
+		if (player == 1)
+			shift = 16;
+
+		*type = IN_BINDTYPE_PLAYER12;
 		for (i = 0; i < sizeof(me_ctrl_actions) / sizeof(me_ctrl_actions[0]); i++) {
-			if (strncasecmp(me_ctrl_actions[i].name, val + 8, strlen(val + 8)) == 0) {
-				binds[t] |= me_ctrl_actions[i].mask | (player<<16);
-				return;
-			}
+			if (strncasecmp(me_ctrl_actions[i].name, val + 8, strlen(val + 8)) == 0)
+				return me_ctrl_actions[i].mask << shift;
 		}
 	}
 	for (i = 0; emuctrl_actions[i].name != NULL; i++) {
 		if (strncasecmp(emuctrl_actions[i].name, val, strlen(val)) == 0) {
-			binds[t] |= emuctrl_actions[i].mask;
-			return;
+			*type = IN_BINDTYPE_EMU;
+			return emuctrl_actions[i].mask;
 		}
 	}
 
-fail:
-	lprintf("unhandled action \"%s\"\n", val);
-	return;
+	return -1;
+}
+
+static void keys_parse(const char *key, const char *val, int dev_id)
+{
+	int acts, type;
 
+	acts = parse_bind_val(val, &type);
+	if (acts == -1) {
+		lprintf("config: unhandled action \"%s\"\n", val);
+		return;
+	}
+
+	in_config_bind_key(dev_id, key, acts, type);
 }
 
+static int get_numvar_num(const char *var)
+{
+	char *p = NULL;
+	int num;
+	
+	if (var[0] == ' ')
+		return 0;
+
+	num = strtoul(var, &p, 10);
+	if (*p == 0 || *p == ' ')
+		return num;
 
-#define try_joy_parse(num) { \
-	if (strncasecmp(var, "bind_joy"#num " ", 10) == 0) { \
-		keys_parse(var + 10, val, currentConfig.JoyBinds[num], joyKeyNames); \
-		return; \
-	} \
+	return -1;
 }
 
+/* map dev number in confing to input dev number */
+static unsigned char input_dev_map[IN_MAX_DEVS];
+
 static void parse(const char *var, const char *val)
 {
 	menu_entry *me;
-	int t, i, tlen, tmp, ret = 0;
+	int tmp, ret = 0;
 
 	if (strcasecmp(var, "LastUsedROM") == 0)
 		return; /* handled elsewhere */
 
+	if (strcasecmp(var, "Sound Volume") == 0) {
+		currentConfig.volume = atoi(val);
+		return;
+	}
+
+	/* input: device name */
+	if (strncasecmp(var, "input", 5) == 0) {
+		int num = get_numvar_num(var + 5);
+		if (num >= 0 && num < IN_MAX_DEVS)
+			input_dev_map[num] = in_config_parse_dev(val);
+		else
+			lprintf("config: failed to parse: %s\n", var);
+		return;
+	}
+
 	// key binds
-	if (strncasecmp(var, "bind ", 5) == 0) {
-		keys_parse(var + 5, val, currentConfig.KeyBinds, keyNames);
+	if (strncasecmp(var, "bind", 4) == 0) {
+		const char *p = var + 4;
+		int num = get_numvar_num(p);
+		if (num < 0 || num >= IN_MAX_DEVS) {
+			lprintf("config: failed to parse: %s\n", var);
+			return;
+		}
+
+		num = input_dev_map[num];
+		if (num < 0 || num >= IN_MAX_DEVS) {
+			lprintf("config: invalid device id: %s\n", var);
+			return;
+		}
+
+		while (*p && *p != ' ') p++;
+		while (*p && *p == ' ') p++;
+		keys_parse(p, val, num);
 		return;
 	}
-	try_joy_parse(0)
-	try_joy_parse(1)
-	try_joy_parse(2)
-	try_joy_parse(3)
 
-	for (t = 0; t < sizeof(cfg_opts) / sizeof(cfg_opts[0]) && ret == 0; t++)
+	me = me_list_get_first();
+	while (me != NULL && ret == 0)
 	{
-		me = cfg_opts[t];
-		tlen = *(cfg_opt_counts[t]);
-		for (i = 0; i < tlen && ret == 0; i++, me++)
-		{
-			if (!me->need_to_save) continue;
-			if (me->name != NULL) {
-				if (strcasecmp(var, me->name) != 0) continue; // surely not this one
-				if (me->beh == MB_ONOFF) {
-					tmp = atoi(val);
-					if (tmp) *(int *)me->var |=  me->mask;
-					else     *(int *)me->var &= ~me->mask;
-					return;
-				} else if (me->beh == MB_RANGE) {
-					tmp = atoi(val);
-					if (tmp < me->min) tmp = me->min;
-					if (tmp > me->max) tmp = me->max;
-					*(int *)me->var = tmp;
-					return;
-				}
+		if (!me->need_to_save)
+			goto next;
+		if (me->name != NULL && me->name[0] != 0) {
+			if (strcasecmp(var, me->name) != 0)
+				goto next; /* surely not this one */
+			if (me->beh == MB_OPT_ONOFF) {
+				tmp = atoi(val);
+				if (tmp) *(int *)me->var |=  me->mask;
+				else     *(int *)me->var &= ~me->mask;
+				return;
+			} else if (me->beh == MB_OPT_RANGE) {
+				tmp = atoi(val);
+				if (tmp < me->min) tmp = me->min;
+				if (tmp > me->max) tmp = me->max;
+				*(int *)me->var = tmp;
+				return;
 			}
-			ret = custom_read(me, var, val);
 		}
+		ret = custom_read(me, var, val);
+next:
+		me = me_list_get_next();
 	}
-	if (!ret) lprintf("config_readsect: unhandled var: %s\n", var);
+	if (!ret) lprintf("config_readsect: unhandled var: \"%s\"\n", var);
 }
 
 
@@ -678,15 +777,14 @@ int config_havesect(const char *fname, const char *section)
 	return ret;
 }
 
-
 int config_readsect(const char *fname, const char *section)
 {
-	char line[128], *var, *val, *tmp;
-	int len, i, ret;
+	char line[128], *var, *val;
 	FILE *f;
+	int ret;
 
 	f = fopen(fname, "r");
-	if (f == NULL) return 0;
+	if (f == NULL) return -1;
 
 	if (section != NULL)
 	{
@@ -698,42 +796,89 @@ int config_readsect(const char *fname, const char *section)
 		}
 	}
 
+	keys_encountered = 0;
+	memset(input_dev_map, 0xff, sizeof(input_dev_map));
+
+	in_config_start();
 	while (!feof(f))
 	{
-		tmp = fgets(line, sizeof(line), f);
-		if (tmp == NULL) break;
-
-		if (line[0] == '[') break; // other section
-
-		// strip comments, linefeed, spaces..
-		len = strlen(line);
-		for (i = 0; i < len; i++)
-			if (line[i] == '#' || line[i] == '\r' || line[i] == '\n') { line[i] = 0; break; }
-		mystrip(line);
-		len = strlen(line);
-		if (len <= 0) continue;
-
-		// get var and val
-		for (i = 0; i < len; i++)
-			if (line[i] == '=') break;
-		if (i >= len || strchr(&line[i+1], '=') != NULL) {
-			lprintf("config_readsect: can't parse: %s\n", line);
-			continue;
-		}
-		line[i] = 0;
-		var = line;
-		val = &line[i+1];
-		mystrip(var);
-		mystrip(val);
-		if (strlen(var) == 0 || (strlen(val) == 0 && strncasecmp(var, "bind", 4) != 0)) {
-			lprintf("config_readsect: something's empty: \"%s\" = \"%s\"\n", var, val);
-			continue;
-		}
+		ret = config_get_var_val(f, line, sizeof(line), &var, &val);
+		if (ret ==  0) break;
+		if (ret == -1) continue;
 
 		parse(var, val);
 	}
+	in_config_end();
 
 	fclose(f);
 	return 0;
 }
 
+#endif // _MSC_VER
+
+static char *mystrip(char *str)
+{
+	int i, len;
+
+	len = strlen(str);
+	for (i = 0; i < len; i++)
+		if (str[i] != ' ') break;
+	if (i > 0) memmove(str, str + i, len - i + 1);
+
+	len = strlen(str);
+	for (i = len - 1; i >= 0; i--)
+		if (str[i] != ' ') break;
+	str[i+1] = 0;
+
+	return str;
+}
+
+/* returns:
+ *  0 - EOF, end
+ *  1 - parsed ok
+ * -1 - failed to parse line
+ */
+int config_get_var_val(void *file, char *line, int lsize, char **rvar, char **rval)
+{
+	char *var, *val, *tmp;
+	FILE *f = file;
+	int len, i;
+
+	tmp = fgets(line, lsize, f);
+	if (tmp == NULL) return 0;
+
+	if (line[0] == '[') return 0; // other section
+
+	// strip comments, linefeed, spaces..
+	len = strlen(line);
+	for (i = 0; i < len; i++)
+		if (line[i] == '#' || line[i] == '\r' || line[i] == '\n') { line[i] = 0; break; }
+	mystrip(line);
+	len = strlen(line);
+	if (len <= 0) return -1;;
+
+	// get var and val
+	for (i = 0; i < len; i++)
+		if (line[i] == '=') break;
+	if (i >= len || strchr(&line[i+1], '=') != NULL) {
+		lprintf("config_readsect: can't parse: %s\n", line);
+		return -1;
+	}
+	line[i] = 0;
+	var = line;
+	val = &line[i+1];
+	mystrip(var);
+	mystrip(val);
+
+#ifndef _MSC_VER
+	if (strlen(var) == 0 || (strlen(val) == 0 && strncasecmp(var, "bind", 4) != 0)) {
+		lprintf("config_readsect: something's empty: \"%s\" = \"%s\"\n", var, val);
+		return -1;;
+	}
+#endif
+
+	*rvar = var;
+	*rval = val;
+	return 1;
+}
+