Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64/sparc64 more CFATTACH_DECL_NEW fixes



details:   https://anonhg.NetBSD.org/src/rev/033c8ac30dd3
branches:  trunk
changeset: 765689:033c8ac30dd3
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jun 03 02:33:27 2011 +0000

description:
more CFATTACH_DECL_NEW fixes

diffstat:

 sys/arch/sparc64/sparc64/autoconf.c |   6 +++---
 sys/arch/sparc64/sparc64/clock.c    |  14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (79 lines):

diff -r 73eea71ec5da -r 033c8ac30dd3 sys/arch/sparc64/sparc64/autoconf.c
--- a/sys/arch/sparc64/sparc64/autoconf.c       Fri Jun 03 00:52:22 2011 +0000
+++ b/sys/arch/sparc64/sparc64/autoconf.c       Fri Jun 03 02:33:27 2011 +0000
@@ -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);
 
 
diff -r 73eea71ec5da -r 033c8ac30dd3 sys/arch/sparc64/sparc64/clock.c
--- a/sys/arch/sparc64/sparc64/clock.c  Fri Jun 03 00:52:22 2011 +0000
+++ b/sys/arch/sparc64/sparc64/clock.c  Fri Jun 03 02:33:27 2011 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index