[src/trunk]: src/sys/arch/newsmips struct device * -> device_t, use device_xn...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a90cd611e34a
branches:  trunk
changeset: 782020:a90cd611e34a
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Oct 13 06:25:20 2012 +0000

description:
struct device * -> device_t, use device_xname()  (from chs@)

diffstat:

 sys/arch/newsmips/apbus/kb_ap.c       |  6 +++---
 sys/arch/newsmips/apbus/ms_ap.c       |  6 +++---
 sys/arch/newsmips/dev/kb_hb.c         |  6 +++---
 sys/arch/newsmips/dev/ms_hb.c         |  6 +++---
 sys/arch/newsmips/newsmips/autoconf.c |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diffs (135 lines):

diff -r 636f5afe3986 -r a90cd611e34a sys/arch/newsmips/apbus/kb_ap.c
--- a/sys/arch/newsmips/apbus/kb_ap.c   Sat Oct 13 06:24:15 2012 +0000
+++ b/sys/arch/newsmips/apbus/kb_ap.c   Sat Oct 13 06:25:20 2012 +0000
@@ -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 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 *);
diff -r 636f5afe3986 -r a90cd611e34a sys/arch/newsmips/apbus/ms_ap.c
--- a/sys/arch/newsmips/apbus/ms_ap.c   Sat Oct 13 06:24:15 2012 +0000
+++ b/sys/arch/newsmips/apbus/ms_ap.c   Sat Oct 13 06:25:20 2012 +0000
@@ -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 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];
 };
diff -r 636f5afe3986 -r a90cd611e34a sys/arch/newsmips/dev/kb_hb.c
--- a/sys/arch/newsmips/dev/kb_hb.c     Sat Oct 13 06:24:15 2012 +0000
+++ b/sys/arch/newsmips/dev/kb_hb.c     Sat Oct 13 06:25:20 2012 +0000
@@ -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 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 *);
diff -r 636f5afe3986 -r a90cd611e34a sys/arch/newsmips/dev/ms_hb.c
--- a/sys/arch/newsmips/dev/ms_hb.c     Sat Oct 13 06:24:15 2012 +0000
+++ b/sys/arch/newsmips/dev/ms_hb.c     Sat Oct 13 06:25:20 2012 +0000
@@ -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 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];
 };
diff -r 636f5afe3986 -r a90cd611e34a sys/arch/newsmips/newsmips/autoconf.c
--- a/sys/arch/newsmips/newsmips/autoconf.c     Sat Oct 13 06:24:15 2012 +0000
+++ b/sys/arch/newsmips/newsmips/autoconf.c     Sat Oct 13 06:25:20 2012 +0000
@@ -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 @@
        findroot();
 
        printf("boot device: %s\n",
-              booted_device ? booted_device->dv_xname : "<unknown>");
+              booted_device ? device_xname(booted_device) : "<unknown>");
 
        rootconf();
 }