Module Name: src
Committed By: matt
Date: Fri Jun 3 00:16:27 UTC 2011
Modified Files:
src/sys/arch/bebox/bebox: cpu.c mainbus.c
Log Message:
Covert to CFATTACH_DECL_NEW, device_t, cfdata_t
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/bebox/bebox/cpu.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/bebox/bebox/mainbus.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/bebox/bebox/cpu.c
diff -u src/sys/arch/bebox/bebox/cpu.c:1.9 src/sys/arch/bebox/bebox/cpu.c:1.10
--- src/sys/arch/bebox/bebox/cpu.c:1.9 Mon Apr 28 20:23:15 2008
+++ src/sys/arch/bebox/bebox/cpu.c Fri Jun 3 00:16:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.9 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.10 2011/06/03 00:16:27 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.9 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.10 2011/06/03 00:16:27 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,16 +40,16 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-int cpumatch(struct device *, struct cfdata *, void *);
-void cpuattach(struct device *, struct device *, void *);
+int cpumatch(device_t, cfdata_t, void *);
+void cpuattach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
cpumatch, cpuattach, NULL, NULL);
extern struct cfdriver cpu_cd;
int
-cpumatch(struct device *parent, struct cfdata *cfdata, void *aux)
+cpumatch(device_t parent, cfdata_t cfdata, void *aux)
{
struct confargs *ca = aux;
@@ -61,7 +61,7 @@
}
void
-cpuattach(struct device *parent, struct device *self, void *aux)
+cpuattach(device_t parent, device_t self, void *aux)
{
(void) cpu_attach_common(self, 0);
}
Index: src/sys/arch/bebox/bebox/mainbus.c
diff -u src/sys/arch/bebox/bebox/mainbus.c:1.25 src/sys/arch/bebox/bebox/mainbus.c:1.26
--- src/sys/arch/bebox/bebox/mainbus.c:1.25 Tue May 17 17:34:48 2011
+++ src/sys/arch/bebox/bebox/mainbus.c Fri Jun 3 00:16:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $ */
+/* $NetBSD: mainbus.c,v 1.26 2011/06/03 00:16:27 matt Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.26 2011/06/03 00:16:27 matt Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -49,10 +49,10 @@
#include <machine/pci_machdep.h>
#include <machine/isa_machdep.h>
-int mainbus_match(struct device *, struct cfdata *, void *);
-void mainbus_attach(struct device *, struct device *, void *);
+int mainbus_match(device_t, cfdata_t, void *);
+void mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
mainbus_match, mainbus_attach, NULL, NULL);
int mainbus_print (void *, const char *);
@@ -72,7 +72,7 @@
* Probe for the mainbus; always succeeds.
*/
int
-mainbus_match(struct device *parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
{
return 1;
}
@@ -81,7 +81,7 @@
* Attach the mainbus.
*/
void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
{
union mainbus_attach_args mba;
struct confargs ca;
