summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
authorleo <leo@NetBSD.org>1996-04-12 08:37:03 +0000
committerleo <leo@NetBSD.org>1996-04-12 08:37:03 +0000
commite4a9d09efb6b883295a2cf8d3e16265a8b7d6579 (patch)
treea6cf10b06ef91a7daa06fa9a246e04962160c4d5 /sys/arch/atari/dev
parent7ff219ef0d32f9bb63e2c4f71734e1eedf68d1b3 (diff)
Add 3-button mouse support.
Diffstat (limited to 'sys/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/kbd.c64
-rw-r--r--sys/arch/atari/dev/ms.c214
-rw-r--r--sys/arch/atari/dev/msvar.h64
3 files changed, 209 insertions, 133 deletions
diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c
index b31e2632a44..340424e9c82 100644
--- a/sys/arch/atari/dev/kbd.c
+++ b/sys/arch/atari/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.8 1996/03/27 12:15:28 leo Exp $ */
+/* $NetBSD: kbd.c,v 1.9 1996/04/12 08:37:03 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -43,44 +43,28 @@
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/kernel.h>
+#include <sys/signalvar.h>
#include <sys/syslog.h>
#include <dev/cons.h>
#include <machine/cpu.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <machine/acia.h>
-#include <atari/dev/ym2149reg.h>
#include <atari/dev/itevar.h>
-#include <atari/dev/kbdreg.h>
#include <atari/dev/event_var.h>
#include <atari/dev/vuid_event.h>
+#include <atari/dev/ym2149reg.h>
+#include <atari/dev/kbdreg.h>
+#include <atari/dev/kbdvar.h>
+#include <atari/dev/msvar.h>
#include "mouse.h"
-/*
- * The ringbuffer is the interface between the hard and soft interrupt handler.
- * The hard interrupt runs straight from the MFP interrupt.
- */
-#define KBD_RING_SIZE 256 /* Sz of input ring buffer, must be power of 2 */
-#define KBD_RING_MASK 255 /* Modulo mask for above */
-
static u_char kbd_ring[KBD_RING_SIZE];
static volatile u_int kbd_rbput = 0; /* 'put' index */
static u_int kbd_rbget = 0; /* 'get' index */
static u_char kbd_soft = 0; /* 1: Softint has been scheduled*/
-struct kbd_softc {
- int k_event_mode; /* if 1, collect events, */
- /* else pass to ite */
- struct evvar k_events; /* event queue state */
- u_char k_soft_cs; /* control-reg. copy */
- u_char k_package[20]; /* XXX package being build */
- u_char k_pkg_size; /* Size of the package */
- u_char k_pkg_idx;
- u_char *k_sendp; /* Output pointer */
- int k_send_cnt; /* Chars left for output */
-};
-
static struct kbd_softc kbd_softc;
/* {b,c}devsw[] function prototypes */
@@ -93,8 +77,6 @@ dev_type_select(kbdselect);
/* Interrupt handler */
void kbdintr __P((int));
-void kbd_write __P((u_char *, int));
-
static void kbdsoft __P((void));
static void kbdattach __P((struct device *, struct device *, void *));
static int kbdmatch __P((struct device *, void *, void *));
@@ -109,6 +91,7 @@ struct cfdriver kbd_cd = {
NULL, "kbd", DV_DULL, NULL, 0
};
+
/*ARGSUSED*/
static int
kbdmatch(pdp, match, auxp)
@@ -362,18 +345,23 @@ kbdsoft()
* continue.
*/
if (k->k_pkg_size && (k->k_pkg_idx < k->k_pkg_size)) {
- k->k_package[k->k_pkg_idx++] = code;
- if (k->k_pkg_idx == k->k_pkg_size) {
- k->k_pkg_size = 0;
+ k->k_package[k->k_pkg_idx++] = code;
+ if (k->k_pkg_idx == k->k_pkg_size) {
+ /*
+ * Package is complete.
+ */
+ switch(k->k_pkg_type) {
#if NMOUSE > 0
- /*
- * Package is complete, we can now
- * send it to the mouse driver...
- */
- mouse_soft(k->k_package, k->k_pkg_size);
+ case KBD_AMS_PKG:
+ case KBD_RMS_PKG:
+ case KBD_JOY1_PKG:
+ mouse_soft((REL_MOUSE *)k->k_package,
+ k->k_pkg_size, k->k_pkg_type);
#endif /* NMOUSE */
}
- continue;
+ k->k_pkg_size = 0;
+ }
+ continue;
}
/*
* If this is a package header, init pkg. handling.
@@ -428,7 +416,7 @@ kbdbell()
{
register int i, sps;
- sps = spltty();
+ sps = splhigh();
for (i = 0; i < sizeof(sound); i++) {
YM2149->sd_selr = i;
YM2149->sd_wdat = sound[i];
@@ -548,22 +536,30 @@ u_char msg_start;
kp->k_package[0] = msg_start;
switch (msg_start) {
case 0xf6:
+ kp->k_pkg_type = KBD_MEM_PKG;
kp->k_pkg_size = 8;
break;
case 0xf7:
+ kp->k_pkg_type = KBD_AMS_PKG;
kp->k_pkg_size = 6;
break;
case 0xf8:
case 0xf9:
case 0xfa:
case 0xfb:
+ kp->k_pkg_type = KBD_RMS_PKG;
kp->k_pkg_size = 3;
break;
case 0xfc:
+ kp->k_pkg_type = KBD_CLK_PKG;
kp->k_pkg_size = 7;
break;
case 0xfe:
+ kp->k_pkg_type = KBD_JOY0_PKG;
+ kp->k_pkg_size = 2;
+ break;
case 0xff:
+ kp->k_pkg_type = KBD_JOY1_PKG;
kp->k_pkg_size = 2;
break;
default:
diff --git a/sys/arch/atari/dev/ms.c b/sys/arch/atari/dev/ms.c
index 5d5c647c0ee..f9ce834389f 100644
--- a/sys/arch/atari/dev/ms.c
+++ b/sys/arch/atari/dev/ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.3 1995/07/27 06:35:46 leo Exp $
+/* $NetBSD: ms.c,v 1.4 1996/04/12 08:37:05 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -62,9 +62,13 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/tty.h>
+#include <sys/signalvar.h>
+#include <machine/msioctl.h>
#include <atari/dev/event_var.h>
#include <atari/dev/vuid_event.h>
+#include <atari/dev/kbdvar.h>
+#include <atari/dev/msvar.h>
#include "mouse.h"
#if NMOUSE > 0
@@ -75,38 +79,24 @@
#define NMOUSE 1
#endif
-typedef void (*FPV)();
+typedef void (*FPV) __P((void *));
-/*
- * Mouse specific packages produced by the keyboard. Currently, we only
- * define the REL_MOUSE package, as this is the only one used.
- */
-typedef struct {
- u_char id;
- char dx;
- char dy;
-} REL_MOUSE;
-
-#define IS_REL_MOUSE(id) (((u_int)(id) & 0xF8) == 0xF8)
-#define TIMEOUT_ID (0xFC)
-
-static struct ms_softc {
- u_char ms_buttons; /* button states */
- struct evvar ms_events; /* event queue state */
- int ms_dx; /* accumulated dx */
- int ms_dy; /* accumulated dy */
- struct firm_event ms_bq[2]; /* Button queue */
- int ms_bq_idx; /* Button queue index */
-} ms_softc[NMOUSE];
+static struct ms_softc ms_softc[NMOUSE];
+
+dev_type_open(msopen);
+dev_type_close(msclose);
+dev_type_read(msread);
+dev_type_ioctl(msioctl);
+dev_type_select(msselect);
static void ms_3b_delay __P((struct ms_softc *));
- void mouse_soft __P((REL_MOUSE *, int));
int
mouseattach(cnt)
int cnt;
{
printf("1 mouse configured\n");
+ ms_softc[0].ms_emul3b = 0 /*1*/; /* XXX: default behaviour.... */
return(NMOUSE);
}
@@ -118,51 +108,76 @@ struct ms_softc *ms;
rel_ms.id = TIMEOUT_ID;
rel_ms.dx = rel_ms.dy = 0;
- mouse_soft(&rel_ms, sizeof(rel_ms));
+ mouse_soft(&rel_ms, sizeof(rel_ms), KBD_TIMEO_PKG);
}
/*
* Note that we are called from the keyboard software interrupt!
*/
void
-mouse_soft(rel_ms, size)
+mouse_soft(rel_ms, size, type)
REL_MOUSE *rel_ms;
-int size;
+int size, type;
{
struct ms_softc *ms = &ms_softc[0];
struct firm_event *fe, *fe2;
+ REL_MOUSE fake_mouse;
int get, put;
int sps;
u_char mbut, bmask;
- int is_timeout;
int flush_buttons;
- int id;
- if (!IS_REL_MOUSE(rel_ms->id))
- return; /* Probably some other message */
if (ms->ms_events.ev_io == NULL)
return;
+ switch (type) {
+ case KBD_JOY1_PKG:
+ /*
+ * There are some mice that have their middle button
+ * wired to the 'up' bit of joystick 1....
+ * Simulate a mouse packet with dx = dy = 0, the middle
+ * button state set by UP and the other buttons unchanged.
+ * Flush all button changes.
+ */
+ flush_buttons = 1;
+ fake_mouse.id = (rel_ms->dx & 1 ? 4 : 0) | (ms->ms_buttons & 3);
+ fake_mouse.dx = fake_mouse.dy = 0;
+ rel_ms = &fake_mouse;
+ break;
+ case KBD_TIMEO_PKG:
+ /*
+ * Timeout package. No button changes and no movement.
+ * Flush all button changes.
+ */
+ flush_buttons = 1;
+ fake_mouse.id = ms->ms_buttons;
+ fake_mouse.dx = fake_mouse.dy = 0;
+ rel_ms = &fake_mouse;
+ break;
+ case KBD_RMS_PKG:
+ /*
+ * Normal mouse package. Always copy the middle button
+ * status. The emulation code decides if button changes
+ * must be flushed.
+ */
+ rel_ms->id = (ms->ms_buttons & 4) | (rel_ms->id & 3);
+ flush_buttons = (ms->ms_emul3b) ? 0 : 1;
+ break;
+ default:
+ return;
+ }
+
sps = splev();
get = ms->ms_events.ev_get;
put = ms->ms_events.ev_put;
fe = &ms->ms_events.ev_q[put];
- if (rel_ms->id == TIMEOUT_ID) {
- is_timeout = 1;
- id = ms->ms_buttons;
- }
- else {
- is_timeout = 0;
- id = (rel_ms->id & 3) | (ms->ms_buttons & 4);
- }
-
- if (!is_timeout && ms->ms_bq_idx)
+ if ((type != KBD_TIMEO_PKG) && ms->ms_emul3b && ms->ms_bq_idx)
untimeout((FPV)ms_3b_delay, (void *)ms);
/*
- * Button states are encoded in the lower 2 bits of 'id'
+ * Button states are encoded in the lower 3 bits of 'id'
*/
- if (!(mbut = (id ^ ms->ms_buttons)) && (put != get)) {
+ if (!(mbut = (rel_ms->id ^ ms->ms_buttons)) && (put != get)) {
/*
* Compact dx/dy messages. Always generate an event when
* a button is pressed or the event queue is empty.
@@ -207,76 +222,71 @@ int size;
}
else fe++;
}
- if (mbut && !is_timeout) {
- for (bmask = 1; bmask < 0x04; bmask <<= 1) {
+ if (mbut && (type != KBD_TIMEO_PKG)) {
+ for (bmask = 1; bmask < 0x08; bmask <<= 1) {
if (!(mbut & bmask))
continue;
fe2 = &ms->ms_bq[ms->ms_bq_idx++];
- fe2->id = bmask & 1 ? MS_RIGHT : MS_LEFT;
- fe2->value = id & bmask ? VKEY_DOWN : VKEY_UP;
+ if (bmask == 1)
+ fe2->id = MS_RIGHT;
+ else if (bmask == 2)
+ fe2->id = MS_LEFT;
+ else fe2->id = MS_MIDDLE;
+ fe2->value = rel_ms->id & bmask ? VKEY_DOWN : VKEY_UP;
fe2->time = time;
}
}
- if (ms->ms_bq_idx) {
+
+ /*
+ * Handle 3rd button emulation.
+ */
+ if (ms->ms_emul3b && ms->ms_bq_idx && (type != KBD_TIMEO_PKG)) {
/*
- * We have at least one button, handle it.
+ * If the middle button is pressed, any change to
+ * one of the other buttons releases all.
*/
- flush_buttons = (is_timeout) ? 1 : 0;
- if (ms->ms_bq_idx == 2) {
+ if ((ms->ms_buttons & 4) && (mbut & 3)) {
+ ms->ms_bq[0].id = MS_MIDDLE;
+ ms->ms_bq_idx = 1;
+ rel_ms->id = 0;
+ flush_buttons = 1;
+ goto out;
+ }
+ if (ms->ms_bq_idx == 2) {
if (ms->ms_bq[0].value == ms->ms_bq[1].value) {
/* Must be 2 button presses! */
- if (ms->ms_bq[0].id != ms->ms_bq[1].id) {
- ms->ms_bq[0].id = MS_MIDDLE;
- ms->ms_bq_idx = 1;
- id = 7;
- }
+ ms->ms_bq[0].id = MS_MIDDLE;
+ ms->ms_bq_idx = 1;
+ rel_ms->id = 7;
}
- flush_buttons = 1;
}
- else {
- if (ms->ms_bq[0].value == VKEY_UP) {
- /*
- * Release of a button is always flushed
- * immediately. If the middle button is
- * active, the release event is his. Mark
- * all buttons released, this also surpresses
- * a spurious release event of the not-yet-
- * released button.
- */
- if( id & 4) {
- ms->ms_bq[0].id = MS_MIDDLE;
- id = 0;
- }
- flush_buttons = 1;
- }
- else if (!is_timeout) {
- timeout((FPV)ms_3b_delay, (void *)ms, 10);
+ else if (ms->ms_bq[0].value == VKEY_DOWN) {
+ timeout((FPV)ms_3b_delay, (void *)ms, 10);
+ goto out;
+ }
+ flush_buttons = 1;
+ }
+out:
+ if (flush_buttons) {
+ int i;
+
+ for (i = 0; i < ms->ms_bq_idx; i++) {
+ if ((++put) % EV_QSIZE == get) {
+ ms->ms_bq_idx = 0;
+ put--;
goto out;
}
- }
- if (flush_buttons) {
- int i;
-
- for (i = 0; i < ms->ms_bq_idx; i++) {
- if ((++put) % EV_QSIZE == get) {
- ms->ms_bq_idx = 0;
- put--;
- goto out;
- }
- *fe = ms->ms_bq[i];
- if (put >= EV_QSIZE) {
- put = 0;
- fe = &ms->ms_events.ev_q[0];
- }
- else fe++;
+ *fe = ms->ms_bq[i];
+ if (put >= EV_QSIZE) {
+ put = 0;
+ fe = &ms->ms_events.ev_q[0];
}
- ms->ms_bq_idx = 0;
+ else fe++;
}
+ ms->ms_bq_idx = 0;
}
-
-out:
ms->ms_events.ev_put = put;
- ms->ms_buttons = id;
+ ms->ms_buttons = rel_ms->id;
splx(sps);
EV_WAKEUP(&ms->ms_events);
}
@@ -287,7 +297,7 @@ dev_t dev;
int flags, mode;
struct proc *p;
{
- u_char report_ms[] = { 0x08 };
+ u_char report_ms_joy[] = { 0x14, 0x08 };
struct ms_softc *ms;
int unit;
@@ -310,7 +320,7 @@ struct proc *p;
/*
* Enable mouse reporting.
*/
- kbd_write(report_ms, sizeof(report_ms));
+ kbd_write(report_ms_joy, sizeof(report_ms_joy));
return(0);
}
@@ -320,7 +330,7 @@ dev_t dev;
int flags, mode;
struct proc *p;
{
- u_char disable_ms[] = { 0x12 };
+ u_char disable_ms_joy[] = { 0x12, 0x1a };
int unit;
struct ms_softc *ms;
@@ -330,7 +340,7 @@ struct proc *p;
/*
* Turn off mouse interrogation.
*/
- kbd_write(disable_ms, sizeof(disable_ms));
+ kbd_write(disable_ms_joy, sizeof(disable_ms_joy));
ev_fini(&ms->ms_events);
ms->ms_events.ev_io = NULL;
return(0);
@@ -363,6 +373,12 @@ struct proc *p;
ms = &ms_softc[unit];
switch (cmd) {
+ case MIOCS3B_EMUL:
+ ms->ms_emul3b = (*(int *)data != 0) ? 1 : 0;
+ return (0);
+ case MIOCG3B_EMUL:
+ *(int *)data = ms->ms_emul3b;
+ return (0);
case FIONBIO: /* we will remove this someday (soon???) */
return(0);
case FIOASYNC:
diff --git a/sys/arch/atari/dev/msvar.h b/sys/arch/atari/dev/msvar.h
new file mode 100644
index 00000000000..210d8ff6066
--- /dev/null
+++ b/sys/arch/atari/dev/msvar.h
@@ -0,0 +1,64 @@
+/* $NetBSD: msvar.h,v 1.1 1996/04/12 08:37:06 leo Exp $ */
+
+/*
+ * Copyright (c) 1996 Leo Weppelman
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Leo Weppelman.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _MSVAR_H
+#define _MSVAR_H
+
+/*
+ * Mouse specific packages produced by the keyboard. Currently, we only
+ * define the REL_MOUSE package, as this is the only one used.
+ */
+typedef struct {
+ u_char id;
+ char dx;
+ char dy;
+} REL_MOUSE;
+
+#define IS_REL_MOUSE(id) (((u_int)(id) & 0xF8) == 0xF8)
+#define TIMEOUT_ID (0xFC)
+
+struct ms_softc {
+ u_char ms_buttons; /* button states */
+ u_char ms_emul3b; /* emulate 3rd button */
+ struct evvar ms_events; /* event queue state */
+ int ms_dx; /* accumulated dx */
+ int ms_dy; /* accumulated dy */
+ struct firm_event ms_bq[2]; /* Button queue */
+ int ms_bq_idx; /* Button queue index */
+};
+
+#ifdef _KERNEL
+void mouse_soft __P((REL_MOUSE *, int, int));
+int mouseattach __P((int));
+#endif /* _KERNEL */
+
+#endif /* _MSVAR_H */