X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fin_gp2x.c;h=eb97a7e940813d358776229837d331927dc430d0;hb=d2f29611d1379a249c8f3f955ed16a336f9290cd;hp=489bbf7dc8d86a206aa9d2a8ce74bda79f71b144;hpb=13b692eb4ee66fd0c7d4d45bdead750a4defa90e;p=libpicofe.git

diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c
index 489bbf7..eb97a7e 100644
--- a/gp2x/in_gp2x.c
+++ b/gp2x/in_gp2x.c
@@ -1,14 +1,25 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
-#include "../common/common.h"
 #include "../common/input.h"
 #include "in_gp2x.h"
+#include "soc.h"
 
 #define IN_PREFIX "gp2x:"
 #define IN_GP2X_NBUTTONS 32
 
-extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
+/* note: in_gp2x hadles combos (if 2 btns have the same bind,
+ * both must be pressed for action to happen) */
+static int in_gp2x_combo_keys = 0;
+static int in_gp2x_combo_acts = 0;
+static int gpiodev = -1;	/* Wiz only */
+
+static int (*in_gp2x_get_bits)(void);
 
 enum  { BTN_UP = 0,      BTN_LEFT = 2,      BTN_DOWN = 4,  BTN_RIGHT = 6,
         BTN_START = 8,   BTN_SELECT = 9,    BTN_L = 10,    BTN_R = 11,
@@ -16,7 +27,7 @@ enum  { BTN_UP = 0,      BTN_LEFT = 2,      BTN_DOWN = 4,  BTN_RIGHT = 6,
         BTN_VOL_UP = 23, BTN_VOL_DOWN = 22, BTN_PUSH = 27 };
 
 static const char * const in_gp2x_prefix = IN_PREFIX;
-static const char * const in_gp2x_keys[IN_GP2X_NBUTTONS] = {
+static const char *in_gp2x_keys[IN_GP2X_NBUTTONS] = {
 	[0 ... IN_GP2X_NBUTTONS-1] = NULL,
 	[BTN_UP]    = "UP",    [BTN_LEFT]   = "LEFT",   [BTN_DOWN] = "DOWN", [BTN_RIGHT] = "RIGHT",
 	[BTN_START] = "START", [BTN_SELECT] = "SELECT", [BTN_L]    = "L",    [BTN_R]     = "R",
@@ -26,19 +37,9 @@ static const char * const in_gp2x_keys[IN_GP2X_NBUTTONS] = {
 };
 
 
-static void in_gp2x_probe(void)
-{
-	in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1);
-}
-
-static int in_gp2x_get_bind_count(void)
-{
-	return IN_GP2X_NBUTTONS;
-}
-
-static int in_gp2x_get_gpio_bits(void)
+static int in_gp2x_get_mmsp2_bits(void)
 {
-#ifndef FAKE_IN_GP2X
+	extern volatile unsigned short *gp2x_memregs;
 	int value;
 	value = gp2x_memregs[0x1198>>1] & 0xff; // GPIO M
 	if (value == 0xFD) value = 0xFA;
@@ -50,26 +51,111 @@ static int in_gp2x_get_gpio_bits(void)
 	value = ~value & 0x08c0ff55;
 
 	return value;
-#else
+}
+
+static int in_gp2x_get_wiz_bits(void)
+{
+	int r, value = 0;
+	r = read(gpiodev, &value, 4);
+	if (value & 0x02)
+		value |= 0x05;
+	if (value & 0x08)
+		value |= 0x14;
+	if (value & 0x20)
+		value |= 0x50;
+	if (value & 0x80)
+		value |= 0x41;
+
+	/* convert to GP2X style */
+	value &= 0x7ff55;
+	if (value & (1 << 16))
+		value |= 1 << BTN_VOL_UP;
+	if (value & (1 << 17))
+		value |= 1 << BTN_VOL_DOWN;
+	if (value & (1 << 18))
+		value |= 1 << BTN_PUSH;
+	value &= ~0x70000;
+
+	return value;
+}
+
+#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;
 	return current_keys;
+}
 #endif
+
+static void in_gp2x_probe(void)
+{
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
+	switch (soc)
+	{
+	case SOCID_MMSP2:
+		in_gp2x_get_bits = in_gp2x_get_mmsp2_bits;
+		break;
+	case SOCID_POLLUX:
+		gpiodev = open("/dev/GPIO", O_RDONLY);
+		if (gpiodev < 0) {
+			perror("in_gp2x: couldn't open /dev/GPIO");
+			return;
+		}
+		in_gp2x_get_bits = in_gp2x_get_wiz_bits;
+		break;
+	default:
+#ifdef FAKE_IN_GP2X
+		in_gp2x_get_bits = in_gp2x_get_fake_bits;
+		break;
+#endif
+		return;
+	}
+
+	in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1,
+		IN_GP2X_NBUTTONS, 1);
+}
+
+static void in_gp2x_free(void *drv_data)
+{
+	if (gpiodev >= 0) {
+		close(gpiodev);
+		gpiodev = -1;
+	}
+}
+
+static int in_gp2x_get_bind_count(void)
+{
+	return IN_GP2X_NBUTTONS;
 }
 
