CVS commit: src/sys/dev/dec
Module Name:src Committed By: msaitoh Date: Fri Dec 27 09:47:55 UTC 2019 Modified Files: src/sys/dev/dec: files.dec Log Message: s/le_de_subr/le_dec_subr/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/dec/files.dec 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/dec/files.dec diff -u src/sys/dev/dec/files.dec:1.8 src/sys/dev/dec/files.dec:1.9 --- src/sys/dev/dec/files.dec:1.8 Sat Jul 29 19:10:56 2006 +++ src/sys/dev/dec/files.dec Fri Dec 27 09:47:55 2019 @@ -1,11 +1,11 @@ -# $NetBSD: files.dec,v 1.8 2006/07/29 19:10:56 ad Exp $ +# $NetBSD: files.dec,v 1.9 2019/12/27 09:47:55 msaitoh Exp $ # # Config file and device description for machine-independent # code for devices for Digital Equipment Corp. systems. # Included by ports that need it. # Attribute for DEC lance padded-DMA copy functions. Lance attachments -# which need it should specify the le_de_subr attribute. +# which need it should specify the le_dec_subr attribute. define le_dec_subr # DMA copy functions. Lance attachments qhich Decices
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: skrll
Date: Mon Jul 11 10:55:35 UTC 2016
Modified Files:
src/sys/dev/dec: lk201_ws.c
Log Message:
Don't use a callout unnecessarily - especially not this early
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/dec/lk201_ws.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/dec/lk201_ws.c
diff -u src/sys/dev/dec/lk201_ws.c:1.9 src/sys/dev/dec/lk201_ws.c:1.10
--- src/sys/dev/dec/lk201_ws.c:1.9 Fri Jan 2 21:32:26 2015
+++ src/sys/dev/dec/lk201_ws.c Mon Jul 11 10:55:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201_ws.c,v 1.9 2015/01/02 21:32:26 jklos Exp $ */
+/* $NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.9 2015/01/02 21:32:26 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $");
#include
#include
@@ -43,8 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v
void lk201_identify(void *);
-static callout_t lkkbd_id;
-
static const char *lkkbd_descr[] = {
"no keyboard",
"LK-201 keyboard",
@@ -82,20 +80,6 @@ lk201_init(struct lk201_state *lks)
send(lks, LK_LED_ALL);
lks->leds_state = 0;
- callout_init(&lkkbd_id, 0);
- callout_setfunc(&lkkbd_id, lk201_identify, lks);
- callout_schedule(&lkkbd_id, 0);
-
- return (0);
-}
-
-void
-lk201_identify(void *v)
-{
- struct lk201_state *lks = v;
- int i;
-
- callout_destroy(&lkkbd_id);
/*
* Swallow all the keyboard acknowledges from lk201_init().
* There should be 14 of them - one per LK_CMD_MODE command.
@@ -133,6 +117,8 @@ lk201_identify(void *v)
lks->waitack = 0;
printf("lkkbd0: %s\n", lkkbd_descr[lks->kbdtype]);
+
+ return 0;
}
int
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: abs
Date: Mon Jul 16 12:55:36 UTC 2012
Modified Files:
src/sys/dev/dec: dzkbd.c
Log Message:
revert last
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dec/dzkbd.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/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.24 src/sys/dev/dec/dzkbd.c:1.25
--- src/sys/dev/dec/dzkbd.c:1.24 Mon Jul 16 12:52:47 2012
+++ src/sys/dev/dec/dzkbd.c Mon Jul 16 12:55:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $ */
+/* $NetBSD: dzkbd.c,v 1.25 2012/07/16 12:55:36 abs Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.25 2012/07/16 12:55:36 abs Exp $");
#include
#include
@@ -85,7 +85,6 @@ struct dzkbd_softc {
int sc_enabled;
int kbd_type;
- int wsraw;
device_t sc_wskbddev;
};
@@ -287,11 +286,6 @@ dzkbd_ioctl(void *v, u_long cmd, void *d
/* XXX don't dig in kbd internals */
*(int *)data = sc->sc_itl->dzi_ks.kcvol;
return 0;
-#ifdef WSDISPLAY_COMPAT_RAWKBD
- case WSKBDIO_SETMODE:
- sc->wsraw = *(int *)data == WSKBD_RAW;
- return 0;
-#endif
}
return (EPASSTHROUGH);
}
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: abs
Date: Mon Jul 16 12:52:47 UTC 2012
Modified Files:
src/sys/dev/dec: dzkbd.c
Log Message:
Allow WSKBDIO_SETMODE
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/dec/dzkbd.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/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.23 src/sys/dev/dec/dzkbd.c:1.24
--- src/sys/dev/dec/dzkbd.c:1.23 Tue May 12 14:18:16 2009
+++ src/sys/dev/dec/dzkbd.c Mon Jul 16 12:52:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $ */
+/* $NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.24 2012/07/16 12:52:47 abs Exp $");
#include
#include
@@ -85,6 +85,7 @@ struct dzkbd_softc {
int sc_enabled;
int kbd_type;
+ int wsraw;
device_t sc_wskbddev;
};
@@ -286,6 +287,11 @@ dzkbd_ioctl(void *v, u_long cmd, void *d
/* XXX don't dig in kbd internals */
*(int *)data = sc->sc_itl->dzi_ks.kcvol;
return 0;
+#ifdef WSDISPLAY_COMPAT_RAWKBD
+ case WSKBDIO_SETMODE:
+ sc->wsraw = *(int *)data == WSKBD_RAW;
+ return 0;
+#endif
}
return (EPASSTHROUGH);
}
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: tsutsui
Date: Wed Apr 6 14:51:12 UTC 2011
Modified Files:
src/sys/dev/dec: mcclock.c
Log Message:
Make this compile with options DEBUG. (PRId64 for time_t)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/dec/mcclock.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/dec/mcclock.c
diff -u src/sys/dev/dec/mcclock.c:1.25 src/sys/dev/dec/mcclock.c:1.26
--- src/sys/dev/dec/mcclock.c:1.25 Mon May 3 18:04:56 2010
+++ src/sys/dev/dec/mcclock.c Wed Apr 6 14:51:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.25 2010/05/03 18:04:56 mhitch Exp $ */
+/* $NetBSD: mcclock.c,v 1.26 2011/04/06 14:51:12 tsutsui Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.25 2010/05/03 18:04:56 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.26 2011/04/06 14:51:12 tsutsui Exp $");
#include
#include
@@ -219,7 +219,8 @@
#ifdef DEBUG
if (dt.dt_year != 1972)
- printf("resettodr: botch (%d, %ld)\n", yearsecs, time_second);
+ printf("resettodr: botch (%d, %" PRId64 ")\n",
+ yearsecs, time_second);
#endif
s = splclock();
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: hans
Date: Sun May 9 22:29:26 UTC 2010
Modified Files:
src/sys/dev/dec: dz.c
Log Message:
The interrupt handler uses the softc, so it's probably a good idea to
initialize it before causing interrupts. Prevents a panic on VAXstation
4000/9x with SPX console.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/dec/dz.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/dec/dz.c
diff -u src/sys/dev/dec/dz.c:1.38 src/sys/dev/dec/dz.c:1.39
--- src/sys/dev/dec/dz.c:1.38 Mon Sep 8 23:36:54 2008
+++ src/sys/dev/dec/dz.c Sun May 9 22:29:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dz.c,v 1.38 2008/09/08 23:36:54 gmcgarry Exp $ */
+/* $NetBSD: dz.c,v 1.39 2010/05/09 22:29:26 hans Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.38 2008/09/08 23:36:54 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.39 2010/05/09 22:29:26 hans Exp $");
#include
#include
@@ -204,16 +204,7 @@
{
int n;
- sc->sc_rxint = sc->sc_brk = 0;
- sc->sc_consline = consline;
-
- sc->sc_dr.dr_tcrw = sc->sc_dr.dr_tcr;
- dz_write2(sc, sc->sc_dr.dr_csr, DZ_CSR_MSE | DZ_CSR_RXIE | DZ_CSR_TXIE);
- dz_write1(sc, sc->sc_dr.dr_dtr, 0);
- dz_write1(sc, sc->sc_dr.dr_break, 0);
- DELAY(1);
-
- /* Initialize our softc structure. Should be done in open? */
+ /* Initialize our softc structure. */
for (n = 0; n < sc->sc_type; n++) {
sc->sc_dz[n].dz_sc = sc;
@@ -231,6 +222,15 @@
cn_set_magic("\047\001"); /* default magic is BREAK */
/* VAX will change it in MD code */
+ sc->sc_rxint = sc->sc_brk = 0;
+ sc->sc_consline = consline;
+
+ sc->sc_dr.dr_tcrw = sc->sc_dr.dr_tcr;
+ dz_write2(sc, sc->sc_dr.dr_csr, DZ_CSR_MSE | DZ_CSR_RXIE | DZ_CSR_TXIE);
+ dz_write1(sc, sc->sc_dr.dr_dtr, 0);
+ dz_write1(sc, sc->sc_dr.dr_break, 0);
+ DELAY(1);
+
/* Alas no interrupt on modem bit changes, so we manually scan */
if (dz_timer == 0) {
dz_timer = 1;
CVS commit: src/sys/dev/dec
Module Name:src Committed By: mhitch Date: Mon May 3 18:04:56 UTC 2010 Modified Files: src/sys/dev/dec: mcclock.c Log Message: Fix error introduced with timecounters - RTC clock register only uses the last 2 digits of the year. Fixes setting the clock and keeps the DECstation PROM happy and stops it from setting the date to Jan 1, 1972. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dec/mcclock.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/dec/mcclock.c diff -u src/sys/dev/dec/mcclock.c:1.24 src/sys/dev/dec/mcclock.c:1.25 --- src/sys/dev/dec/mcclock.c:1.24 Sat Dec 12 14:44:10 2009 +++ src/sys/dev/dec/mcclock.c Mon May 3 18:04:56 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock.c,v 1.24 2009/12/12 14:44:10 tsutsui Exp $ */ +/* $NetBSD: mcclock.c,v 1.25 2010/05/03 18:04:56 mhitch Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.24 2009/12/12 14:44:10 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.25 2010/05/03 18:04:56 mhitch Exp $"); #include #include @@ -232,7 +232,7 @@ regs[MC_DOW] = dt.dt_wday; regs[MC_DOM] = dt.dt_day; regs[MC_MONTH] = dt.dt_mon; - regs[MC_YEAR] = dt.dt_year; + regs[MC_YEAR] = dt.dt_year - 1900; /* rt clock wants 2 digits */ s = splclock(); MC146818_PUTTOD(sc, ®s);
CVS commit: src/sys/dev/dec
Module Name:src Committed By: he Date: Sat May 23 19:11:19 UTC 2009 Modified Files: src/sys/dev/dec: clockvar.h Log Message: After the change from "struct device *" to "device_t", we now depend on the definitions from , so include it here. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/dec/clockvar.h 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/dec/clockvar.h diff -u src/sys/dev/dec/clockvar.h:1.10 src/sys/dev/dec/clockvar.h:1.11 --- src/sys/dev/dec/clockvar.h:1.10 Tue May 12 14:18:16 2009 +++ src/sys/dev/dec/clockvar.h Sat May 23 19:11:19 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: clockvar.h,v 1.10 2009/05/12 14:18:16 cegger Exp $ */ +/* $NetBSD: clockvar.h,v 1.11 2009/05/23 19:11:19 he Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -27,6 +27,8 @@ * rights to redistribute these changes. */ +#include + /* * Definitions for CPU-independent clock handling for the alpha and pmax. */
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: cegger
Date: Tue May 12 14:18:16 UTC 2009
Modified Files:
src/sys/dev/dec: clockvar.h dzkbd.c dzms.c dzvar.h mcclock.c vsxxxvar.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/dec/clockvar.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/dec/dzkbd.c src/sys/dev/dec/mcclock.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dec/dzms.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/dec/dzvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/dec/vsxxxvar.h
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/dec/clockvar.h
diff -u src/sys/dev/dec/clockvar.h:1.9 src/sys/dev/dec/clockvar.h:1.10
--- src/sys/dev/dec/clockvar.h:1.9 Thu Jan 3 23:02:25 2008
+++ src/sys/dev/dec/clockvar.h Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clockvar.h,v 1.9 2008/01/03 23:02:25 joerg Exp $ */
+/* $NetBSD: clockvar.h,v 1.10 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -38,7 +38,7 @@
* chip-dependent routines.
*/
struct clockfns {
- void (*cf_init)(struct device *);
+ void (*cf_init)(device_t);
};
-void clockattach(struct device *, const struct clockfns *);
+void clockattach(device_t, const struct clockfns *);
Index: src/sys/dev/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.22 src/sys/dev/dec/dzkbd.c:1.23
--- src/sys/dev/dec/dzkbd.c:1.22 Tue May 12 12:11:54 2009
+++ src/sys/dev/dec/dzkbd.c Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $ */
+/* $NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $");
#include
#include
@@ -86,13 +86,13 @@
int sc_enabled;
int kbd_type;
- struct device *sc_wskbddev;
+ device_t sc_wskbddev;
};
static int dzkbd_input(void *, int);
-static int dzkbd_match(struct device *, cfdata_t, void *);
-static void dzkbd_attach(struct device *, struct device *, void *);
+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),
dzkbd_match, dzkbd_attach, NULL, NULL);
@@ -130,7 +130,7 @@
* kbd_match: how is this dz line configured?
*/
static int
-dzkbd_match(struct device *parent, cfdata_t cf, void *aux)
+dzkbd_match(device_t parent, cfdata_t cf, void *aux)
{
struct dzkm_attach_args *daa = aux;
@@ -146,7 +146,7 @@
}
static void
-dzkbd_attach(struct device *parent, struct device *self, void *aux)
+dzkbd_attach(device_t parent, device_t self, void *aux)
{
struct dz_softc *dz = device_private(parent);
struct dzkbd_softc *dzkbd = device_private(self);
Index: src/sys/dev/dec/mcclock.c
diff -u src/sys/dev/dec/mcclock.c:1.22 src/sys/dev/dec/mcclock.c:1.23
--- src/sys/dev/dec/mcclock.c:1.22 Sat Mar 14 15:36:17 2009
+++ src/sys/dev/dec/mcclock.c Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.22 2009/03/14 15:36:17 dsl Exp $ */
+/* $NetBSD: mcclock.c,v 1.23 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.22 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.23 2009/05/12 14:18:16 cegger Exp $");
#include
#include
@@ -51,7 +51,7 @@
#endif
-void mcclock_init(struct device *);
+void mcclock_init(device_t);
int mcclock_get(todr_chip_handle_t, volatile struct timeval *);
int mcclock_set(todr_chip_handle_t, volatile struct timeval *);
@@ -84,7 +84,7 @@
}
void
-mcclock_init(struct device *dev)
+mcclock_init(device_t dev)
{
struct mcclock_softc *sc = (struct mcclock_softc *)dev;
int rate;
Index: src/sys/dev/dec/dzms.c
diff -u src/sys/dev/dec/dzms.c:1.20 src/sys/dev/dec/dzms.c:1.21
--- src/sys/dev/dec/dzms.c:1.20 Tue May 12 12:11:54 2009
+++ src/sys/dev/dec/dzms.c Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $ */
+/* $NetBSD: dzms.c,v 1.21 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.21 2009/05/12 14:18:16 cegger Exp $");
#include
#include
@@ -79,11 +79,11 @@
u_int buttons;
int dx, dy;
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
};
-static int dzms_match(struct device *, cfdata_t, void *);
-static void dzms_attach(struct device *, struct device *, void *);
+static int dzms_match(device_t, cfdata_t, void *);
+static void dzms_attach(device_t, device_t, void *
CVS commit: src/sys/dev/dec
Module Name:src
Committed By: cegger
Date: Tue May 12 12:11:55 UTC 2009
Modified Files:
src/sys/dev/dec: dzkbd.c dzms.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dec/dzkbd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/dec/dzms.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/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.21 src/sys/dev/dec/dzkbd.c:1.22
--- src/sys/dev/dec/dzkbd.c:1.21 Sat Mar 14 15:36:17 2009
+++ src/sys/dev/dec/dzkbd.c Tue May 12 12:11:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.21 2009/03/14 15:36:17 dsl Exp $ */
+/* $NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.21 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $");
#include
#include
@@ -91,7 +91,7 @@
static int dzkbd_input(void *, int);
-static int dzkbd_match(struct device *, struct cfdata *, void *);
+static int dzkbd_match(struct device *, cfdata_t, void *);
static void dzkbd_attach(struct device *, struct device *, void *);
CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc),
@@ -130,7 +130,7 @@
* kbd_match: how is this dz line configured?
*/
static int
-dzkbd_match(struct device *parent, struct cfdata *cf, void *aux)
+dzkbd_match(struct device *parent, cfdata_t cf, void *aux)
{
struct dzkm_attach_args *daa = aux;
Index: src/sys/dev/dec/dzms.c
diff -u src/sys/dev/dec/dzms.c:1.19 src/sys/dev/dec/dzms.c:1.20
--- src/sys/dev/dec/dzms.c:1.19 Sat Mar 14 21:04:19 2009
+++ src/sys/dev/dec/dzms.c Tue May 12 12:11:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dzms.c,v 1.19 2009/03/14 21:04:19 dsl Exp $ */
+/* $NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.19 2009/03/14 21:04:19 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $");
#include
#include
@@ -82,7 +82,7 @@
struct device *sc_wsmousedev;
};
-static int dzms_match(struct device *, struct cfdata *, void *);
+static int dzms_match(struct device *, cfdata_t, void *);
static void dzms_attach(struct device *, struct device *, void *);
static int dzms_input(void *, int);
@@ -100,7 +100,7 @@
};
static int
-dzms_match(struct device *parent, struct cfdata *cf, void *aux)
+dzms_match(struct device *parent, cfdata_t cf, void *aux)
{
struct dzkm_attach_args *daa = aux;
