Attachment 159832 Details for Bug 202276 – Proposed fix

[patch] Proposed fix

vga.diff (text/plain), 1.61 KB, created by Marcel Moolenaar on 2015-08-13 03:17:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel Moolenaar

Created: 2015-08-13 03:17:24 UTC

Size: 1.61 KB

patch

obsolete

>Index: sys/dev/vt/hw/vga/vt_vga.c
>===================================================================
>--- sys/dev/vt/hw/vga/vt_vga.c	(revision 286716)
>+++ sys/dev/vt/hw/vga/vt_vga.c	(working copy)
>@@ -883,9 +883,9 @@
> 			/* Convert colors to VGA attributes. */
> 			attr = bg << 4 | fg;
> 
>-			MEM_WRITE1(sc, 0x18000 + (row * 80 + col) * 2 + 0,
>+			MEM_WRITE1(sc, (row * 80 + col) * 2 + 0,
> 			    ch);
>-			MEM_WRITE1(sc, 0x18000 + (row * 80 + col) * 2 + 1,
>+			MEM_WRITE1(sc, (row * 80 + col) * 2 + 1,
> 			    attr);
> 		}
> 	}
>@@ -1226,8 +1226,6 @@
> # error "Architecture not yet supported!"
> #endif
> 
>-	bus_space_map(sc->vga_fb_tag, VGA_MEM_BASE, VGA_MEM_SIZE, 0,
>-	    &sc->vga_fb_handle);
> 	bus_space_map(sc->vga_reg_tag, VGA_REG_BASE, VGA_REG_SIZE, 0,
> 	    &sc->vga_reg_handle);
> 
>@@ -1236,10 +1234,15 @@
> 		vd->vd_flags |= VDF_TEXTMODE;
> 		vd->vd_width = 80;
> 		vd->vd_height = 25;
>+		bus_space_map(sc->vga_fb_tag, VGA_TXT_BASE, VGA_TXT_SIZE, 0,
>+		    &sc->vga_fb_handle);
> 	} else {
> 		vd->vd_width = VT_VGA_WIDTH;
> 		vd->vd_height = VT_VGA_HEIGHT;
>+		bus_space_map(sc->vga_fb_tag, VGA_MEM_BASE, VGA_MEM_SIZE, 0,
>+		    &sc->vga_fb_handle);
> 	}
>+
> 	if (vga_initialize(vd, textmode) != 0)
> 		return (CN_DEAD);
> 	sc->vga_enabled = true;
>Index: sys/dev/vt/hw/vga/vt_vga_reg.h
>===================================================================
>--- sys/dev/vt/hw/vga/vt_vga_reg.h	(revision 286716)
>+++ sys/dev/vt/hw/vga/vt_vga_reg.h	(working copy)
>@@ -49,6 +49,8 @@
> 
> #define	VGA_MEM_BASE	0xA0000
> #define	VGA_MEM_SIZE	0x10000
>+#define	VGA_TXT_BASE	0xB8000
>+#define	VGA_TXT_SIZE	0x08000
> #define	VGA_REG_BASE	0x3c0
> #define	VGA_REG_SIZE	0x10+0x0c
>

Actions: View | Diff

Attachments on bug 202276: 159818 | 159832