Module Name: src
Committed By: matt
Date: Tue Jun 14 06:47:53 UTC 2011
Modified Files:
src/sys/arch/alpha/include: eisa_machdep.h isa_machdep.h pci_machdep.h
Log Message:
struct device * -> device_t
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/eisa_machdep.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/include/isa_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/include/pci_machdep.h
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/alpha/include/eisa_machdep.h
diff -u src/sys/arch/alpha/include/eisa_machdep.h:1.9 src/sys/arch/alpha/include/eisa_machdep.h:1.10
--- src/sys/arch/alpha/include/eisa_machdep.h:1.9 Wed Oct 17 19:52:58 2007
+++ src/sys/arch/alpha/include/eisa_machdep.h Tue Jun 14 06:47:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.h,v 1.9 2007/10/17 19:52:58 garbled Exp $ */
+/* $NetBSD: eisa_machdep.h,v 1.10 2011/06/14 06:47:52 matt Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -36,7 +36,7 @@
struct alpha_eisa_chipset {
void *ec_v;
- void (*ec_attach_hook)(struct device *, struct device *,
+ void (*ec_attach_hook)(device_t, device_t,
struct eisabus_attach_args *);
int (*ec_maxslots)(void *);
int (*ec_intr_map)(void *, u_int, eisa_intr_handle_t *);
Index: src/sys/arch/alpha/include/isa_machdep.h
diff -u src/sys/arch/alpha/include/isa_machdep.h:1.12 src/sys/arch/alpha/include/isa_machdep.h:1.13
--- src/sys/arch/alpha/include/isa_machdep.h:1.12 Wed Aug 19 15:09:56 2009
+++ src/sys/arch/alpha/include/isa_machdep.h Tue Jun 14 06:47:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.12 2009/08/19 15:09:56 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.13 2011/06/14 06:47:52 matt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
struct isa_dma_state ic_dmastate;
- void (*ic_attach_hook)(struct device *, struct device *,
+ void (*ic_attach_hook)(device_t, device_t,
struct isabus_attach_args *);
const struct evcnt *(*ic_intr_evcnt)(void *, int);
void *(*ic_intr_establish)(void *, int, int, int,
Index: src/sys/arch/alpha/include/pci_machdep.h
diff -u src/sys/arch/alpha/include/pci_machdep.h:1.13 src/sys/arch/alpha/include/pci_machdep.h:1.14
--- src/sys/arch/alpha/include/pci_machdep.h:1.13 Mon Apr 4 20:37:44 2011
+++ src/sys/arch/alpha/include/pci_machdep.h Tue Jun 14 06:47:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.13 2011/04/04 20:37:44 dyoung Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.14 2011/06/14 06:47:53 matt Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -50,8 +50,8 @@
*/
struct alpha_pci_chipset {
void *pc_conf_v;
- void (*pc_attach_hook)(struct device *,
- struct device *, struct pcibus_attach_args *);
+ void (*pc_attach_hook)(device_t, device_t,
+ struct pcibus_attach_args *);
int (*pc_bus_maxdevs)(void *, int);
pcitag_t (*pc_make_tag)(void *, int, int, int);
void (*pc_decompose_tag)(void *, pcitag_t, int *,
@@ -68,9 +68,9 @@
int, int (*)(void *), void *);
void (*pc_intr_disestablish)(void *, void *);
- void *(*pc_pciide_compat_intr_establish)(void *,
- struct device *, const struct pci_attach_args *,
- int, int (*)(void *), void *);
+ void *(*pc_pciide_compat_intr_establish)(void *, device_t,
+ const struct pci_attach_args *, int,
+ int (*)(void *), void *);
};
/*