-/* returns bitfield of binds of pressed buttons */
-int in_gp2x_update(void *drv_data, int *binds)
+/* ORs result with pressed buttons */
+int in_gp2x_update(void *drv_data, const int *binds, int *result)
 {
-	int i, value, ret = 0;
+	int type_start = 0;
+	int i, t, keys;
+
+	keys = in_gp2x_get_bits();
+
+	if (keys & in_gp2x_combo_keys) {
+		result[IN_BINDTYPE_EMU] = in_combos_do(keys, binds, BTN_PUSH,
+						in_gp2x_combo_keys, in_gp2x_combo_acts);
+		type_start = IN_BINDTYPE_PLAYER12;
+	}
 
-	value = in_gp2x_get_gpio_bits();
+	for (i = 0; keys; i++, keys >>= 1) {
+		if (!(keys & 1))
+			continue;
 
-	for (i = 0; value; i++) {
-		if (value & 1)
-			ret |= binds[i];
-		value >>= 1;
+		for (t = type_start; t < IN_BINDTYPE_COUNT; t++)
+			result[t] |= binds[IN_BIND_OFFS(i, t)];
 	}
 
-	return ret;
+	return 0;
 }
 
 int in_gp2x_update_keycode(void *data, int *is_down)
@@ -77,7 +163,7 @@ int in_gp2x_update_keycode(void *data, int *is_down)
 	static int old_val = 0;
 	int val, diff, i;
 
-	val = in_gp2x_get_gpio_bits();
+	val = in_gp2x_get_bits();
 	diff = val ^ old_val;
 	if (diff == 0)
 		return -1;
@@ -94,18 +180,45 @@ int in_gp2x_update_keycode(void *data, int *is_down)
 	return i;
 }
 
