notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gl: clear w, h on reinit
[libpicofe.git]
/
gp2x
/
in_gp2x.c
diff --git
a/gp2x/in_gp2x.c
b/gp2x/in_gp2x.c
index
4c6b833
..
bfa2df1
100644
(file)
--- a/
gp2x/in_gp2x.c
+++ b/
gp2x/in_gp2x.c
@@
-18,6
+18,8
@@
#include <unistd.h>
#include "../input.h"
#include <unistd.h>
#include "../input.h"
+#include "soc.h"
+#include "plat_gp2x.h"
#include "in_gp2x.h"
#define IN_GP2X_PREFIX "gp2x:"
#include "in_gp2x.h"
#define IN_GP2X_PREFIX "gp2x:"
@@
-47,15
+49,14
@@
static const char *in_gp2x_keys[IN_GP2X_NBUTTONS] = {
static int in_gp2x_get_mmsp2_bits(void)
{
static int in_gp2x_get_mmsp2_bits(void)
{
- extern volatile unsigned short *gp2x_memregs;
int value;
int value;
- value =
gp2x_
memregs[0x1198>>1] & 0xff; // GPIO M
+ value = memregs[0x1198>>1] & 0xff; // GPIO M
if (value == 0xFD) value = 0xFA;
if (value == 0xF7) value = 0xEB;
if (value == 0xDF) value = 0xAF;
if (value == 0x7F) value = 0xBE;
if (value == 0xFD) value = 0xFA;
if (value == 0xF7) value = 0xEB;
if (value == 0xDF) value = 0xAF;
if (value == 0x7F) value = 0xBE;
- value |=
gp2x_
memregs[0x1184>>1] & 0xFF00; // GPIO C
- value |=
gp2x_
memregs[0x1186>>1] << 16; // GPIO D
+ value |= memregs[0x1184>>1] & 0xFF00; // GPIO C
+ value |= memregs[0x1186>>1] << 16; // GPIO D
value = ~value & 0x08c0ff55;
return value;
value = ~value & 0x08c0ff55;
return value;
@@
-87,18
+88,7
@@
static int in_gp2x_get_wiz_bits(void)
return value;
}
return value;
}
-#ifdef FAKE_IN_GP2X
-volatile unsigned short *gp2x_memregs;
-int gp2x_dev_id = -1;
-
-static int in_gp2x_get_fake_bits(void)
-{
- extern int current_keys;
- return current_keys;
-}
-#endif
-
-static void in_gp2x_probe(void)
+static void in_gp2x_probe(const in_drv_t *drv)
{
switch (gp2x_dev_id)
{
{
switch (gp2x_dev_id)
{
@@
-115,10
+105,6
@@
static void in_gp2x_probe(void)
break;
// we'll use evdev for Caanoo
default:
break;
// we'll use evdev for Caanoo
default:
-#ifdef FAKE_IN_GP2X
- in_gp2x_get_bits = in_gp2x_get_fake_bits;
- break;
-#endif
return;
}
return;
}
@@
-135,7
+121,7
@@
static void in_gp2x_free(void *drv_data)
}
static const char * const *
}
static const char * const *
-in_gp2x_get_key_names(int *count)
+in_gp2x_get_key_names(
const in_drv_t *drv,
int *count)
{
*count = IN_GP2X_NBUTTONS;
return in_gp2x_keys;
{
*count = IN_GP2X_NBUTTONS;
return in_gp2x_keys;
@@
-208,7
+194,7
@@
static const struct {
#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
-static int in_gp2x_menu_translate(void *drv_data, int keycode)
+static int in_gp2x_menu_translate(void *drv_data, int keycode
, char *charcode
)
{
int i;
if (keycode < 0)
{
int i;
if (keycode < 0)
@@
-317,6
+303,6
@@
void in_gp2x_init(const struct in_default_bind *defbinds)
in_gp2x_combo_keys = in_gp2x_combo_acts = 0;
in_gp2x_combo_keys = in_gp2x_combo_acts = 0;
- in_register_driver(&in_gp2x_drv, defbinds);
+ in_register_driver(&in_gp2x_drv, defbinds
, NULL
);
}
}