PERFORCE change 76673 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=76673

Change 76673 by marcel at marcel_nfs on 2005/05/08 04:49:02

	Initialization step 1: disable sync signals

Affected files ...

.. //depot/projects/tty/sys/dev/vga/vga.c#5 edit

Differences ...

==== //depot/projects/tty/sys/dev/vga/vga.c#5 (text+ko) ====

@@ -37,6 +37,12 @@
 #include <dev/ic/vga.h>
 #include <dev/vga/vga.h>
 
+/* Convenience macros. */
+#define	CRTC_READ(sc, reg)		\
+	bus_space_read_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, reg)
+#define	CRTC_WRITE(sc, reg, val)	\
+	bus_space_write_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, reg, val)
+
 struct vga_softc vga_console;
 devclass_t vga_devclass;
 char vga_device_name[] = "vga";
@@ -52,6 +58,7 @@
 vga_init(struct vga_softc *sc)
 {
 	int error;
+	uint8_t x;
 
 	sc->vga_screen = sc->vga_fb;
 	error = bus_space_subregion(sc->vga_fb.bst, sc->vga_fb.bsh,
@@ -59,6 +66,11 @@
 	if (error)
 		return (error);
 
+	/* Disable the sync. signals. */
+	CRTC_WRITE(sc, VGA_CRTC_ADDRESS, VGA_CRTC_MODE_CONTROL);
+	x = CRTC_READ(sc, VGA_CRTC_DATA);
+	CRTC_WRITE(sc, VGA_CRTC_DATA, x & ~VGA_CRTC_MC_HR);
+
 	/* TODO -- set the VGA adapter in 640x480x16 mode */
 
 	sc->vga_enable = 1;