Module Name: src
Committed By: nonaka
Date: Sat Jun 11 16:34:36 UTC 2011
Modified Files:
src/sys/dev/hpc: hpckbd.c
Log Message:
split device_t/softc.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/hpc/hpckbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hpc/hpckbd.c
diff -u src/sys/dev/hpc/hpckbd.c:1.28 src/sys/dev/hpc/hpckbd.c:1.29
--- src/sys/dev/hpc/hpckbd.c:1.28 Tue May 12 14:22:39 2009
+++ src/sys/dev/hpc/hpckbd.c Sat Jun 11 16:34:36 2011
@@ -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
*/
