Module Name: src
Committed By: christos
Date: Fri Jun 3 02:33:27 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c clock.c
Log Message:
more CFATTACH_DECL_NEW fixes
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc64/sparc64/clock.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/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.180 src/sys/arch/sparc64/sparc64/autoconf.c:1.181
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.180 Wed Jun 1 20:35:23 2011
+++ src/sys/arch/sparc64/sparc64/autoconf.c Thu Jun 2 22:33:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.180 2011/06/02 00:35:23 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.180 2011/06/02 00:35:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -712,7 +712,7 @@
(void) config_found(dev, (void *)&ma, mbprint);
}
-CFATTACH_DECL_NEW(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
mainbus_match, mainbus_attach, NULL, NULL);
Index: src/sys/arch/sparc64/sparc64/clock.c
diff -u src/sys/arch/sparc64/sparc64/clock.c:1.103 src/sys/arch/sparc64/sparc64/clock.c:1.104
--- src/sys/arch/sparc64/sparc64/clock.c:1.103 Thu May 12 01:43:06 2011
+++ src/sys/arch/sparc64/sparc64/clock.c Thu Jun 2 22:33:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.103 2011/05/12 05:43:06 mrg Exp $ */
+/* $NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.103 2011/05/12 05:43:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $");
#include "opt_multiprocessor.h"
@@ -123,12 +123,12 @@
static struct intrhand *schedint;
#endif
-static int timermatch(struct device *, struct cfdata *, void *);
-static void timerattach(struct device *, struct device *, void *);
+static int timermatch(device_t, cfdata_t, void *);
+static void timerattach(device_t, device_t, void *);
struct timerreg_4u timerreg_4u; /* XXX - need more cleanup */
-CFATTACH_DECL(timer, sizeof(struct device),
+CFATTACH_DECL_NEW(timer, 0,
timermatch, timerattach, NULL, NULL);
struct chiptime;
@@ -196,7 +196,7 @@
* the lame UltraSPARC IIi PCI machines that don't have them.
*/
static int
-timermatch(struct device *parent, struct cfdata *cf, void *aux)
+timermatch(device_t parent, cfdata_t cf, void *aux)
{
struct mainbus_attach_args *ma = aux;
@@ -204,7 +204,7 @@
}
static void
-timerattach(struct device *parent, struct device *self, void *aux)
+timerattach(device_t parent, device_t self, void *aux)
{
struct mainbus_attach_args *ma = aux;
u_int *va = ma->ma_address;
