Module Name: src
Committed By: kiyohara
Date: Mon Jul 20 06:12:41 UTC 2009
Modified Files:
src/sys/arch/ia64/ia64: cpu.c mainbus.c
Log Message:
s/struct device/device_t/.
s/struct cfdata/cfdata_t/.
Remove unused <sys/bus.h>
The macro CFATTACH_DECL_NEW() was call with size 0 temporarily.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/ia64/cpu.c \
src/sys/arch/ia64/ia64/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/ia64/ia64/cpu.c
diff -u src/sys/arch/ia64/ia64/cpu.c:1.5 src/sys/arch/ia64/ia64/cpu.c:1.6
--- src/sys/arch/ia64/ia64/cpu.c:1.5 Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/ia64/cpu.c Mon Jul 20 06:12:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.5 2009/07/20 04:41:37 kiyohara Exp $ */
+/* $NetBSD: cpu.c,v 1.6 2009/07/20 06:12:41 kiyohara Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.5 2009/07/20 04:41:37 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.6 2009/07/20 06:12:41 kiyohara Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -41,26 +41,26 @@
struct cpu_info cpu_info_primary;
-int cpu_match(struct device *, struct cfdata *, void *);
-void cpu_attach(struct device *, struct device *, void *);
+int cpu_match(device_t, cfdata_t, void *);
+void cpu_attach(device_t, device_t, void *);
struct cpu_softc {
- struct device sc_dev; /* device tree glue */
+ device_t sc_dev; /* device tree glue */
struct cpu_info *sc_info; /* pointer to CPU info */
};
-CFATTACH_DECL(cpu, sizeof(struct cpu_softc),
+CFATTACH_DECL_NEW(cpu, sizeof(struct cpu_softc),
cpu_match, cpu_attach, NULL, NULL);
int
-cpu_match(struct device *parent, struct cfdata *match, void *aux)
+cpu_match(device_t parent, cfdata_t match, void *aux)
{
return 1;
}
void
-cpu_attach(struct device *parent, struct device *self, void *aux)
+cpu_attach(device_t parent, device_t self, void *aux)
{
#if 0 /* not yet */
Index: src/sys/arch/ia64/ia64/mainbus.c
diff -u src/sys/arch/ia64/ia64/mainbus.c:1.5 src/sys/arch/ia64/ia64/mainbus.c:1.6
--- src/sys/arch/ia64/ia64/mainbus.c:1.5 Mon Jul 20 05:10:49 2009
+++ src/sys/arch/ia64/ia64/mainbus.c Mon Jul 20 06:12:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2009/07/20 05:10:49 kiyohara Exp $ */
+/* $NetBSD: mainbus.c,v 1.6 2009/07/20 06:12:41 kiyohara Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2009/07/20 05:10:49 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2009/07/20 06:12:41 kiyohara Exp $");
#include "acpi.h"
@@ -37,15 +37,14 @@
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
-
#include <dev/acpi/acpivar.h>
-static int mainbus_match(struct device *, struct cfdata *, void *);
-static void mainbus_attach(struct device *, struct device *, void *);
+static int mainbus_match(device_t, cfdata_t, void *);
+static void mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL_NEW(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus,
+ /*sizeof(struct device): XXXXX It doesn't use it now*/ 0,
mainbus_match, mainbus_attach, NULL, NULL);
@@ -53,7 +52,7 @@
* Probe for the mainbus; always succeeds.
*/
static int
-mainbus_match(device_t parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
{
return 1;
