Deleted Added
full compact
isa_pci.c (119418) isa_pci.c (127135)
1/*-
2 * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
4 * Copyright (c) 2000 BSDi
5 * 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

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

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
3 * Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
4 * Copyright (c) 2000 BSDi
5 * 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

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

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/dev/pci/isa_pci.c 119418 2003-08-24 17:55:58Z obrien $");
32__FBSDID("$FreeBSD: head/sys/dev/pci/isa_pci.c 127135 2004-03-17 17:50:55Z njl $");
33
34/*
35 * PCI:ISA bridge support
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/kernel.h>

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

170 switch (pci_get_devid(dev)) {
171 case 0x71108086: /* Intel 82371AB */
172 /*
173 * Sometimes the ELCR (Edge/Level Control Register) is not restored
174 * correctly on resume by the BIOS, so we handle it ourselves.
175 */
176 rid = 0;
177 bus_set_resource(dev, SYS_RES_IOPORT, rid, ELCR_IOADDR, ELCR_IOLEN);
33
34/*
35 * PCI:ISA bridge support
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/kernel.h>

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

170 switch (pci_get_devid(dev)) {
171 case 0x71108086: /* Intel 82371AB */
172 /*
173 * Sometimes the ELCR (Edge/Level Control Register) is not restored
174 * correctly on resume by the BIOS, so we handle it ourselves.
175 */
176 rid = 0;
177 bus_set_resource(dev, SYS_RES_IOPORT, rid, ELCR_IOADDR, ELCR_IOLEN);
178 sc->elcr_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1,
178 sc->elcr_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
179 RF_ACTIVE);
180 if (sc->elcr_res == NULL)
181 device_printf(dev, "failed to allocate ELCR resource\n");
182 break;
183 }
184
185 return(0);
186}

--- 49 unchanged lines hidden ---
179 RF_ACTIVE);
180 if (sc->elcr_res == NULL)
181 device_printf(dev, "failed to allocate ELCR resource\n");
182 break;
183 }
184
185 return(0);
186}

--- 49 unchanged lines hidden ---