From owner-svn-src-user@FreeBSD.ORG  Wed Mar 23 06:31:46 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 05FE91065673;
	Wed, 23 Mar 2011 06:31:46 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E86958FC12;
	Wed, 23 Mar 2011 06:31:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2N6VjXv083864;
	Wed, 23 Mar 2011 06:31:45 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2N6Vjbj083862;
	Wed, 23 Mar 2011 06:31:45 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201103230631.p2N6Vjbj083862@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 23 Mar 2011 06:31:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219897 - user/ed/newcons/sys/dev/vt/hw/vga
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Mar 2011 06:31:46 -0000

Author: ed
Date: Wed Mar 23 06:31:45 2011
New Revision: 219897
URL: http://svn.freebsd.org/changeset/base/219897

Log:
  Chase KPI change in vga driver.

Modified:
  user/ed/newcons/sys/dev/vt/hw/vga/vga.c

Modified: user/ed/newcons/sys/dev/vt/hw/vga/vga.c
==============================================================================
--- user/ed/newcons/sys/dev/vt/hw/vga/vga.c	Wed Mar 23 06:19:17 2011	(r219896)
+++ user/ed/newcons/sys/dev/vt/hw/vga/vga.c	Wed Mar 23 06:31:45 2011	(r219897)
@@ -569,15 +569,10 @@ vga_init(struct vt_device *vd)
 	struct vga_softc *sc = vd->vd_softc;
 	int textmode = 0;
 
-#if defined(__amd64__)
-	sc->vga_fb_tag = AMD64_BUS_SPACE_MEM;
+#if defined(__amd64__) || defined(__i386__)
+	sc->vga_fb_tag = X86_BUS_SPACE_MEM;
 	sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE;
-	sc->vga_reg_tag = AMD64_BUS_SPACE_IO;
-	sc->vga_reg_handle = VGA_REG_BASE;
-#elif defined(__i386__)
-	sc->vga_fb_tag = I386_BUS_SPACE_MEM;
-	sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE;
-	sc->vga_reg_tag = I386_BUS_SPACE_IO;
+	sc->vga_reg_tag = X86_BUS_SPACE_IO;
 	sc->vga_reg_handle = VGA_REG_BASE;
 #else
 # error "Architecture not yet supported!"