Module Name: src
Committed By: cegger
Date: Mon May 4 12:19:30 UTC 2009
Modified Files:
src/sys/arch/i386/include: mca_machdep.h
src/sys/arch/i386/mca: mca_machdep.c
Log Message:
struct device * -> device_t
No functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/include/mca_machdep.h
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/mca/mca_machdep.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/i386/include/mca_machdep.h
diff -u src/sys/arch/i386/include/mca_machdep.h:1.12 src/sys/arch/i386/include/mca_machdep.h:1.13
--- src/sys/arch/i386/include/mca_machdep.h:1.12 Wed Apr 11 18:33:52 2007
+++ src/sys/arch/i386/include/mca_machdep.h Mon May 4 12:19:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.h,v 1.12 2007/04/11 18:33:52 garbled Exp $ */
+/* $NetBSD: mca_machdep.h,v 1.13 2009/05/04 12:19:29 cegger Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,6 +30,7 @@
#ifndef _I386_MCA_MACHDEP_H_
#define _I386_MCA_MACHDEP_H_
+#include <sys/device.h> /* for device_t */
#include <machine/bus.h>
/*
@@ -58,7 +59,7 @@
*/
struct mcabus_attach_args;
-void mca_attach_hook(struct device *, struct device *,
+void mca_attach_hook(device_t, device_t,
struct mcabus_attach_args *);
int mca_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_dmamap_t *, int);
void mca_dma_set_ioport(int dma, uint16_t port);
Index: src/sys/arch/i386/mca/mca_machdep.c
diff -u src/sys/arch/i386/mca/mca_machdep.c:1.37 src/sys/arch/i386/mca/mca_machdep.c:1.38
--- src/sys/arch/i386/mca/mca_machdep.c:1.37 Tue Dec 16 22:35:23 2008
+++ src/sys/arch/i386/mca/mca_machdep.c Mon May 4 12:19:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.c,v 1.37 2008/12/16 22:35:23 christos Exp $ */
+/* $NetBSD: mca_machdep.c,v 1.38 2009/05/04 12:19:30 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.37 2008/12/16 22:35:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.38 2009/05/04 12:19:30 cegger Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -157,7 +157,7 @@
* Map the MCA DMA controller registers.
*/
void
-mca_attach_hook(struct device *parent, struct device *self,
+mca_attach_hook(device_t parent, device_t self,
struct mcabus_attach_args *mba)
{
dmaiot = mba->mba_iot;
