Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/consinit.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/consinit.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- src/sys/arch/x86/x86/consinit.c	2009/03/18 10:22:38	1.20
+++ src/sys/arch/x86/x86/consinit.c	2010/04/28 19:17:04	1.21
@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.20 2009/03/18 10:22:38 cegger Exp $	*/
+/*	$NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.20 2009/03/18 10:22:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $");
 
 #include "opt_kgdb.h"
 
@@ -190,23 +190,23 @@ consinit(void)
 		}
 #endif
 #if (NVGA > 0)
-		if (!vga_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM,
+		if (!vga_cnattach(x86_bus_space_io, x86_bus_space_mem,
 				  -1, 1))
 			goto dokbd;
 #endif
 #if (NEGA > 0)
-		if (!ega_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM))
+		if (!ega_cnattach(x86_bus_space_io, x86_bus_space_mem))
 			goto dokbd;
 #endif
 #if (NPCDISPLAY > 0)
-		if (!pcdisplay_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM))
+		if (!pcdisplay_cnattach(x86_bus_space_io, x86_bus_space_mem))
 			goto dokbd;
 #endif
 		if (0) goto dokbd; /* XXX stupid gcc */
 dokbd:
 		error = ENODEV;
 #if (NPCKBC > 0)
-		error = pckbc_cnattach(X86_BUS_SPACE_IO, IO_KBD, KBCMDP,
+		error = pckbc_cnattach(x86_bus_space_io, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 #endif
 #if (NUKBD > 0)
@@ -220,7 +220,6 @@ dokbd:
 	}
 #if (NCOM > 0)
 	if (!strcmp(consinfo->devname, "com")) {
-		bus_space_tag_t tag = X86_BUS_SPACE_IO;
 		int addr = consinfo->addr;
 		int speed = consinfo->speed;
 
@@ -229,7 +228,7 @@ dokbd:
 		if (speed == 0)
 			speed = CONSPEED;
 
-		if (comcnattach(tag, addr, speed,
+		if (comcnattach(x86_bus_space_io, addr, speed,
 				COM_FREQ, COM_TYPE_NORMAL, comcnmode))
 			panic("can't init serial console @%x", consinfo->addr);
 
@@ -245,10 +244,8 @@ kgdb_port_init(void)
 {
 #if (NCOM > 0)
 	if(!strcmp(kgdb_devname, "com")) {
-		bus_space_tag_t tag = X86_BUS_SPACE_IO;
-
-		com_kgdb_attach(tag, comkgdbaddr, comkgdbrate, COM_FREQ, 
-		    COM_TYPE_NORMAL, comkgdbmode);
+		com_kgdb_attach(x86_bus_space_io, comkgdbaddr, comkgdbrate,
+		    COM_FREQ, COM_TYPE_NORMAL, comkgdbmode);
 	}
 #endif
 }