diff options
| author | chs <chs@NetBSD.org> | 2012-10-27 17:17:22 +0000 |
|---|---|---|
| committer | chs <chs@NetBSD.org> | 2012-10-27 17:17:22 +0000 |
| commit | 5f819ca390688de9d67f1a48523a015b972c34ec (patch) | |
| tree | 91e87473a094e718759b526cf650c38a16f55bc4 /sys/dev/dec | |
| parent | f46eed49466feddf62521b34b96f7e727854c5fc (diff) | |
split device_t/softc for all remaining drivers.
replace "struct device *" with "device_t".
use device_xname(), device_unit(), etc.
Diffstat (limited to 'sys/dev/dec')
| -rw-r--r-- | sys/dev/dec/dzkbd.c | 8 | ||||
| -rw-r--r-- | sys/dev/dec/dzms.c | 7 | ||||
| -rw-r--r-- | sys/dev/dec/vsxxxvar.h | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c index 276f273a067..1003a9679de 100644 --- a/sys/dev/dec/dzkbd.c +++ b/sys/dev/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzkbd.c,v 1.25 2012/07/16 12:55:36 abs Exp $ */ +/* $NetBSD: dzkbd.c,v 1.26 2012/10/27 17:18:15 chs Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.25 2012/07/16 12:55:36 abs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.26 2012/10/27 17:18:15 chs Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,8 +79,6 @@ struct dzkbd_internal { struct dzkbd_internal dzkbd_console_internal; struct dzkbd_softc { - struct device dzkbd_dev; /* required first: base device */ - struct dzkbd_internal *sc_itl; int sc_enabled; @@ -94,7 +92,7 @@ static int dzkbd_input(void *, int); static int dzkbd_match(device_t, cfdata_t, void *); static void dzkbd_attach(device_t, device_t, void *); -CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc), +CFATTACH_DECL_NEW(dzkbd, sizeof(struct dzkbd_softc), dzkbd_match, dzkbd_attach, NULL, NULL); static int dzkbd_enable(void *, int); diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c index 4a9d45d59bb..b358b6d16bc 100644 --- a/sys/dev/dec/dzms.c +++ b/sys/dev/dec/dzms.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzms.c,v 1.21 2009/05/12 14:18:16 cegger Exp $ */ +/* $NetBSD: dzms.c,v 1.22 2012/10/27 17:18:15 chs Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.21 2009/05/12 14:18:16 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.22 2012/10/27 17:18:15 chs Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,7 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.21 2009/05/12 14:18:16 cegger Exp $"); #include "locators.h" struct dzms_softc { /* driver status information */ - struct device dzms_dev; /* required first: base device */ struct dz_linestate *dzms_ls; int sc_enabled; /* input enabled? */ @@ -86,7 +85,7 @@ static int dzms_match(device_t, cfdata_t, void *); static void dzms_attach(device_t, device_t, void *); static int dzms_input(void *, int); -CFATTACH_DECL(dzms, sizeof(struct dzms_softc), +CFATTACH_DECL_NEW(dzms, sizeof(struct dzms_softc), dzms_match, dzms_attach, NULL, NULL); static int dzms_enable(void *); diff --git a/sys/dev/dec/vsxxxvar.h b/sys/dev/dec/vsxxxvar.h index 4573ac5e864..62820839e65 100644 --- a/sys/dev/dec/vsxxxvar.h +++ b/sys/dev/dec/vsxxxvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vsxxxvar.h,v 1.5 2009/05/12 14:18:16 cegger Exp $ */ +/* $NetBSD: vsxxxvar.h,v 1.6 2012/10/27 17:18:15 chs Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,6 @@ */ struct vsxxx_softc { - struct device sc_dev; device_t sc_wsmousedev; unsigned sc_nbyte; union { |
