Module Name: src Committed By: tsutsui Date: Sat Oct 13 06:16:19 UTC 2012
Modified Files: src/sys/arch/luna68k/dev: lunaws.c siotty.c src/sys/arch/luna68k/luna68k: autoconf.c Log Message: struct device * -> device_t, use device_xname() (from chs@) To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/luna68k/dev/lunaws.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/luna68k/dev/siotty.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/luna68k/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/luna68k/dev/lunaws.c diff -u src/sys/arch/luna68k/dev/lunaws.c:1.24 src/sys/arch/luna68k/dev/lunaws.c:1.25 --- src/sys/arch/luna68k/dev/lunaws.c:1.24 Mon Jul 16 11:31:13 2012 +++ src/sys/arch/luna68k/dev/lunaws.c Sat Oct 13 06:16:18 2012 @@ -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 @@ struct ws_softc { 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 Index: src/sys/arch/luna68k/dev/siotty.c diff -u src/sys/arch/luna68k/dev/siotty.c:1.33 src/sys/arch/luna68k/dev/siotty.c:1.34 --- src/sys/arch/luna68k/dev/siotty.c:1.33 Sat Nov 26 04:40:50 2011 +++ src/sys/arch/luna68k/dev/siotty.c Sat Oct 13 06:16:18 2012 @@ -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 @@ siotty_match(device_t parent, cfdata_t c } 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); Index: src/sys/arch/luna68k/luna68k/autoconf.c diff -u src/sys/arch/luna68k/luna68k/autoconf.c:1.13 src/sys/arch/luna68k/luna68k/autoconf.c:1.14 --- src/sys/arch/luna68k/luna68k/autoconf.c:1.13 Sun Jul 29 18:05:44 2012 +++ src/sys/arch/luna68k/luna68k/autoconf.c Sat Oct 13 06:16:19 2012 @@ -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 @@ cpu_rootconf(void) #endif printf("boot device: %s\n", - (booted_device) ? booted_device->dv_xname : "<unknown>"); + (booted_device) ? device_xname(booted_device) : "<unknown>"); rootconf(); }