 @@ -1,14 +1,14 @@
-/*	$NetBSD: hpckbd.c,v 1.28 2009/05/12 14:22:39 cegger Exp $ */
+/*	$NetBSD: hpckbd.c,v 1.29 2011/06/11 16:34:36 nonaka Exp $ */
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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: hpckbd.c,v 1.28 2009/05/12 14:22:39 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.29 2011/06/11 16:34:36 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/tty.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <machine/config_hook.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
 @@ -77,44 +77,44 @@ struct hpckbd_core {
 #define NEVENTQ 32
 	struct hpckbd_eventq	hc_eventq[NEVENTQ];
 	struct hpckbd_eventq	*hc_head, *hc_tail;
 	int			hc_nevents;
 	int			hc_enabled;
 	struct device		*hc_wskbddev;
 	struct hpckbd_softc*	hc_sc;	/* back link */
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 	int			hc_rawkbd;
 #endif
 };
 struct hpckbd_softc {
-	struct device		sc_dev;
+	device_t		sc_dev;
 	struct hpckbd_core	*sc_core;
 	struct hpckbd_core	sc_coredata;
 };
 int	hpckbd_match(device_t, cfdata_t, void *);
 void	hpckbd_attach(device_t, device_t, void *);
 void	hpckbd_initcore(struct hpckbd_core *, struct hpckbd_ic_if *, int);
 void	hpckbd_initif(struct hpckbd_core *);
 int	hpckbd_getevent(struct hpckbd_core *, u_int *, int *);
 int	hpckbd_putevent(struct hpckbd_core *, u_int, int);
 void	hpckbd_keymap_lookup(struct hpckbd_core*);
 void	hpckbd_keymap_setup(struct hpckbd_core *, const keysym_t *, int);
 int	__hpckbd_input(void *, int, int);
 void	__hpckbd_input_hook(void *);
-CFATTACH_DECL(hpckbd, sizeof(struct hpckbd_softc),
+CFATTACH_DECL_NEW(hpckbd, sizeof(struct hpckbd_softc),
     hpckbd_match, hpckbd_attach, NULL, NULL);
 /* wskbd accessopts */
 int	hpckbd_enable(void *, int);
 void	hpckbd_set_leds(void *, int);
 int	hpckbd_ioctl(void *, u_long, void *, int, struct lwp *);
 /* consopts */
 struct	hpckbd_core hpckbd_consdata;
 void	hpckbd_cngetc(void *, u_int *, int*);
 void	hpckbd_cnpollc(void *, int);
 const struct wskbd_accessops hpckbd_accessops = {
 @@ -129,40 +129,41 @@ const struct wskbd_consops hpckbd_consop
 	NULL,
 };
 struct wskbd_mapdata hpckbd_keymapdata = {
 	pckbd_keydesctab,
 #ifdef PCKBD_LAYOUT
 	PCKBD_LAYOUT
 #else
 	KB_US
 #endif
 };
 int
-hpckbd_match(device_t parent,
+hpckbd_match(device_t parent, cfdata_t cf, void *aux)
 	     cfdata_t cf, void *aux)
+{
 	return (1);
+}
 void
 hpckbd_attach(device_t parent, device_t self, void *aux)
+{
 	struct hpckbd_attach_args *haa = aux;
 	struct hpckbd_softc *sc = device_private(self);
 	struct hpckbd_ic_if *ic = haa->haa_ic;
 	struct wskbddev_attach_args wa;
 	sc->sc_dev = self;
 	/*
 	 * Initialize core if it isn't console
 	 */
 	if (hpckbd_consdata.hc_ic == ic) {
 		sc->sc_core = &hpckbd_consdata;
 		/* The core has been initialized in hpckbd_cnattach. */
 	} else {
 		sc->sc_core = &sc->sc_coredata;
 		hpckbd_initcore(sc->sc_core, ic, 0 /* not console */);
+	}
 	if (sc->sc_core->hc_keymap == default_keymap)
 		printf(": no keymap.");