Module Name: src
Committed By: matt
Date: Sun Jun 5 17:09:18 UTC 2011
Modified Files:
src/sys/arch/atari/atari: autoconf.c
src/sys/arch/atari/dev: grf.c
Log Message:
A few missed device_t, cfdata_t cleanups
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/atari/atari/autoconf.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/atari/dev/grf.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/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.60 src/sys/arch/atari/atari/autoconf.c:1.61
--- src/sys/arch/atari/atari/autoconf.c:1.60 Sun Jun 5 06:31:41 2011
+++ src/sys/arch/atari/atari/autoconf.c Sun Jun 5 17:09:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.60 2011/06/05 06:31:41 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.61 2011/06/05 17:09:18 matt Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.60 2011/06/05 06:31:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.61 2011/06/05 17:09:18 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,7 @@
void
config_console(void)
{
- struct cfdata *cf;
+ cfdata_t cf;
config_init();
@@ -187,7 +187,7 @@
{
struct disk *dkp;
struct partition *pp;
- struct device **devs;
+ device_t *devs;
const struct bdevsw *bdev;
int i, maj, unit;
@@ -203,7 +203,7 @@
* Find the disk structure corresponding to the
* current device.
*/
- devs = (struct device **)genericconf[i]->cd_devs;
+ devs = (device_t *)genericconf[i]->cd_devs;
if ((dkp = disk_find(devs[unit]->dv_xname)) == NULL)
continue;
Index: src/sys/arch/atari/dev/grf.c
diff -u src/sys/arch/atari/dev/grf.c:1.45 src/sys/arch/atari/dev/grf.c:1.46
--- src/sys/arch/atari/dev/grf.c:1.45 Sun Jun 5 06:31:41 2011
+++ src/sys/arch/atari/dev/grf.c Sun Jun 5 17:09:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.45 2011/06/05 06:31:41 tsutsui Exp $ */
+/* $NetBSD: grf.c,v 1.46 2011/06/05 17:09:18 matt Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.45 2011/06/05 06:31:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.46 2011/06/05 17:09:18 matt Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -115,7 +115,7 @@
/*
* only used in console init.
*/
-static struct cfdata *cfdata_gbus = NULL;
+static cfdata_t cfdata_gbus = NULL;
int
grfbusmatch(device_t parent, cfdata_t cf, void *aux)