X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fin_gp2x.c;h=9894669c16a80103e91fb6a0572d879bf1fabd1e;hb=b6072c177f57cdcb32cfd5eee53b7c178f89c5d3;hp=818aead94c7392d91f999566e81c0ebea05c487b;hpb=4858c6338ba7ec5a9061ea9b7505acde098c03d9;p=libpicofe.git

diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c
index 818aead..9894669 100644
--- a/gp2x/in_gp2x.c
+++ b/gp2x/in_gp2x.c
@@ -8,7 +8,7 @@
 
 #include "../common/input.h"
 #include "in_gp2x.h"
-#include "soc.h"
+#include "plat_gp2x.h"
 
 #define IN_PREFIX "gp2x:"
 #define IN_GP2X_NBUTTONS 32
@@ -55,8 +55,8 @@ static int in_gp2x_get_mmsp2_bits(void)
 
 static int in_gp2x_get_wiz_bits(void)
 {
-	int value = 0;
-	read(gpiodev, &value, 4);
+	int r, value = 0;
+	r = read(gpiodev, &value, 4);
 	if (value & 0x02)
 		value |= 0x05;
 	if (value & 0x08)
@@ -80,6 +80,9 @@ static int in_gp2x_get_wiz_bits(void)
 }
 
 #ifdef FAKE_IN_GP2X
+volatile unsigned short *gp2x_memregs;
+gp2x_soc_t soc_detect(void) { return -1; }
+
 static int in_gp2x_get_fake_bits(void)
 {
 	extern int current_keys;
@@ -89,15 +92,12 @@ static int in_gp2x_get_fake_bits(void)
 
 static void in_gp2x_probe(void)
 {
-	gp2x_soc_t soc;
-
-	soc = soc_detect();
-	switch (soc)
+	switch (gp2x_dev_id)
 	{
-	case SOCID_MMSP2:
+	case GP2X_DEV_GP2X:
 		in_gp2x_get_bits = in_gp2x_get_mmsp2_bits;
 		break;
-	case SOCID_POLLUX:
+	case GP2X_DEV_WIZ:
 		gpiodev = open("/dev/GPIO", O_RDONLY);
 		if (gpiodev < 0) {
 			perror("in_gp2x: couldn't open /dev/GPIO");
@@ -317,10 +317,8 @@ static int in_gp2x_clean_binds(void *drv_data, int *binds, int *def_binds)
 void in_gp2x_init(void *vdrv)
 {
 	in_drv_t *drv = vdrv;
-	gp2x_soc_t soc;
 
-	soc = soc_detect();
-	if (soc == SOCID_POLLUX)
+	if (gp2x_dev_id == GP2X_DEV_WIZ)
 		in_gp2x_keys[BTN_START] = "MENU";
 	
 	in_gp2x_combo_keys = in_gp2x_combo_acts = 0;