Factorize akbd and ams drivers between mac68k and macppc; while there, start

moving out common adb code as well, and merge adb_direct.c into adb.c to
simplify external header files.

No functional change; more cleanups to come.

1 files changed, 0 insertions, 600 deletions

diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c
deleted file mode 100644
index 651bf454c52..00000000000
--- a/sys/arch/macppc/dev/akbd.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/*	$OpenBSD: akbd.c,v 1.20 2006/01/08 17:25:05 miod Exp $	*/
-/*	$NetBSD: akbd.c,v 1.13 2001/01/25 14:08:55 tsubai Exp $	*/
-
-/*
- * Copyright (C) 1998	Colin Wood
- * All rights reserved.
- *
- * 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 Colin Wood.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#include <sys/param.h>
-#include <sys/timeout.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
-#include <sys/fcntl.h>
-#include <sys/poll.h>
-#include <sys/selinfo.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/systm.h>
-
-#include <dev/wscons/wsconsio.h>
-#include <dev/wscons/wskbdvar.h>
-#include <dev/wscons/wsksymdef.h>
-#include <dev/wscons/wsksymvar.h>
-
-#include <machine/autoconf.h>
-#define KEYBOARD_ARRAY
-
-#include <macppc/dev/keyboard.h>
-#include <macppc/dev/adbvar.h>
-#include <macppc/dev/akbdmap.h>
-#include <macppc/dev/akbdvar.h>
-#include <macppc/dev/amsvar.h>
-
-/*
- * Function declarations.
- */
-static int	akbdmatch(struct device *, void *, void *);
-static void	akbdattach(struct device *, struct device *, void *);
-void		kbd_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command);
-static void	kbd_processevent(adb_event_t *event, struct akbd_softc *);
-#ifdef notyet
-static u_char	getleds(int);
-static int	setleds(struct akbd_softc *, u_char);
-static void	blinkleds(struct akbd_softc *);
-#endif
-
-/* Driver definition. */
-struct cfattach akbd_ca = {
-	sizeof(struct akbd_softc), akbdmatch, akbdattach
-};
-struct cfdriver akbd_cd = {
-	NULL, "akbd", DV_DULL
-};
-
-
-int akbd_enable(void *, int);
-void akbd_set_leds(void *, int);
-int akbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
-int akbd_intr(adb_event_t *event);
-void akbd_rawrepeat(void *v);
-
-
-struct wskbd_accessops akbd_accessops = {
-	akbd_enable,
-	akbd_set_leds,
-	akbd_ioctl,
-};
-
-void akbd_cngetc(void *, u_int *, int *);
-void akbd_cnpollc(void *, int);
-
-struct wskbd_consops akbd_consops = {
-	akbd_cngetc,
-	akbd_cnpollc,
-};
-
-struct wskbd_mapdata akbd_keymapdata = {
-	akbd_keydesctab,
-#ifdef AKBD_LAYOUT
-	AKBD_LAYOUT,
-#else
-	KB_US,
-#endif
-};
-
-static int akbd_is_console;
-
-static int
-akbdmatch(struct device *parent, void *cf, void *aux)
-{
-	struct adb_attach_args *aa_args = aux;
-
-	if (aa_args->origaddr == ADBADDR_KBD)
-		return 1;
-	else
-		return 0;
-}
-
-static void
-akbdattach(struct device *parent, struct device *self, void *aux)
-{
-	ADBSetInfoBlock adbinfo;
-	struct akbd_softc *sc = (struct akbd_softc *)self;
-	struct adb_attach_args *aa_args = aux;
-	int error, kbd_done;
-	short cmd;
-	u_char buffer[9];
-	struct wskbddev_attach_args a;
-
-	sc->origaddr = aa_args->origaddr;
-	sc->adbaddr = aa_args->adbaddr;
-	sc->handler_id = aa_args->handler_id;
-
-	sc->sc_leds = (u_int8_t)0x00;	/* initially off */
-
-	adbinfo.siServiceRtPtr = (Ptr)kbd_adbcomplete;
-	adbinfo.siDataAreaAddr = (caddr_t)sc;
-
-	printf(": ");
-	switch (sc->handler_id) {
-	case ADB_STDKBD:
-		printf("standard keyboard\n");
-		break;
-	case ADB_ISOKBD:
-		printf("standard keyboard (ISO layout)\n");
-		break;
-	case ADB_EXTKBD:
-		cmd = ADBTALK(sc->adbaddr, 1);
-		kbd_done =
-		    (adb_op_sync((Ptr)buffer, (Ptr)0, (Ptr)0, cmd) == 0);
-
-		/* Ignore Logitech MouseMan/Trackman pseudo keyboard */
-		if (kbd_done && buffer[1] == 0x9a && buffer[2] == 0x20) {
-			printf("Mouseman (non-EMP) pseudo keyboard\n");
-			adbinfo.siServiceRtPtr = (Ptr)0;
-			adbinfo.siDataAreaAddr = (Ptr)0;
-		} else if (kbd_done && buffer[1] == 0x9a && buffer[2] == 0x21) {
-			printf("Trackman (non-EMP) pseudo keyboard\n");
-			adbinfo.siServiceRtPtr = (Ptr)0;
-			adbinfo.siDataAreaAddr = (Ptr)0;
-		} else {
-			printf("extended keyboard\n");
-#ifdef notyet
-			blinkleds(sc);
-#endif
-		}
-		break;
-	case ADB_EXTISOKBD:
-		printf("extended keyboard (ISO layout)\n");
-#ifdef notyet
-		blinkleds(sc);
-#endif
-		break;
-	case ADB_KBDII:
-		printf("keyboard II\n");
-		break;
-	case ADB_ISOKBDII:
-		printf("keyboard II (ISO layout)\n");
-		break;
-	case ADB_PBKBD:
-		printf("PowerBook keyboard\n");
-		break;
-	case ADB_PBISOKBD:
-		printf("PowerBook keyboard (ISO layout)\n");
-		break;
-	case ADB_ADJKPD:
-		printf("adjustable keypad\n");
-		break;
-	case ADB_ADJKBD:
-		printf("adjustable keyboard\n");
-		break;
-	case ADB_ADJISOKBD:
-		printf("adjustable keyboard (ISO layout)\n");
-		break;
-	case ADB_ADJJAPKBD:
-		printf("adjustable keyboard (Japanese layout)\n");
-		break;
-	case ADB_PBEXTISOKBD:
-		printf("PowerBook extended keyboard (ISO layout)\n");
-		break;
-	case ADB_PBEXTJAPKBD:
-		printf("PowerBook extended keyboard (Japanese layout)\n");
-		break;
-	case ADB_JPKBDII:
-		printf("keyboard II (Japanese layout)\n");
-		break;
-	case ADB_PBEXTKBD:
-		printf("PowerBook extended keyboard\n");
-		break;
-	case ADB_DESIGNKBD:
-		printf("extended keyboard\n");
-#ifdef notyet
-		blinkleds(sc);
-#endif
-		break;
-	case ADB_PBJPKBD:
-		printf("PowerBook keyboard (Japanese layout)\n");
-		break;
-	case ADB_PBG3JPKBD:
-		printf("PowerBook G3 keyboard (Japanese layout)\n");
-		break;
-	case ADB_PBG4KBD:
-		printf("PowerBook G4 keyboard (Inverted T)\n");
-		break;
-	case ADB_IBITISOKBD:
-		printf("iBook keyboard with inverted T (ISO layout)\n");
-		break;
-	default:
-		printf("mapped device (%d)\n", sc->handler_id);
-		break;
-	}
-	error = SetADBInfo(&adbinfo, sc->adbaddr);
-#ifdef ADB_DEBUG
-	if (adb_debug)
-		printf("akbd: returned %d from SetADBInfo\n", error);
-#endif
-
-#ifdef WSDISPLAY_COMPAT_RAWKBD
-	timeout_set(&sc->sc_rawrepeat_ch, akbd_rawrepeat, sc);
-#endif
-
-
-	a.console = akbd_is_console;
-	a.keymap = &akbd_keymapdata;
-	a.accessops = &akbd_accessops;
-	a.accesscookie = sc;
-
-	sc->sc_wskbddev = config_found(self, &a, wskbddevprint);
-}
-
-
-/*
- * Handle putting the keyboard data received from the ADB into
- * an ADB event record.
- */
-void
-kbd_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command)
-{
-	adb_event_t event;
-	struct akbd_softc *ksc;
-	int adbaddr;
-#ifdef ADB_DEBUG
-	int i;
-
-	if (adb_debug)
-		printf("adb: transaction completion\n");
-#endif
-
-	adbaddr = ADB_CMDADDR(adb_command);
-	ksc = (struct akbd_softc *)data_area;
-
-	event.addr = adbaddr;
-	event.hand_id = ksc->handler_id;
-	event.def_addr = ksc->origaddr;
-	event.byte_count = buffer[0];
-	memcpy(event.bytes, buffer + 1, event.byte_count);
-
-#ifdef ADB_DEBUG
-	if (adb_debug) {
-		printf("akbd: from %d at %d (org %d) %d:", event.addr,
-		    event.hand_id, event.def_addr, buffer[0]);
-		for (i = 1; i <= buffer[0]; i++)
-			printf(" %x", buffer[i]);
-		printf("\n");
-	}
-#endif
-
-	microtime(&event.timestamp);
-
-	kbd_processevent(&event, ksc);
-}
-
-/*
- * Given a keyboard ADB event, record the keycodes and call the key
- * repeat handler, optionally passing the event through the mouse
- * button emulation handler first.
- */
-static void
-kbd_processevent(adb_event_t *event, struct akbd_softc *ksc)
-{
-        adb_event_t new_event;
-
-        new_event = *event;
-	new_event.u.k.key = event->bytes[0];
-	new_event.bytes[1] = 0xff;
-	akbd_intr(&new_event);
-	if (event->bytes[1] != 0xff) {
-		new_event.u.k.key = event->bytes[1];
-		new_event.bytes[0] = event->bytes[1];
-		new_event.bytes[1] = 0xff;
-		akbd_intr(&new_event);
-	}
-
-}
-
-#ifdef notyet
-/*
- * Get the actual hardware LED state and convert it to softc format.
- */
-static u_char
-getleds(int addr)
-{
-	short cmd;
-	u_char buffer[9], leds;
-
-	leds = 0x00;	/* all off */
-	buffer[0] = 0;
-
-	/* talk R2 */
-	cmd = ADBTALK(addr, 2);
-	if (adb_op_sync((Ptr)buffer, (Ptr)0, (Ptr)0, cmd) == 0 &&
-	    buffer[0] > 0)
-		leds = ~(buffer[2]) & 0x07;
-
-	return (leds);
-}
-
-/*
- * Set the keyboard LED's.
- *
- * Automatically translates from ioctl/softc format to the
- * actual keyboard register format
- */
-static int
-setleds(struct akbd_softc *ksc, u_char leds)
-{
-	int addr;
-	short cmd;
-	u_char buffer[9];
-
-	if ((leds & 0x07) == (ksc->sc_leds & 0x07))
-		return (0);
-
-	addr = ksc->adbaddr;
-	buffer[0] = 0;
-
-	cmd = ADBTALK(addr, 2);
-	if (adb_op_sync((Ptr)buffer, (Ptr)0, (Ptr)0, cmd) || buffer[0] == 0)
-		return (EIO);
-
-	leds = ~leds & 0x07;
-	buffer[2] &= 0xf8;
-	buffer[2] |= leds;
-
-	cmd = ADBLISTEN(addr, 2);
-	adb_op_sync((Ptr)buffer, (Ptr)0, (Ptr)0, cmd);
-
-	cmd = ADBTALK(addr, 2);
-	if (adb_op_sync((Ptr)buffer, (Ptr)0, (Ptr)0, cmd) || buffer[0] == 0)
-		return (EIO);
-
-	ksc->sc_leds = ~((u_int8_t)buffer[2]) & 0x07;
-
-	if ((buffer[2] & 0xf8) != leds)
-		return (EIO);
-	else
-		return (0);
-}
-
-/*
- * Toggle all of the LED's on and off, just for show.
- */
-static void
-blinkleds(struct akbd_softc *ksc)
-{
-	int addr, i;
-	u_char blinkleds, origleds;
-
-	addr = ksc->adbaddr;
-	origleds = getleds(addr);
-	blinkleds = LED_NUMLOCK | LED_CAPSLOCK | LED_SCROLL_LOCK;
-
-	(void)setleds(ksc, blinkleds);
-
-	for (i = 0; i < 10000; i++)
-		delay(50);
-
-	/* make sure that we restore the LED settings */
-	i = 10;
-	do {
-		(void)setleds(ksc, (u_char)0x00);
-	} while (setleds(ksc, (u_char)0x00) && (i-- > 0));
-
-	return;
-}
-#endif
-
-int
-akbd_enable(void *v, int on)
-{
-	return 0;
-}
-
-void
-akbd_set_leds(void *v, int on)
-{
-}
-
-int
-akbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
-{
-#ifdef WSDISPLAY_COMPAT_RAWKBD
-	struct akbd_softc *sc = v;
-#endif
-
-	switch (cmd) {
-
-	case WSKBDIO_GTYPE:
-		*(int *)data = WSKBD_TYPE_ADB;
-		return 0;
-	case WSKBDIO_SETLEDS:
-		return 0;
-	case WSKBDIO_GETLEDS:
-		*(int *)data = 0;
-		return 0;
-#ifdef WSDISPLAY_COMPAT_RAWKBD
-	case WSKBDIO_SETMODE:
-		sc->sc_rawkbd = *(int *)data == WSKBD_RAW;
-		timeout_del(&sc->sc_rawrepeat_ch);
-		return (0);
-#endif
-
-	}
-	/* kbdioctl(...); */
-
-	return -1;
-}
-
-#ifdef WSDISPLAY_COMPAT_RAWKBD
-void
-akbd_rawrepeat(void *v)
-{
-	struct akbd_softc *sc = v;
-	int s;
-
-	s = spltty();
-	wskbd_rawinput(sc->sc_wskbddev, sc->sc_rep, sc->sc_nrep);
-	splx(s);
-	timeout_add(&sc->sc_rawrepeat_ch, hz * REP_DELAYN / 1000);
-}
-#endif
-
-
-static int polledkey;
-
-int
-akbd_intr(adb_event_t *event)
-{
-	int key, press, val;
-	int type;
-	static int shift;
-
-	struct akbd_softc *sc = akbd_cd.cd_devs[0];
-
-	key = event->u.k.key;
-
-	/*
-	 * Caps lock is weird. The key sequence generated is:
-	 * press:   down(57) [57]  (LED turns on)
-	 * release: up(127)  [255]
-	 * press:   up(127)  [255]
-	 * release: up(57)   [185] (LED turns off)
-	 */
-	if (ADBK_KEYVAL(key) == ADBK_CAPSLOCK)
-		shift = 0;
-
-	if (key == 255) {
-		if (shift == 0) {
-			key = ADBK_KEYUP(ADBK_CAPSLOCK);
-			shift = 1;
-		} else {
-			key = ADBK_KEYDOWN(ADBK_CAPSLOCK);
-			shift = 0;
-		}
-	}
-
-	press = ADBK_PRESS(key);
-	val = ADBK_KEYVAL(key);
-
-	type = press ? WSCONS_EVENT_KEY_DOWN : WSCONS_EVENT_KEY_UP;
-
-	switch (val) {
-#if 0
-	/* not supported... */
-	case ADBK_KEYVAL(245):
-		pm_eject_pcmcia(0);
-		break;
-	case ADBK_KEYVAL(244):
-		pm_eject_pcmcia(1);
-		break;
-#endif
-	}
-
-	if (adb_polling) {
-		polledkey = key;
-#ifdef WSDISPLAY_COMPAT_RAWKBD
-	} else if (sc->sc_rawkbd) {
-		char cbuf[MAXKEYS *2];
-		int c, j, s;
-		int npress;
-
-		j = npress = 0;
-
-		c = keyboard[val][3];
-		if (c == 0) {
-			return 0; /* XXX */
-		}
-		if (c & 0x80)
-			cbuf[j++] = 0xe0;
-		cbuf[j] = c & 0x7f;
-		if (type == WSCONS_EVENT_KEY_UP) {
-			cbuf[j] |= 0x80;
-		} else {
-			/* this only records last key pressed */
-			if (c & 0x80)
-				sc->sc_rep[npress++] = 0xe0;
-			sc->sc_rep[npress++] = c & 0x7f;
-		}
-		j++;
-		s = spltty();
-		wskbd_rawinput(sc->sc_wskbddev, cbuf, j);
-		splx(s);
-		timeout_del(&sc->sc_rawrepeat_ch);
-		sc->sc_nrep = npress;
-		if (npress != 0)
-			timeout_add(&sc->sc_rawrepeat_ch, hz * REP_DELAY1/1000);
-		return 0;
-#endif
-	} else {
-		wskbd_input(sc->sc_wskbddev, type, val);
-	}
-
-	return 0;
-}
-
-int
-akbd_cnattach()
-{
-
-	akbd_is_console = 1;
-	wskbd_cnattach(&akbd_consops, NULL, &akbd_keymapdata);
-	return 0;
-}
-
-void
-akbd_cngetc(void *v, u_int *type, int *data)
-{
-	int key, press, val;
-	int s;
-
-	s = splhigh();
-
-	polledkey = -1;
-	adb_polling = 1;
-
-	while (polledkey == -1) {
-		adb_intr(NULL); /* adb does not use the argument */
-		DELAY(10000);				/* XXX */
-	}
-
-	adb_polling = 0;
-	splx(s);
-
-	key = polledkey;
-	press = ADBK_PRESS(key);
-	val = ADBK_KEYVAL(key);
-
-	*data = val;
-	*type = press ? WSCONS_EVENT_KEY_DOWN : WSCONS_EVENT_KEY_UP;
-}
-
-void
-akbd_cnpollc(void *v, int on)
-{
-}