Module Name: src
Committed By: tsutsui
Date: Mon Jul 20 17:22:29 UTC 2009
Modified Files:
src/sys/arch/pmax/pmax: cpu.c
Log Message:
- use CFATTACH_DECL_NEW()
- include "ioconf.h" for declaration of struct cfdriver.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/pmax/pmax/cpu.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/pmax/pmax/cpu.c
diff -u src/sys/arch/pmax/pmax/cpu.c:1.28 src/sys/arch/pmax/pmax/cpu.c:1.29
--- src/sys/arch/pmax/pmax/cpu.c:1.28 Mon Jul 20 17:05:13 2009
+++ src/sys/arch/pmax/pmax/cpu.c Mon Jul 20 17:22:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.28 2009/07/20 17:05:13 tsutsui Exp $ */
+/* $NetBSD: cpu.c,v 1.29 2009/07/20 17:22:28 tsutsui Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.28 2009/07/20 17:05:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.29 2009/07/20 17:22:28 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -38,15 +38,16 @@
#include <machine/autoconf.h>
-static int cpumatch(struct device *, struct cfdata *, void *);
-static void cpuattach(struct device *, struct device *, void *);
+#include "ioconf.h"
-CFATTACH_DECL(cpu, sizeof (struct device),
+static int cpumatch(device_t, cfdata_t, void *);
+static void cpuattach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(cpu, 0,
cpumatch, cpuattach, NULL, NULL);
-extern struct cfdriver cpu_cd;
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;
@@ -58,9 +59,9 @@
}
static void
-cpuattach(struct device *parent, struct device *dev, void *aux)
+cpuattach(device_t parent, device_t self, void *aux)
{
- printf(": ");
+ aprint_normal(": ");
cpu_identify();
}
