From owner-p4-projects@FreeBSD.ORG  Sun May  8 04:49:42 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6942B16A4E2; Sun,  8 May 2005 04:49:41 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 18F5516A4E0
	for <perforce@freebsd.org>; Sun,  8 May 2005 04:49:41 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0531C43D5A
	for <perforce@freebsd.org>; Sun,  8 May 2005 04:49:41 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j484nex5032377
	for <perforce@freebsd.org>; Sun, 8 May 2005 04:49:40 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j484nem3032374
	for perforce@freebsd.org; Sun, 8 May 2005 04:49:40 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 8 May 2005 04:49:40 GMT
Message-Id: <200505080449.j484nem3032374@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76673 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 May 2005 04:49:42 -0000

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

Change 76673 by marcel@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;