X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=petitboot.c;h=fc72fd8103c95f2c59bc235ccf36fa49a394597f;hp=581d6332f411d5c5b4f847b64700d660da9ad204;hb=238549fe012d19681ede101f02fc4f653402e550;hpb=54ed7f641d0dd17778ce8cae5a5dbfd645366d3c

diff --git a/petitboot.c b/petitboot.c
index 581d633..fc72fd8 100644
--- a/petitboot.c
+++ b/petitboot.c
@@ -14,6 +14,7 @@
 
 #include <libtwin/twin.h>
 #include <libtwin/twin_linux_mouse.h>
+#include <libtwin/twin_linux_js.h>
 #include <libtwin/twin_png.h>
 #include <libtwin/twin_jpeg.h>
 
@@ -31,8 +32,7 @@ static twin_fbdev_t *pboot_fbdev;
 static twin_screen_t *pboot_screen;
 
 #define PBOOT_INITIAL_MESSAGE		\
-	"video hack: 0=default 1=720p 2=1080i 3=1080p    " \
-	"BACKSPACE=return to GameOS"
+	"keys: 0=safe 1=720p 2=1080i 3=1080p del=GameOS"
 
 #define PBOOT_LEFT_PANE_SIZE		160
 #define PBOOT_LEFT_PANE_COLOR		0x80000000
@@ -142,6 +142,30 @@ static pboot_lpane_t	*pboot_lpane;
 static pboot_rpane_t	*pboot_rpane;
 static pboot_spane_t	*pboot_spane;
 
+/* control to keyboard mappings for the sixaxis controller */
+uint8_t sixaxis_map[] = {
+	0,		/*   0  Select		*/
+	0,		/*   1  L3              */
+	0,		/*   2  R3              */
+	0,		/*   3  Start           */
+	KEY_UP,		/*   4  Dpad Up         */
+	KEY_RIGHT,	/*   5  Dpad Right      */
+	KEY_DOWN,	/*   6  Dpad Down       */
+	KEY_LEFT,	/*   7  Dpad Left       */
+	0,		/*   8  L2              */
+	0,		/*   9  R2              */
+	0,		/*  10  L1              */
+	0,		/*  11  R1              */
+	0,		/*  12  Triangle        */
+	KEY_ENTER,	/*  13  Circle          */
+	0,		/*  14  Cross           */
+	KEY_DELETE,	/*  15  Square          */
+	0,		/*  16  PS Button       */
+	0,		/*  17  nothing      */
+	0,		/*  18  nothing      */
+};
+
+
 static int pboot_vmode_change = -1;
 
 /* XXX move to twin */
@@ -730,6 +754,20 @@ twin_bool_t pboot_event_filter(twin_screen_t	    *screen,
 					       pboot_cursor_hx,
 					       pboot_cursor_hy);
 		break;
+	case TwinEventJoyButton:
+		/* map joystick events into key events */
+		if (event->u.js.control >= sizeof(sixaxis_map))
+			break;
+
+		event->u.key.key = sixaxis_map[event->u.js.control];
+		if (event->u.js.value == 0) {
+			event->kind = TwinEventKeyUp;
+			break;
+		} else {
+			event->kind = TwinEventKeyDown;
+		}
+
+		/* fall through.. */
 	case TwinEventKeyDown:
 		switch(event->u.key.key) {
 		/* Gross hack for video modes, need something better ! */
@@ -1100,6 +1138,7 @@ int main(int argc, char **argv)
 	}
 	pboot_screen = pboot_fbdev->screen;
 	twin_linux_mouse_create(NULL, pboot_screen);
+	twin_linux_js_create(pboot_screen);
 
 	if (pboot_fbdev != NULL) {
 		char *cursor_path = artwork_pathname("cursor.gz");