Deleted Added
full compact
puc_pci.c (121939) puc_pci.c (123019)
1/* $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ */
2
3/*-
4 * Copyright (c) 2002 JF Hay. All rights reserved.
5 * Copyright (c) 2000 M. Warner Losh. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/* $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ */
2
3/*-
4 * Copyright (c) 2002 JF Hay. All rights reserved.
5 * Copyright (c) 2000 M. Warner Losh. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/puc/puc_pci.c 121939 2003-11-03 09:22:18Z dfr $");
30__FBSDID("$FreeBSD: head/sys/dev/puc/puc_pci.c 123019 2003-11-28 05:28:29Z imp $");
31
32/*
33 * Copyright (c) 1996, 1998, 1999
34 * Christopher G. Demetriou. All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions
38 * are met:

--- 17 unchanged lines hidden (view full) ---

56 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
57 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
58 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
59 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
60 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
61 */
62
63#include <sys/cdefs.h>
31
32/*
33 * Copyright (c) 1996, 1998, 1999
34 * Christopher G. Demetriou. All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions
38 * are met:

--- 17 unchanged lines hidden (view full) ---

56 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
57 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
58 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
59 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
60 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
61 */
62
63#include <sys/cdefs.h>
64__FBSDID("$FreeBSD: head/sys/dev/puc/puc_pci.c 121939 2003-11-03 09:22:18Z dfr $");
64__FBSDID("$FreeBSD: head/sys/dev/puc/puc_pci.c 123019 2003-11-28 05:28:29Z imp $");
65
66#include "opt_puc.h"
67
68#include <sys/param.h>
69#include <sys/systm.h>
70#include <sys/kernel.h>
71#include <sys/bus.h>
72#include <sys/conf.h>

--- 86 unchanged lines hidden (view full) ---

159
160static driver_t puc_pci_driver = {
161 "puc",
162 puc_pci_methods,
163 sizeof(struct puc_softc),
164};
165
166DRIVER_MODULE(puc, pci, puc_pci_driver, puc_devclass, 0, 0);
65
66#include "opt_puc.h"
67
68#include <sys/param.h>
69#include <sys/systm.h>
70#include <sys/kernel.h>
71#include <sys/bus.h>
72#include <sys/conf.h>

--- 86 unchanged lines hidden (view full) ---

159
160static driver_t puc_pci_driver = {
161 "puc",
162 puc_pci_methods,
163 sizeof(struct puc_softc),
164};
165
166DRIVER_MODULE(puc, pci, puc_pci_driver, puc_devclass, 0, 0);
167DRIVER_MODULE(puc, cardbus, puc_pci_driver, puc_devclass, 0, 0);
167
168
169#define rdspio(indx) (bus_space_write_1(bst, bsh, efir, indx), \
170 bus_space_read_1(bst, bsh, efdr))
171#define wrspio(indx,data) (bus_space_write_1(bst, bsh, efir, indx), \
172 bus_space_write_1(bst, bsh, efdr, data))
173
174#ifdef PUC_DEBUG

--- 118 unchanged lines hidden ---
168
169
170#define rdspio(indx) (bus_space_write_1(bst, bsh, efir, indx), \
171 bus_space_read_1(bst, bsh, efdr))
172#define wrspio(indx,data) (bus_space_write_1(bst, bsh, efir, indx), \
173 bus_space_write_1(bst, bsh, efdr, data))
174
175#ifdef PUC_DEBUG

--- 118 unchanged lines hidden ---