Deleted Added
full compact
vga_pci.c (294883) vga_pci.c (296336)
1/*-
2 * Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/pci/vga_pci.c 294883 2016-01-27 02:23:54Z jhibbits $");
28__FBSDID("$FreeBSD: head/sys/dev/pci/vga_pci.c 296336 2016-03-03 05:07:35Z jhibbits $");
29
30/*
31 * Simple driver for PCI VGA display devices. Drivers such as agp(4) and
32 * drm(4) should attach as children of this device.
33 *
34 * XXX: The vgapci name is a hack until we somehow merge the isa vga driver
35 * in or rename it.
36 */

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

159 */
160
161 *size = VGA_PCI_BIOS_SHADOW_SIZE;
162 return (pmap_mapbios(VGA_PCI_BIOS_SHADOW_ADDR, *size));
163 }
164#endif
165
166 rid = PCIR_BIOS;
29
30/*
31 * Simple driver for PCI VGA display devices. Drivers such as agp(4) and
32 * drm(4) should attach as children of this device.
33 *
34 * XXX: The vgapci name is a hack until we somehow merge the isa vga driver
35 * in or rename it.
36 */

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

159 */
160
161 *size = VGA_PCI_BIOS_SHADOW_SIZE;
162 return (pmap_mapbios(VGA_PCI_BIOS_SHADOW_ADDR, *size));
163 }
164#endif
165
166 rid = PCIR_BIOS;
167 res = vga_pci_alloc_resource(dev, NULL, SYS_RES_MEMORY, &rid, 0ul,
168 ~0ul, 1, RF_ACTIVE);
167 res = vga_pci_alloc_resource(dev, NULL, SYS_RES_MEMORY, &rid, 0,
168 ~0, 1, RF_ACTIVE);
169 if (res == NULL) {
170 return (NULL);
171 }
172
173 *size = rman_get_size(res);
174 return (rman_get_virtual(res));
175}
176

--- 468 unchanged lines hidden ---
169 if (res == NULL) {
170 return (NULL);
171 }
172
173 *size = rman_get_size(res);
174 return (rman_get_virtual(res));
175}
176

--- 468 unchanged lines hidden ---