[src/trunk]: src/sys/arch/playstation2/playstation2 Adapt to new attach world...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c3922607c832
branches:  trunk
changeset: 330306:c3922607c832
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jul 04 08:33:08 2014 +0000

description:
Adapt to new attach world order

diffstat:

 sys/arch/playstation2/playstation2/cpu.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (54 lines):

diff -r 5988d23c9f64 -r c3922607c832 sys/arch/playstation2/playstation2/cpu.c
--- a/sys/arch/playstation2/playstation2/cpu.c  Fri Jul 04 08:09:47 2014 +0000
+++ b/sys/arch/playstation2/playstation2/cpu.c  Fri Jul 04 08:33:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.8 2014/03/31 11:25:49 martin Exp $   */
+/*     $NetBSD: cpu.c,v 1.9 2014/07/04 08:33:08 martin Exp $   */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,24 +26,24 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.8 2014/03/31 11:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.9 2014/07/04 08:33:08 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/device.h>
 
 #include <machine/autoconf.h>
 
-static int cpumatch(struct device *, struct cfdata *, void *);
-static void cpuattach(struct device *, struct device *, void *);
+static int cpumatch(device_t, cfdata_t, void *);
+static void cpuattach(device_t, device_t, void *);
 
-CFATTACH_DECL(cpu, sizeof (struct device),
-    cpumatch, cpuattach, NULL, NULL);
+CFATTACH_DECL_NEW(cpu, 0, cpumatch, cpuattach, NULL, NULL);
 
 extern struct cfdriver cpu_cd;
 static int __attached; /* PlayStation 2 has only one CPU */
 
 static int
-cpumatch(struct device *parent, struct cfdata *cf, void *aux)
+cpumatch(device_t parent, cfdata_t cf, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
 
@@ -55,11 +55,11 @@
 }
 
 static void
-cpuattach(struct device *parent, struct device *dev, void *aux)
+cpuattach(struct device *parent, struct device *self, void *aux)
 {
 
        printf(": ");
        __attached = 1;
 
-       cpu_identify();
+       cpu_identify(self);
 }