Module Name: src
Committed By: tsutsui
Date: Sat Oct 13 06:25:20 UTC 2012
Modified Files:
src/sys/arch/newsmips/apbus: kb_ap.c ms_ap.c
src/sys/arch/newsmips/dev: kb_hb.c ms_hb.c
src/sys/arch/newsmips/newsmips: autoconf.c
Log Message:
struct device * -> device_t, use device_xname() (from chs@)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/newsmips/apbus/kb_ap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/newsmips/apbus/ms_ap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/newsmips/dev/kb_hb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/newsmips/dev/ms_hb.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/newsmips/newsmips/autoconf.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/newsmips/apbus/kb_ap.c
diff -u src/sys/arch/newsmips/apbus/kb_ap.c:1.9 src/sys/arch/newsmips/apbus/kb_ap.c:1.10
--- src/sys/arch/newsmips/apbus/kb_ap.c:1.9 Wed Apr 9 15:40:30 2008
+++ src/sys/arch/newsmips/apbus/kb_ap.c Sat Oct 13 06:25:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kb_ap.c,v 1.9 2008/04/09 15:40:30 tsutsui Exp $ */
+/* $NetBSD: kb_ap.c,v 1.10 2012/10/13 06:25:20 tsutsui Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.9 2008/04/09 15:40:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.10 2012/10/13 06:25:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@ struct kbreg {
struct kb_ap_softc {
device_t sc_dev;
struct kbreg *sc_reg;
- struct device *sc_wskbddev;
+ device_t sc_wskbddev;
};
int kb_ap_match(device_t, cfdata_t, void *);
Index: src/sys/arch/newsmips/apbus/ms_ap.c
diff -u src/sys/arch/newsmips/apbus/ms_ap.c:1.10 src/sys/arch/newsmips/apbus/ms_ap.c:1.11
--- src/sys/arch/newsmips/apbus/ms_ap.c:1.10 Wed Apr 9 15:40:30 2008
+++ src/sys/arch/newsmips/apbus/ms_ap.c Sat Oct 13 06:25:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_ap.c,v 1.10 2008/04/09 15:40:30 tsutsui Exp $ */
+/* $NetBSD: ms_ap.c,v 1.11 2012/10/13 06:25:20 tsutsui Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.10 2008/04/09 15:40:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.11 2012/10/13 06:25:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -50,7 +50,7 @@ struct msreg {
struct ms_ap_softc {
device_t sc_dev;
struct msreg *sc_reg;
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
int sc_ndata;
uint8_t sc_buf[3];
};
Index: src/sys/arch/newsmips/dev/kb_hb.c
diff -u src/sys/arch/newsmips/dev/kb_hb.c:1.12 src/sys/arch/newsmips/dev/kb_hb.c:1.13
--- src/sys/arch/newsmips/dev/kb_hb.c:1.12 Wed Apr 9 15:40:30 2008
+++ src/sys/arch/newsmips/dev/kb_hb.c Sat Oct 13 06:25:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kb_hb.c,v 1.12 2008/04/09 15:40:30 tsutsui Exp $ */
+/* $NetBSD: kb_hb.c,v 1.13 2012/10/13 06:25:20 tsutsui Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.12 2008/04/09 15:40:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_hb.c,v 1.13 2012/10/13 06:25:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -52,7 +52,7 @@ struct kbreg {
struct kb_hb_softc {
device_t sc_dev;
struct kbreg *sc_reg;
- struct device *sc_wskbddev;
+ device_t sc_wskbddev;
};
int kb_hb_match(device_t, cfdata_t, void *);
Index: src/sys/arch/newsmips/dev/ms_hb.c
diff -u src/sys/arch/newsmips/dev/ms_hb.c:1.13 src/sys/arch/newsmips/dev/ms_hb.c:1.14
--- src/sys/arch/newsmips/dev/ms_hb.c:1.13 Wed Apr 9 15:40:30 2008
+++ src/sys/arch/newsmips/dev/ms_hb.c Sat Oct 13 06:25:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_hb.c,v 1.13 2008/04/09 15:40:30 tsutsui Exp $ */
+/* $NetBSD: ms_hb.c,v 1.14 2012/10/13 06:25:20 tsutsui Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.13 2008/04/09 15:40:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_hb.c,v 1.14 2012/10/13 06:25:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -50,7 +50,7 @@ struct msreg {
struct ms_hb_softc {
device_t sc_dev;
struct msreg *sc_reg;
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
int sc_ndata;
uint8_t sc_buf[3];
};
Index: src/sys/arch/newsmips/newsmips/autoconf.c
diff -u src/sys/arch/newsmips/newsmips/autoconf.c:1.36 src/sys/arch/newsmips/newsmips/autoconf.c:1.37
--- src/sys/arch/newsmips/newsmips/autoconf.c:1.36 Sun Jul 29 18:05:45 2012
+++ src/sys/arch/newsmips/newsmips/autoconf.c Sat Oct 13 06:25:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.36 2012/07/29 18:05:45 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.37 2012/10/13 06:25:20 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -49,7 +49,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.36 2012/07/29 18:05:45 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.37 2012/10/13 06:25:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,7 +113,7 @@ cpu_rootconf(void)
findroot();
printf("boot device: %s\n",
- booted_device ? booted_device->dv_xname : "<unknown>");
+ booted_device ? device_xname(booted_device) : "<unknown>");
rootconf();
}
