X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fconfig.c;h=4f80c86c885f79af86aeb0a3bab0013fc0e66321;hb=046c454067c66b783417f4a61ab1445d06412d66;hp=961ac92dfe201f2e0e0d2792483a59827fbd5f08;hpb=049a6b3e80151f6a5af726e25478ed15e111dfcc;p=libpicofe.git

diff --git a/common/config.c b/common/config.c
index 961ac92..4f80c86 100644
--- a/common/config.c
+++ b/common/config.c
@@ -110,7 +110,7 @@ static void keys_write(FILE *fn, const char *bind_str, int dev_id, const int *bi
 	int key_count, t, i;
 	const int *def_binds;
 
-	key_count = in_get_dev_bind_count(dev_id);
+	key_count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
 	def_binds = in_get_dev_def_binds(dev_id);
 
 	for (t = 0; t < key_count; t++)
@@ -311,7 +311,7 @@ next:
 		sprintf(strbind, "bind%d", t);
 		if (t == 0) strbind[4] = 0;
 
-		count = in_get_dev_bind_count(t);
+		count = in_get_dev_info(t, IN_INFO_BIND_COUNT);
 		keys_write(fn, strbind, t, binds, no_defaults);
 	}
 
@@ -451,13 +451,13 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 #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;
@@ -538,6 +538,7 @@ 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;
@@ -546,6 +547,7 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 #endif
 			currentConfig.CPUclock = atoi(val);
 			return 1;
+#endif
 
 		case MA_OPT2_GAMMA:
 			if (strcasecmp(var, "Gamma correction") != 0) return 0;