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

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

details:   https://anonhg.NetBSD.org/src/rev/878a72bf83b6
branches:  trunk
changeset: 782017:878a72bf83b6
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Oct 13 06:16:18 2012 +0000

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

diffstat:

 sys/arch/luna68k/dev/lunaws.c       |  8 ++++----
 sys/arch/luna68k/dev/siotty.c       |  6 +++---
 sys/arch/luna68k/luna68k/autoconf.c |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r 6b808acab65e -r 878a72bf83b6 sys/arch/luna68k/dev/lunaws.c
--- a/sys/arch/luna68k/dev/lunaws.c     Sat Oct 13 06:12:23 2012 +0000
+++ b/sys/arch/luna68k/dev/lunaws.c     Sat Oct 13 06:16:18 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.24 2012/07/16 11:31:13 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.25 2012/10/13 06:16:18 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.24 2012/07/16 11:31:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.25 2012/10/13 06:16:18 tsutsui Exp $");
 
 #include "wsmouse.h"
 
@@ -64,9 +64,9 @@
        device_t        sc_dev;
        struct sioreg   *sc_ctl;
        uint8_t         sc_wr[6];
-       struct device   *sc_wskbddev;
+       device_t        sc_wskbddev;
 #if NWSMOUSE > 0
-       struct device   *sc_wsmousedev;
+       device_t        sc_wsmousedev;
        int             sc_msreport;
        int             buttons, dx, dy;
 #endif
diff -r 6b808acab65e -r 878a72bf83b6 sys/arch/luna68k/dev/siotty.c
--- a/sys/arch/luna68k/dev/siotty.c     Sat Oct 13 06:12:23 2012 +0000
+++ b/sys/arch/luna68k/dev/siotty.c     Sat Oct 13 06:16:18 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.33 2011/11/26 04:40:50 tsutsui Exp $ */
+/* $NetBSD: siotty.c,v 1.34 2012/10/13 06:16:18 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.33 2011/11/26 04:40:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.34 2012/10/13 06:16:18 tsutsui Exp $");
 
 #include "opt_ddb.h"
 
@@ -118,7 +118,7 @@
 }
 
 static void 
-siotty_attach(struct device *parent, struct device *self, void *aux)
+siotty_attach(device_t parent, device_t self, void *aux)
 {
        struct sio_softc *scp = device_private(parent);
        struct siotty_softc *sc = device_private(self);
diff -r 6b808acab65e -r 878a72bf83b6 sys/arch/luna68k/luna68k/autoconf.c
--- a/sys/arch/luna68k/luna68k/autoconf.c       Sat Oct 13 06:12:23 2012 +0000
+++ b/sys/arch/luna68k/luna68k/autoconf.c       Sat Oct 13 06:16:18 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:44 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.14 2012/10/13 06:16:19 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2012/07/29 18:05:44 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2012/10/13 06:16:19 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -85,7 +85,7 @@
 
 #endif
        printf("boot device: %s\n",
-               (booted_device) ? booted_device->dv_xname : "<unknown>");
+               (booted_device) ? device_xname(booted_device) : "<unknown>");
 
        rootconf();
 }