Attachment #159832 for bug #202276

View | Details | Raw Unified | Return to bug 202276
Collapse All | Expand All




			/* Convert colors to VGA attributes. */
			attr = bg << 4 | fg;

			MEM_WRITE1(sc, (row * 80 + col) * 2 + 0,
			    ch);
			MEM_WRITE1(sc, (row * 80 + col) * 2 + 1,
			    attr);
		}
	}

# 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);


		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;

Lines 49-54 Link Here

(-)sys/dev/vt/hw/vga/vt_vga_reg.h (+2 lines)
49		49
50	#define VGA_MEM_BASE 0xA0000	50	#define VGA_MEM_BASE 0xA0000
51	#define VGA_MEM_SIZE 0x10000	51	#define VGA_MEM_SIZE 0x10000
		52	#define VGA_TXT_BASE 0xB8000
		53	#define VGA_TXT_SIZE 0x08000
52	#define VGA_REG_BASE 0x3c0	54	#define VGA_REG_BASE 0x3c0
53	#define VGA_REG_SIZE 0x10+0x0c	55	#define VGA_REG_SIZE 0x10+0x0c
54		56

Return to bug 202276

Lines 883-891 Link Here

(-)sys/dev/vt/hw/vga/vt_vga.c (-4 / +7 lines)
883	/* Convert colors to VGA attributes. */	883	/* Convert colors to VGA attributes. */
884	attr = bg << 4 \| fg;	884	attr = bg << 4 \| fg;
885		885
886	MEM_WRITE1(sc, 0x18000 + (row * 80 + col) * 2 + 0,	886	MEM_WRITE1(sc, (row * 80 + col) * 2 + 0,
887	ch);	887	ch);
888	MEM_WRITE1(sc, 0x18000 + (row * 80 + col) * 2 + 1,	888	MEM_WRITE1(sc, (row * 80 + col) * 2 + 1,
889	attr);	889	attr);
890	}	890	}
891	}	891	}
Lines 1226-1233 Link Here
1226	# error "Architecture not yet supported!"	1226	# error "Architecture not yet supported!"
1227	#endif	1227	#endif
1228		1228
1229	bus_space_map(sc->vga_fb_tag, VGA_MEM_BASE, VGA_MEM_SIZE, 0,
1230	&sc->vga_fb_handle);
1231	bus_space_map(sc->vga_reg_tag, VGA_REG_BASE, VGA_REG_SIZE, 0,	1229	bus_space_map(sc->vga_reg_tag, VGA_REG_BASE, VGA_REG_SIZE, 0,
1232	&sc->vga_reg_handle);	1230	&sc->vga_reg_handle);
1233		1231
Lines 1236-1245 Link Here
1236	vd->vd_flags \|= VDF_TEXTMODE;	1234	vd->vd_flags \|= VDF_TEXTMODE;
1237	vd->vd_width = 80;	1235	vd->vd_width = 80;
1238	vd->vd_height = 25;	1236	vd->vd_height = 25;
		1237	bus_space_map(sc->vga_fb_tag, VGA_TXT_BASE, VGA_TXT_SIZE, 0,
		1238	&sc->vga_fb_handle);
1239	} else {	1239	} else {
1240	vd->vd_width = VT_VGA_WIDTH;	1240	vd->vd_width = VT_VGA_WIDTH;
1241	vd->vd_height = VT_VGA_HEIGHT;	1241	vd->vd_height = VT_VGA_HEIGHT;
		1242	bus_space_map(sc->vga_fb_tag, VGA_MEM_BASE, VGA_MEM_SIZE, 0,
		1243	&sc->vga_fb_handle);
1242	}	1244	}
		1245
1243	if (vga_initialize(vd, textmode) != 0)	1246	if (vga_initialize(vd, textmode) != 0)
1244	return (CN_DEAD);	1247	return (CN_DEAD);
1245	sc->vga_enabled = true;	1248	sc->vga_enabled = true;