[src/trunk]: src/sys/dev/hpc split device_t/softc.

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0b0a2c1712e6
branches:  trunk
changeset: 765943:0b0a2c1712e6
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sat Jun 11 16:34:36 2011 +0000

description:
split device_t/softc.

diffstat:

 sys/dev/hpc/hpckbd.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r a2f3038181cd -r 0b0a2c1712e6 sys/dev/hpc/hpckbd.c
--- a/sys/dev/hpc/hpckbd.c      Sat Jun 11 14:37:36 2011 +0000
+++ b/sys/dev/hpc/hpckbd.c      Sat Jun 11 16:34:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -30,7 +30,7 @@
  */
 
 #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>
@@ -87,7 +87,7 @@
 };
 
 struct hpckbd_softc {
-       struct device           sc_dev;
+       device_t                sc_dev;
        struct hpckbd_core      *sc_core;
        struct hpckbd_core      sc_coredata;
 };
@@ -104,7 +104,7 @@
 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 */
@@ -139,8 +139,7 @@
 };
 
 int
-hpckbd_match(device_t parent,
-            cfdata_t cf, void *aux)
+hpckbd_match(device_t parent, cfdata_t cf, void *aux)
 {
        return (1);
 }
@@ -153,6 +152,8 @@
        struct hpckbd_ic_if *ic = haa->haa_ic;
        struct wskbddev_attach_args wa;
 
+       sc->sc_dev = self;
+
        /*
         * Initialize core if it isn't console
         */