Hi,
as hinted at in my previous mail, here's version 2 of the Eiffel mouse emulation
code, tested using F10 as a fake mouse "button" (set DEBUG in atakeyb.c to
activate this). Still no wheels, though.
Please test with the CVS version of ARAnyM, or real hardware (I've removed the
y movement hack in this version).
The code is looking ugly enough to make me think about using a separate hook to
report the additional buttons in future.
Parseable by git-am now, Geert?
Signed-off-by: Michael Schmitz <schmitz@xxxxxxxxxx>
---
arch/m68k/atari/atakeyb.c | 46 +++++++++++++++++++++++++++++++++++++-
drivers/input/mouse/atarimouse.c | 40 ++++++++++++++++++++++++++++++++-
2 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index 2c16dcb..6215060 100644
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -55,6 +55,8 @@ static unsigned long broken_keys[128/(sizeof(unsigned long)*8)] = { 0, };
#define BREAK_MASK (0x80)
+#define SUPPORT_EIFFEL 1
+
/*
* ++roman: The following changes were applied manually:
*
@@ -189,6 +191,41 @@ repeat:
kb_state.len = 1;
kb_state.buf[0] = scancode;
break;
+#if defined (SUPPORT_EIFFEL)
+ /*
+ * middle mouse button and wheel events are reported
+ * as follows:
+ * Middle button: mouse packet with 0xFC/0xF4 (bit 2
+ * set) and zero movement bytes
+ * Wheel: Mouse packet with bit 2 _and_ 3 clear and
+ * zero movement bytes
+ */
+
+#if defined (DEBUG)
+ case 0x44:
+#endif
+ case 0x37: /* middle button clicked */
+ kb_state.state = RMOUSE;
+ kb_state.len = 2;
+ kb_state.buf[0] = 0xFC;
+ kb_state.buf[1] = 0;
+ kb_state.buf[2] = 0;
+ scancode = 0;
+ goto interpret_scancode;
+ break;
+#if defined (DEBUG)
+ case 0xC4:
+#endif
+ case 0xB7: /* middle button released */
+ kb_state.state = RMOUSE;
+ kb_state.len = 2;
+ kb_state.buf[0] = 0xF4;
+ kb_state.buf[1] = 0;
+ kb_state.buf[2] = 0;
+ scancode = 0;
+ goto interpret_scancode;
+ break;
+#endif
case 0xFC:
kb_state.state = CLOCK;
@@ -252,6 +289,9 @@ repeat:
kb_state.buf[kb_state.len++] = scancode;
if (kb_state.len == 5) {
kb_state.state = KEYBOARD;
+#if defined (DEBUG)
+ printk(KERN_INFO "atakeyb: AMOUSE %d %d %d %d %d\n", kb_state.buf[0], kb_state.buf[1], kb_state.buf[2], kb_state.buf[4], kb_state.buf[4]);
+#endif
/* not yet used */
/* wake up someone waiting for this */
}
@@ -261,8 +301,12 @@ repeat:
kb_state.buf[kb_state.len++] = scancode;
if (kb_state.len == 3) {
kb_state.state = KEYBOARD;
- if (atari_input_mouse_interrupt_hook)
+ if (atari_input_mouse_interrupt_hook) {
+#if defined (DEBUG)
+ printk(KERN_INFO "atakeyb: RMOUSE packet\n");
+#endif
atari_input_mouse_interrupt_hook(kb_state.buf);
+ }
}
break;
diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c
index 1b5f4dd..8cf2ffd 100644
--- a/drivers/input/mouse/atarimouse.c
+++ b/drivers/input/mouse/atarimouse.c
@@ -60,26 +60,64 @@ MODULE_LICENSE("GPL");
static int mouse_threshold[2] = {2, 2};
module_param_array(mouse_threshold, int, NULL, 0);
+#define SUPPORT_EIFFEL 1
+
#ifdef FIXED_ATARI_JOYSTICK
extern int atari_mouse_buttons;
#endif
+#if defined (SUPPORT_EIFFEL)
+static int eiffel_mouse_buttons;
+#endif
static struct input_dev *atamouse_dev;
static void atamouse_interrupt(char *buf)
{
int buttons, dx, dy;
+#if defined (DEBUG)
+ printk(KERN_INFO "atarimouse: %x %x %x\n", buf[0], buf[1], buf[2]);
+#endif
+#if defined (SUPPORT_EIFFEL)
+ if ((buf[0] & 0xc) == 0x8) /* real mouse packet */
+#endif
+ buttons = ((buf[0] & 1) << 2) | ((buf[0] & 2) >> 1);
+#if defined (SUPPORT_EIFFEL)
+ else
+ buttons = eiffel_mouse_buttons;
+#endif
- buttons = (buf[0] & 1) | ((buf[0] & 2) << 1);
#ifdef FIXED_ATARI_JOYSTICK
buttons |= atari_mouse_buttons & 2;
atari_mouse_buttons = buttons;
#endif
+#if defined (SUPPORT_EIFFEL)
+ if (buf[1] == 0 && buf[2] == 0 && (buf[0] & 4)) {
+ /* middle mouse button toggle */
+ switch (buf[0] & 0xff) {
+ case 0xFC:
+ eiffel_mouse_buttons |= 0x2;
+ break;
+ case 0xF4:
+ eiffel_mouse_buttons &= ~0x2;
+ break;
+ default:
+ break;
+ }
+ }
+ buttons = (buttons & ~0x2) | eiffel_mouse_buttons & 2;
+ eiffel_mouse_buttons = buttons;
+#endif
+
/* only relative events get here */
dx = buf[1];
dy = -buf[2];
+#if defined (DEBUG)
+ printk(KERN_INFO "atarimouse: dx %d dy %d buttons %x eiffel %x\n",
+ dx, dy, buttons, eiffel_mouse_buttons);
+#endif
+
input_report_rel(atamouse_dev, REL_X, dx);
input_report_rel(atamouse_dev, REL_Y, dy);
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
