| s3_pci.c (119418) | s3_pci.c (127135) |
|---|---|
| 1/*- 2 * Copyright (c) 2000 Alcove - Nicolas Souchu <nsouch@freebsd.org> 3 * All rights reserved. 4 * 5 * Code based on Peter Horton <pdh@colonel-panic.com> patch. 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 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2000 Alcove - Nicolas Souchu <nsouch@freebsd.org> 3 * All rights reserved. 4 * 5 * Code based on Peter Horton <pdh@colonel-panic.com> patch. 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 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> |
| 30__FBSDID("$FreeBSD: head/sys/dev/fb/s3_pci.c 119418 2003-08-24 17:55:58Z obrien $"); | 30__FBSDID("$FreeBSD: head/sys/dev/fb/s3_pci.c 127135 2004-03-17 17:50:55Z njl $"); |
| 31 32/* Enable LFB on S3 cards that has only VESA 1.2 BIOS */ 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/kernel.h> 37#include <machine/bus_pio.h> 38#include <machine/bus_memio.h> --- 454 unchanged lines hidden (view full) --- 493 printf("%s: enhanced port resource allocation failed!\n", 494 __func__); 495 goto error; 496 } 497 sc->enh_st = rman_get_bustag(sc->enh_res); 498 sc->enh_sh = rman_get_bushandle(sc->enh_res); 499 500 rid = PCI_BASE_MEMORY; | 31 32/* Enable LFB on S3 cards that has only VESA 1.2 BIOS */ 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/kernel.h> 37#include <machine/bus_pio.h> 38#include <machine/bus_memio.h> --- 454 unchanged lines hidden (view full) --- 493 printf("%s: enhanced port resource allocation failed!\n", 494 __func__); 495 goto error; 496 } 497 sc->enh_st = rman_get_bustag(sc->enh_res); 498 sc->enh_sh = rman_get_bushandle(sc->enh_res); 499 500 rid = PCI_BASE_MEMORY; |
| 501 if (!(sc->mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 502 0, ~0, 1, RF_ACTIVE))) { | 501 if (!(sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 502 RF_ACTIVE))) { |
| 503 504 printf("%s: mem resource allocation failed!\n", __func__); 505 goto error; 506 } 507 508 /* The memory base address will be our LFB base address 509 */ 510 /* sc->mem_base = (u_long)rman_get_virtual(sc->mem_res); */ --- 58 unchanged lines hidden --- | 503 504 printf("%s: mem resource allocation failed!\n", __func__); 505 goto error; 506 } 507 508 /* The memory base address will be our LFB base address 509 */ 510 /* sc->mem_base = (u_long)rman_get_virtual(sc->mem_res); */ --- 58 unchanged lines hidden --- |