Fri Jan 22 22:22:48 2016 UTC ()
u_int -> unsigned; also requires stddef.h and stdint.h to be compilable.


(dholland)
diff -r1.6 -r1.7 src/lib/libpci/pci.h
cvs diff -r1.6 -r1.7 src/lib/libpci/pci.h (expand / switch to unified diff)

--- src/lib/libpci/pci.h 2014/09/21 14:32:37 1.6
+++ src/lib/libpci/pci.h 2016/01/22 22:22:48 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pci.h,v 1.6 2014/09/21 14:32:37 christos Exp $ */ 1/* $NetBSD: pci.h,v 1.7 2016/01/22 22:22:48 dholland Exp $ */
2 2
3/* 3/*
4 * Copyright 2001 Wasabi Systems, Inc. 4 * Copyright 2001 Wasabi Systems, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc. 7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -28,35 +28,38 @@ @@ -28,35 +28,38 @@
28 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC 28 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
29 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 29 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE. 35 * POSSIBILITY OF SUCH DAMAGE.
36 */ 36 */
37 37
38#ifndef _PCI_H_ 38#ifndef _PCI_H_
39#define _PCI_H_ 39#define _PCI_H_
40 40
 41#include <stddef.h>
 42#include <stdint.h> /* XXX */
 43
41/* 44/*
42 * Interface to the PCI bus for user programs. 45 * Interface to the PCI bus for user programs.
43 */ 46 */
44 47
45typedef uint32_t pcireg_t; /* XXX */ 48typedef uint32_t pcireg_t; /* XXX */
46 49
47/* pci_bus.c */ 50/* pci_bus.c */
48int pcibus_conf_read(int, u_int, u_int, u_int, u_int, pcireg_t *); 51int pcibus_conf_read(int, unsigned, unsigned, unsigned, unsigned, pcireg_t *);
49int pcibus_conf_write(int, u_int, u_int, u_int, u_int, pcireg_t); 52int pcibus_conf_write(int, unsigned, unsigned, unsigned, unsigned, pcireg_t);
50 53
51/* pci_device.c */ 54/* pci_device.c */
52int pcidev_conf_read(int, u_int, pcireg_t *); 55int pcidev_conf_read(int, unsigned, pcireg_t *);
53int pcidev_conf_write(int, u_int, pcireg_t); 56int pcidev_conf_write(int, unsigned, pcireg_t);
54 57
55/* pci_drvname.c */ 58/* pci_drvname.c */
56int pci_drvname(int, u_int, u_int, char *, size_t); 59int pci_drvname(int, unsigned, unsigned, char *, size_t);
57 60
58/* pci_subr.c */ 61/* pci_subr.c */
59void pci_devinfo(pcireg_t, pcireg_t, int, char *, size_t); 62void pci_devinfo(pcireg_t, pcireg_t, int, char *, size_t);
60void pci_conf_print(int, u_int, u_int, u_int); 63void pci_conf_print(int, unsigned, unsigned, unsigned);
61 64
62#endif /* _PCI_H_ */ 65#endif /* _PCI_H_ */