Fix button assignments for Saturn and PSX pads.

diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 0ce114353b8e5a85d31c0ae2973837de1c9a7347..24d75e44d9043ad212b70adddb5d984bc93bb2e4 100644 (file)
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -1,5 +1,5 @@
 /*
- * $Id: db9.c,v 1.12 2002/01/22 20:27:05 vojtech Exp $
+ * $Id: db9.c,v 1.13 2002/04/07 20:13:37 vojtech Exp $
  *
  *  Copyright (c) 1999-2001 Vojtech Pavlik
  *
@@ -199,7 +199,7 @@ static void db9_timer(unsigned long private)
                        data=parport_read_data(port);
 
                        input_report_key(dev, BTN_A, ~data & DB9_FIRE1);
-                       input_report_key(dev, BTN_X, ~data & DB9_FIRE2);
+                       input_report_key(dev, BTN_START, ~data & DB9_FIRE2);
 
                        parport_write_control(port, DB9_NOSELECT); /* 2 */
                        udelay(DB9_GENESIS6_DELAY);
@@ -209,10 +209,10 @@ static void db9_timer(unsigned long private)
                        udelay(DB9_GENESIS6_DELAY);
                        data=parport_read_data(port);
 
-                       input_report_key(dev, BTN_Y,     ~data & DB9_LEFT);
-                       input_report_key(dev, BTN_Z,     ~data & DB9_DOWN);
-                       input_report_key(dev, BTN_MODE,  ~data & DB9_UP);
-                       input_report_key(dev, BTN_START, ~data & DB9_RIGHT);
+                       input_report_key(dev, BTN_X,    ~data & DB9_LEFT);
+                       input_report_key(dev, BTN_Y,    ~data & DB9_DOWN);
+                       input_report_key(dev, BTN_Z,    ~data & DB9_UP);
+                       input_report_key(dev, BTN_MODE, ~data & DB9_RIGHT);
 
                        parport_write_control(port, DB9_NORMAL);
                        udelay(DB9_GENESIS6_DELAY);

diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 77a1036e32d48ea9ccd0584e59c0d24dee16e27e..23ebebe3adb4bb3968c6c6740b262378b7180b15 100644 (file)
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -1,5 +1,5 @@
 /*
- * $Id: gamecon.c,v 1.21 2002/01/22 20:27:27 vojtech Exp $
+ * $Id: gamecon.c,v 1.22 2002/07/01 15:42:25 vojtech Exp $
  *
  *  Copyright (c) 1999-2001 Vojtech Pavlik
  *
@@ -398,8 +398,8 @@ static void gc_timer(unsigned long private)
 
                        case GC_PSX_RUMBLE:
 
-                               input_report_key(dev + i, BTN_THUMB,  ~data[0] & 0x04);
-                               input_report_key(dev + i, BTN_THUMB2, ~data[0] & 0x02);
+                               input_report_key(dev + i, BTN_THUMBL, ~data[0] & 0x04);
+                               input_report_key(dev + i, BTN_THUMBR, ~data[0] & 0x02);
 
                        case GC_PSX_NEGCON:
                        case GC_PSX_ANALOG: