Module Name: src
Committed By: tsutsui
Date: Sat Oct 13 06:08:30 UTC 2012
Modified Files:
src/sys/arch/ews4800mips/dev: ewskbd.c ewsms.c
src/sys/arch/ews4800mips/sbd: if_le_sbdio.c kbms_sbdio.c
Log Message:
struct device * -> device_t, struct cfdata * -> cfdata_t (from chs@)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ews4800mips/dev/ewskbd.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ews4800mips/dev/ewsms.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ews4800mips/sbd/if_le_sbdio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ews4800mips/sbd/kbms_sbdio.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/arch/ews4800mips/dev/ewskbd.c
diff -u src/sys/arch/ews4800mips/dev/ewskbd.c:1.9 src/sys/arch/ews4800mips/dev/ewskbd.c:1.10
--- src/sys/arch/ews4800mips/dev/ewskbd.c:1.9 Wed May 14 13:29:28 2008
+++ src/sys/arch/ews4800mips/dev/ewskbd.c Sat Oct 13 06:08:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ewskbd.c,v 1.9 2008/05/14 13:29:28 tsutsui Exp $ */
+/* $NetBSD: ewskbd.c,v 1.10 2012/10/13 06:08:30 tsutsui Exp $ */
/*-
* Copyright (c) 2005 Izumi Tsutsui. All rights reserved.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.9 2008/05/14 13:29:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.10 2012/10/13 06:08:30 tsutsui Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -124,7 +124,7 @@ struct ewskbd_devconfig {
#define EWSKBD_KANA 0x04
/* wscons glue */
- struct device *wskbddev;
+ device_t wskbddev;
int enabled;
};
@@ -195,7 +195,7 @@ ewskbd_zsc_match(device_t parent, cfdata
}
static void
-ewskbd_zsc_attach(struct device *parent, struct device *self, void *aux)
+ewskbd_zsc_attach(device_t parent, device_t self, void *aux)
{
struct ewskbd_softc *sc;
struct zsc_softc *zsc;
Index: src/sys/arch/ews4800mips/dev/ewsms.c
diff -u src/sys/arch/ews4800mips/dev/ewsms.c:1.7 src/sys/arch/ews4800mips/dev/ewsms.c:1.8
--- src/sys/arch/ews4800mips/dev/ewsms.c:1.7 Sun May 25 23:37:05 2008
+++ src/sys/arch/ews4800mips/dev/ewsms.c Sat Oct 13 06:08:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ewsms.c,v 1.7 2008/05/25 23:37:05 tsutsui Exp $ */
+/* $NetBSD: ewsms.c,v 1.8 2012/10/13 06:08:30 tsutsui Exp $ */
/*
* Copyright (c) 2004 Steve Rumble
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.7 2008/05/25 23:37:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.8 2012/10/13 06:08:30 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ struct ewsms_softc {
/* wsmouse bits */
int sc_enabled;
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
};
static int ewsms_zsc_match(device_t, cfdata_t, void *);
Index: src/sys/arch/ews4800mips/sbd/if_le_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/if_le_sbdio.c:1.6 src/sys/arch/ews4800mips/sbd/if_le_sbdio.c:1.7
--- src/sys/arch/ews4800mips/sbd/if_le_sbdio.c:1.6 Tue Jan 19 22:06:20 2010
+++ src/sys/arch/ews4800mips/sbd/if_le_sbdio.c Sat Oct 13 06:08:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_sbdio.c,v 1.6 2010/01/19 22:06:20 pooka Exp $ */
+/* $NetBSD: if_le_sbdio.c,v 1.7 2012/10/13 06:08:30 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_sbdio.c,v 1.6 2010/01/19 22:06:20 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_sbdio.c,v 1.7 2012/10/13 06:08:30 tsutsui Exp $");
#include "opt_inet.h"
@@ -73,8 +73,8 @@ struct le_sbdio_softc {
bus_dmamap_t sc_dmamap;
};
-int le_sbdio_match(device_t, struct cfdata *, void *);
-void le_sbdio_attach(device_t, struct device *, void *);
+int le_sbdio_match(device_t, cfdata_t, void *);
+void le_sbdio_attach(device_t, device_t, void *);
static void le_sbdio_wrcsr(struct lance_softc *, uint16_t, uint16_t);
static uint16_t le_sbdio_rdcsr(struct lance_softc *, uint16_t);
Index: src/sys/arch/ews4800mips/sbd/kbms_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.9 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.10
--- src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.9 Mon Apr 28 20:23:18 2008
+++ src/sys/arch/ews4800mips/sbd/kbms_sbdio.c Sat Oct 13 06:08:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kbms_sbdio.c,v 1.9 2008/04/28 20:23:18 martin Exp $ */
+/* $NetBSD: kbms_sbdio.c,v 1.10 2012/10/13 06:08:30 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.9 2008/04/28 20:23:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.10 2012/10/13 06:08:30 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,8 +61,8 @@ struct kbms_reg {
enum { MOUSE_PACKET_LEN = 5 };
struct kbms_softc {
device_t sc_dev;
- struct device *sc_wskbd;
- struct device *sc_wsmouse;
+ device_t sc_wskbd;
+ device_t sc_wsmouse;
struct kbms_reg sc_reg;
int sc_leds;
int sc_flags;
