notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oshide: drop termios dump/restore, OS already handles that
[libpicofe.git]
/
gp2x
/
in_gp2x.c
diff --git
a/gp2x/in_gp2x.c
b/gp2x/in_gp2x.c
index
ec50a36
..
eb97a7e
100644
(file)
--- a/
gp2x/in_gp2x.c
+++ b/
gp2x/in_gp2x.c
@@
-55,8
+55,8
@@
static int in_gp2x_get_mmsp2_bits(void)
static int in_gp2x_get_wiz_bits(void)
{
static int in_gp2x_get_wiz_bits(void)
{
- int value = 0;
- read(gpiodev, &value, 4);
+ int
r,
value = 0;
+ r
= r
ead(gpiodev, &value, 4);
if (value & 0x02)
value |= 0x05;
if (value & 0x08)
if (value & 0x02)
value |= 0x05;
if (value & 0x08)
@@
-80,6
+80,9
@@
static int in_gp2x_get_wiz_bits(void)
}
#ifdef FAKE_IN_GP2X
}
#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;
static int in_gp2x_get_fake_bits(void)
{
extern int current_keys;
@@
-104,7
+107,6
@@
static void in_gp2x_probe(void)
return;
}
in_gp2x_get_bits = in_gp2x_get_wiz_bits;
return;
}
in_gp2x_get_bits = in_gp2x_get_wiz_bits;
- in_gp2x_keys[BTN_START] = "MENU";
break;
default:
#ifdef FAKE_IN_GP2X
break;
default:
#ifdef FAKE_IN_GP2X
@@
-318,7
+320,12
@@
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;
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;
in_gp2x_combo_keys = in_gp2x_combo_acts = 0;
drv->prefix = in_gp2x_prefix;