Mon Mar 17 09:20:23 2008 UTC ()
Enclose "#ifndef _ARM_PCI_MACHIDEP_H_".


(kiyohara)
diff -r1.4 -r1.5 src/sys/arch/arm/include/pci_machdep.h
cvs diff -r1.4 -r1.5 src/sys/arch/arm/include/pci_machdep.h (expand / switch to unified diff)

--- src/sys/arch/arm/include/pci_machdep.h 2005/12/11 12:16:47 1.4
+++ src/sys/arch/arm/include/pci_machdep.h 2008/03/17 09:20:23 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pci_machdep.h,v 1.4 2005/12/11 12:16:47 christos Exp $ */ 1/* $NetBSD: pci_machdep.h,v 1.5 2008/03/17 09:20:23 kiyohara Exp $ */
2 2
3/* 3/*
4 * Modified for arm32 by Mark Brinicombe 4 * Modified for arm32 by Mark Brinicombe
5 * 5 *
6 * from: sys/arch/alpha/pci/pci_machdep.h 6 * from: sys/arch/alpha/pci/pci_machdep.h
7 * 7 *
8 * Copyright (c) 1996 Carnegie-Mellon University. 8 * Copyright (c) 1996 Carnegie-Mellon University.
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Author: Chris G. Demetriou 11 * Author: Chris G. Demetriou
12 * 12 *
13 * Permission to use, copy, modify and distribute this software and 13 * Permission to use, copy, modify and distribute this software and
14 * its documentation is hereby granted, provided that both the copyright 14 * its documentation is hereby granted, provided that both the copyright
@@ -21,26 +21,28 @@ @@ -21,26 +21,28 @@
21 * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. 21 * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
22 * 22 *
23 * Carnegie Mellon requests users of this software to return to 23 * Carnegie Mellon requests users of this software to return to
24 * 24 *
25 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU 25 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
26 * School of Computer Science 26 * School of Computer Science
27 * Carnegie Mellon University 27 * Carnegie Mellon University
28 * Pittsburgh PA 15213-3890 28 * Pittsburgh PA 15213-3890
29 * 29 *
30 * any improvements or extensions that they make and grant Carnegie the 30 * any improvements or extensions that they make and grant Carnegie the
31 * rights to redistribute these changes. 31 * rights to redistribute these changes.
32 */ 32 */
33 33
 34#ifndef _ARM_PCI_MACHDEP_H_
 35#define _ARM_PCI_MACHDEP_H_
34/* 36/*
35 * Machine-specific definitions for PCI autoconfiguration. 37 * Machine-specific definitions for PCI autoconfiguration.
36 */ 38 */
37 39
38/* 40/*
39 * Types provided to machine-independent PCI code 41 * Types provided to machine-independent PCI code
40 */ 42 */
41typedef struct arm32_pci_chipset *pci_chipset_tag_t; 43typedef struct arm32_pci_chipset *pci_chipset_tag_t;
42typedef u_long pcitag_t; 44typedef u_long pcitag_t;
43typedef u_long pci_intr_handle_t; 45typedef u_long pci_intr_handle_t;
44 46
45/* 47/*
46 * Forward declarations. 48 * Forward declarations.
@@ -87,13 +89,15 @@ struct arm32_pci_chipset { @@ -87,13 +89,15 @@ struct arm32_pci_chipset {
87 (*(c)->pc_conf_read)((c)->pc_conf_v, (t), (r)) 89 (*(c)->pc_conf_read)((c)->pc_conf_v, (t), (r))
88#define pci_conf_write(c, t, r, v) \ 90#define pci_conf_write(c, t, r, v) \
89 (*(c)->pc_conf_write)((c)->pc_conf_v, (t), (r), (v)) 91 (*(c)->pc_conf_write)((c)->pc_conf_v, (t), (r), (v))
90#define pci_intr_map(pa, ihp) \ 92#define pci_intr_map(pa, ihp) \
91 (*(pa)->pa_pc->pc_intr_map)((pa), (ihp)) 93 (*(pa)->pa_pc->pc_intr_map)((pa), (ihp))
92#define pci_intr_string(c, ih) \ 94#define pci_intr_string(c, ih) \
93 (*(c)->pc_intr_string)((c)->pc_intr_v, (ih)) 95 (*(c)->pc_intr_string)((c)->pc_intr_v, (ih))
94#define pci_intr_evcnt(c, ih) \ 96#define pci_intr_evcnt(c, ih) \
95 (*(c)->pc_intr_evcnt)((c)->pc_intr_v, (ih)) 97 (*(c)->pc_intr_evcnt)((c)->pc_intr_v, (ih))
96#define pci_intr_establish(c, ih, l, h, a) \ 98#define pci_intr_establish(c, ih, l, h, a) \
97 (*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a)) 99 (*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a))
98#define pci_intr_disestablish(c, iv) \ 100#define pci_intr_disestablish(c, iv) \
99 (*(c)->pc_intr_disestablish)((c)->pc_intr_v, (iv)) 101 (*(c)->pc_intr_disestablish)((c)->pc_intr_v, (iv))
 102
 103#endif /* _ARM_PCI_MACHDEP_H_ */