 @@ -1,14 +1,14 @@
-/*	$NetBSD: kbd.c,v 1.37 2009/07/03 13:36:09 tsutsui Exp $	*/
+/*	$NetBSD: kbd.c,v 1.38 2009/07/03 13:49:39 tsutsui Exp $	*/
 /*
  * Copyright (c) 1995 Leo Weppelman
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * 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
 @@ -21,27 +21,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.37 2009/07/03 13:36:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.38 2009/07/03 13:49:39 tsutsui Exp $");
 #include "mouse.h"
 #include "ite.h"
 #include "wskbd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 @@ -113,27 +113,27 @@ dev_type_read(kbdread);
 dev_type_ioctl(kbdioctl);
 dev_type_poll(kbdpoll);
 dev_type_kqfilter(kbdkqfilter);
 /* Interrupt handler */
 void	kbdintr(int);
 static void kbdsoft(void *, void *);
 static void kbdattach(struct device *, struct device *, void *);
 static int  kbdmatch(struct device *, struct cfdata *, void *);
 #if NITE>0
 static int  kbd_do_modifier(uint8_t);
 #endif
-static int  kbd_write_poll(uint8_t *, int);
+static int  kbd_write_poll(const uint8_t *, int);
 static void kbd_pkg_start(struct kbd_softc *, uint8_t);
 CFATTACH_DECL(kbd, sizeof(struct device),
     kbdmatch, kbdattach, NULL, NULL);
 const struct cdevsw kbd_cdevsw = {
 	kbdopen, kbdclose, kbdread, nowrite, kbdioctl,
 	nostop, notty, kbdpoll, nommap, kbdkqfilter,
 };
 #if NWSKBD>0
 /* accessops */
 static int	kbd_enable(void *, int);
 @@ -169,28 +169,28 @@ static	int
 kbdmatch(struct device *pdp, struct cfdata *cfp, void *auxp)
+{
 	if (!strcmp((char *)auxp, "kbd"))
 		return 1;
 	return 0;
+}
 /*ARGSUSED*/
 static void
 kbdattach(struct device *pdp, struct device *dp, void *auxp)
+{
 	int timeout;
-	uint8_t kbd_rst[]  = { 0x80, 0x01 };
+	const uint8_t kbd_rst[]  = { 0x80, 0x01 };
-	uint8_t kbd_icmd[] = { 0x12, 0x15 };
+	const uint8_t kbd_icmd[] = { 0x12, 0x15 };
 	/*
 	 * Disable keyboard interrupts from MFP
 	 */
 	MFP->mf_ierb &= ~IB_AINT;
 	/*
 	 * Reset ACIA and intialize to:
 	 *    divide by 16, 8 data, 1 stop, no parity, enable RX interrupts
 	 */
 	KBD->ac_cs = A_RESET;
 	delay(100);	/* XXX: enough? */
 	KBD->ac_cs = kbd_softc.k_soft_cs = KBD_INIT | A_RXINT;
 @@ -639,45 +639,45 @@ kbdgetcn(void)
 	if (ints_active) {
 		MFP->mf_iprb  = (uint8_t)~IB_AINT;
 		MFP->mf_imrb |=  IB_AINT;
+	}
 	splx(s);
 	return code;
+}
 /*
  * Write a command to the keyboard in 'polled' mode.
  */
 static int
-kbd_write_poll(uint8_t *cmd, int len)
+kbd_write_poll(const uint8_t *cmd, int len)
+{
 	int	timeout;
 	while (len-- > 0) {
 		KBD->ac_da = *cmd++;
 		for (timeout = 100; !(KBD->ac_cs & A_TXRDY); timeout--)
 			delay(10);
 		if ((KBD->ac_cs & A_TXRDY) == 0)
 			return 0;
+	}
 	return 1;
+}
 /*
  * Write a command to the keyboard. Return when command is send.
  */
 void
-kbd_write(uint8_t *cmd, int len)
+kbd_write(const uint8_t *cmd, int len)
+{
 	struct kbd_softc	*k = &kbd_softc;
 	int			sps;
 	/*
 	 * Get to splhigh, 'real' interrupts arrive at spl6!
 	 */
 	sps = splhigh();
 	/*
 	 * Make sure any privious write has ended...
 	 */
 	while (k->k_sendp != NULL)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kbdvar.h,v 1.6 2009/03/14 14:45:56 dsl Exp $	*/
+/*	$NetBSD: kbdvar.h,v 1.7 2009/07/03 13:49:39 tsutsui Exp $	*/
 /*
  * Copyright (c) 1996 Leo Weppelman.
  * 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.
 @@ -34,49 +34,49 @@
 #define _KBDVAR_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			     */
 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		*/
+	uint8_t		k_soft_cs;	/* control-reg. copy		*/
-	u_char		k_package[20];	/* XXX package being build	*/
+	uint8_t		k_package[20];	/* XXX package being build	*/
-	u_char		k_pkg_size;	/* Size of the package		*/
+	uint8_t		k_pkg_size;	/* Size of the package		*/
-	u_char		k_pkg_idx;	/* Running pkg assembly index	*/
+	uint8_t		k_pkg_idx;	/* Running pkg assembly index	*/
-	u_char		k_pkg_type;	/* Type of package		*/
+	uint8_t		k_pkg_type;	/* Type of package		*/
-	u_char		*k_sendp;	/* Output pointer		*/
+	const uint8_t	*k_sendp;	/* Output pointer		*/
 	int		k_send_cnt;	/* Chars left for output	*/
 #if NWSKBD>0
 	struct device	*k_wskbddev;	/* pointer to wskbd for sending strokes */
 	int		k_pollingmode;	/* polling mode on? whatever it isss... */
 #endif
 };
 /*
  * Package types
  */
 #define	KBD_MEM_PKG	0		/* Memory read package		*/
 #define	KBD_AMS_PKG	1		/* Absolute mouse package	*/
 #define	KBD_RMS_PKG	2		/* Relative mouse package	*/
 #define	KBD_CLK_PKG	3		/* Clock package		*/
 #define	KBD_JOY0_PKG	4		/* Joystick-0 package		*/
 #define	KBD_JOY1_PKG	5		/* Joystick-1 package		*/
 #define	KBD_TIMEO_PKG	6		/* Timeout package		*/
 #ifdef _KERNEL
-extern	u_char	kbd_modifier;
+extern	uint8_t	kbd_modifier;
 void	kbd_bell_gparms(u_int *, u_int *, u_int *);
 void	kbd_bell_sparms(u_int, u_int, u_int);
-void	kbd_write(u_char *, int);
+void	kbd_write(const uint8_t *, int);
 int	kbdgetcn(void);
 void	kbdbell(void);
 void	kbdenable(void);
 #endif /* _KERNEL */
 #endif /* _KBDVAR_H */