Deleted Added
full compact
vt_vga.c (278276) vt_vga.c (279488)
1/*-
2 * Copyright (c) 2005 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Copyright (c) 2009 The FreeBSD Foundation
6 * All rights reserved.
7 *
8 * Portions of this software were developed by Ed Schouten

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

26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Copyright (c) 2009 The FreeBSD Foundation
6 * All rights reserved.
7 *
8 * Portions of this software were developed by Ed Schouten

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

26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/vt/hw/vga/vt_vga.c 278276 2015-02-05 19:36:29Z rpaulo $");
34__FBSDID("$FreeBSD: head/sys/dev/vt/hw/vga/vt_vga.c 279488 2015-03-01 12:54:22Z dumbbell $");
35
36#include <sys/param.h>
37#include <sys/kernel.h>
38#include <sys/systm.h>
39#include <sys/bus.h>
40#include <sys/module.h>
41#include <sys/rman.h>
42
43#include <dev/vt/vt.h>
44#include <dev/vt/hw/vga/vt_vga_reg.h>
35
36#include <sys/param.h>
37#include <sys/kernel.h>
38#include <sys/systm.h>
39#include <sys/bus.h>
40#include <sys/module.h>
41#include <sys/rman.h>
42
43#include <dev/vt/vt.h>
44#include <dev/vt/hw/vga/vt_vga_reg.h>
45#include <dev/pci/pcivar.h>
45
46#include <machine/bus.h>
47
48#if defined(__amd64__) || defined(__i386__)
49#include <vm/vm.h>
50#include <vm/pmap.h>
51#include <machine/pmap.h>
52#include <machine/vmparam.h>

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

1208 struct vga_softc *sc;
1209 int textmode;
1210
1211 if (vd->vd_softc == NULL)
1212 vd->vd_softc = (void *)&vga_conssoftc;
1213 sc = vd->vd_softc;
1214 textmode = 0;
1215
46
47#include <machine/bus.h>
48
49#if defined(__amd64__) || defined(__i386__)
50#include <vm/vm.h>
51#include <vm/pmap.h>
52#include <machine/pmap.h>
53#include <machine/vmparam.h>

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

1209 struct vga_softc *sc;
1210 int textmode;
1211
1212 if (vd->vd_softc == NULL)
1213 vd->vd_softc = (void *)&vga_conssoftc;
1214 sc = vd->vd_softc;
1215 textmode = 0;
1216
1217 if (vd->vd_flags & VDF_DOWNGRADE && vd->vd_video_dev != NULL)
1218 vga_pci_repost(vd->vd_video_dev);
1219
1216#if defined(__amd64__) || defined(__i386__)
1217 sc->vga_fb_tag = X86_BUS_SPACE_MEM;
1218 sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE;
1219 sc->vga_reg_tag = X86_BUS_SPACE_IO;
1220 sc->vga_reg_handle = VGA_REG_BASE;
1221#else
1222# error "Architecture not yet supported!"
1223#endif

--- 76 unchanged lines hidden ---
1220#if defined(__amd64__) || defined(__i386__)
1221 sc->vga_fb_tag = X86_BUS_SPACE_MEM;
1222 sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE;
1223 sc->vga_reg_tag = X86_BUS_SPACE_IO;
1224 sc->vga_reg_handle = VGA_REG_BASE;
1225#else
1226# error "Architecture not yet supported!"
1227#endif

--- 76 unchanged lines hidden ---