+static const struct {
+	short key;
+	short pbtn;
+} key_pbtn_map[] =
+{
+	{ BTN_UP,	PBTN_UP },
+	{ BTN_DOWN,	PBTN_DOWN },
+	{ BTN_LEFT,	PBTN_LEFT },
+	{ BTN_RIGHT,	PBTN_RIGHT },
+	{ BTN_B,	PBTN_MOK },
+	{ BTN_X,	PBTN_MBACK },
+	{ BTN_A,	PBTN_MA2 },
+	{ BTN_Y,	PBTN_MA3 },
+	{ BTN_L,	PBTN_L },
+	{ BTN_R,	PBTN_R },
+	{ BTN_SELECT,	PBTN_MENU },
+};
+
+#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
+
 static int in_gp2x_menu_translate(int keycode)
 {
-	switch (keycode) {
-		case BTN_UP:	return PBTN_UP;
-		case BTN_LEFT:	return PBTN_LEFT;
-		case BTN_DOWN:	return PBTN_DOWN;
-		case BTN_RIGHT:	return PBTN_RIGHT;
-		case BTN_B:	return PBTN_MOK;
-		case BTN_X:	return PBTN_MBACK;
-		case BTN_START:	return PBTN_MENU;
-		default:	return 0;
+	int i;
+	if (keycode < 0)
+	{
+		/* menu -> kc */
+		keycode = -keycode;
+		for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
+			if (key_pbtn_map[i].pbtn == keycode)
+				return key_pbtn_map[i].key;
+	}
+	else
+	{
+		for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
+			if (key_pbtn_map[i].key == keycode)
+				return key_pbtn_map[i].pbtn;
 	}
+
+	return 0;
 }
 
 static int in_gp2x_get_key_code(const char *key_name)
@@ -134,18 +247,25 @@ static const char *in_gp2x_get_key_name(int keycode)
 
 static const struct {
 	short code;
-	short bit;
+	char btype;
+	char bit;
 } in_gp2x_def_binds[] =
 {
 	/* MXYZ SACB RLDU */
-	{ BTN_UP,	0 },
-	{ BTN_DOWN,	1 },
-	{ BTN_LEFT,	2 },
-	{ BTN_RIGHT,	3 },
-	{ BTN_X,	4 },	/* B */
-	{ BTN_B,	5 },	/* C */
-	{ BTN_A,	6 },	/* A */
-	{ BTN_START,	7 },
+	{ BTN_UP,	IN_BINDTYPE_PLAYER12, 0 },
+	{ BTN_DOWN,	IN_BINDTYPE_PLAYER12, 1 },
+	{ BTN_LEFT,	IN_BINDTYPE_PLAYER12, 2 },
+	{ BTN_RIGHT,	IN_BINDTYPE_PLAYER12, 3 },
+	{ BTN_X,	IN_BINDTYPE_PLAYER12, 4 },	/* B */
+	{ BTN_B,	IN_BINDTYPE_PLAYER12, 5 },	/* C */
+	{ BTN_A,	IN_BINDTYPE_PLAYER12, 6 },	/* A */
+	{ BTN_START,	IN_BINDTYPE_PLAYER12, 7 },
+	{ BTN_SELECT,	IN_BINDTYPE_EMU, PEVB_MENU },
+//	{ BTN_Y,	IN_BINDTYPE_EMU, PEVB_SWITCH_RND },
+	{ BTN_L,	IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
+	{ BTN_R,	IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
+	{ BTN_VOL_UP,	IN_BINDTYPE_EMU, PEVB_VOL_UP },
+	{ BTN_VOL_DOWN,	IN_BINDTYPE_EMU, PEVB_VOL_DOWN },
 };
 
 #define DEF_BIND_COUNT (sizeof(in_gp2x_def_binds) / sizeof(in_gp2x_def_binds[0]))
@@ -155,31 +275,62 @@ static void in_gp2x_get_def_binds(int *binds)
 	int i;
 
 	for (i = 0; i < DEF_BIND_COUNT; i++)
-		binds[in_gp2x_def_binds[i].code] = 1 << in_gp2x_def_binds[i].bit;
+		binds[IN_BIND_OFFS(in_gp2x_def_binds[i].code, in_gp2x_def_binds[i].btype)] =
+			1 << in_gp2x_def_binds[i].bit;
 }
 
 /* remove binds of missing keys, count remaining ones */
-static int in_gp2x_clean_binds(void *drv_data, int *binds)
+static int in_gp2x_clean_binds(void *drv_data, int *binds, int *def_binds)
 {
-	int i, count = 0;
+	int i, count = 0, have_vol = 0, have_menu = 0;
 
 	for (i = 0; i < IN_GP2X_NBUTTONS; i++) {
-		if (in_gp2x_keys[i] == NULL)
-			binds[i] = binds[i + IN_GP2X_NBUTTONS] = 0;
-		if (binds[i])
-			count++;
+		int t, eb, offs;
+		for (t = 0; t < IN_BINDTYPE_COUNT; t++) {
+			offs = IN_BIND_OFFS(i, t);
+			if (in_gp2x_keys[i] == NULL)
+				binds[offs] = def_binds[offs] = 0;
+			if (binds[offs])
+				count++;
+		}
+		eb = binds[IN_BIND_OFFS(i, IN_BINDTYPE_EMU)];
+		if (eb & (PEV_VOL_DOWN|PEV_VOL_UP))
+			have_vol = 1;
+		if (eb & PEV_MENU)
+			have_menu = 1;
 	}
 
-	return count;
+	/* autobind some important keys, if they are unbound */
+	if (!have_vol && binds[BTN_VOL_UP] == 0 && binds[BTN_VOL_DOWN] == 0) {
+		binds[IN_BIND_OFFS(BTN_VOL_UP, IN_BINDTYPE_EMU)]   = PEV_VOL_UP;
+		binds[IN_BIND_OFFS(BTN_VOL_DOWN, IN_BINDTYPE_EMU)] = PEV_VOL_DOWN;
+		count += 2;
+	}
 
+	if (!have_menu) {
+		binds[IN_BIND_OFFS(BTN_SELECT, IN_BINDTYPE_EMU)] = PEV_MENU;
+		count++;
+	}
+
+	in_combos_find(binds, BTN_PUSH, &in_gp2x_combo_keys, &in_gp2x_combo_acts);
+
+	return count;
 }
 
 void in_gp2x_init(void *vdrv)
 {
 	in_drv_t *drv = vdrv;
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
+	if (soc == SOCID_POLLUX)
+		in_gp2x_keys[BTN_START] = "MENU";
+	
+	in_gp2x_combo_keys = in_gp2x_combo_acts = 0;
 
 	drv->prefix = in_gp2x_prefix;
 	drv->probe = in_gp2x_probe;
+	drv->free = in_gp2x_free;
 	drv->get_bind_count = in_gp2x_get_bind_count;
 	drv->get_def_binds = in_gp2x_get_def_binds;
 	drv->clean_binds = in_gp2x_clean_binds;