Cleanup serial console handling and remove some of the MD code from com.c.

Specify the serial configuration from within the MD code, rather than
passing things via macros. This will allow other platforms to more readily
change the serial console configuration.

Committing this so it actually gets tested.

ok dlg@

2 files changed, 9 insertions, 13 deletions

diff --git a/sys/arch/sgi/include/autoconf.h b/sys/arch/sgi/include/autoconf.h
index 10e9ed351b3..b9f446445e6 100644
--- a/sys/arch/sgi/include/autoconf.h
+++ b/sys/arch/sgi/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.13 2008/04/07 22:32:46 miod Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.14 2008/04/24 12:29:34 jsing Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -71,14 +71,6 @@ struct sys_rec {
 
 extern struct sys_rec sys_config;
 
-/*
- *  Give com.c method to find console address and speeds
- */
-#define	COM_FREQ	(sys_config.cons_baudclk)
-#define	CONCOM_FREQ	(sys_config.cons_baudclk)
-#define	CONADDR		(sys_config.cons_ioaddr)
-
-
 /**/
 struct confargs;
 
diff --git a/sys/arch/sgi/sgi/ip32_machdep.c b/sys/arch/sgi/sgi/ip32_machdep.c
index 0fc18b4a411..93a273b5645 100644
--- a/sys/arch/sgi/sgi/ip32_machdep.c
+++ b/sys/arch/sgi/sgi/ip32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip32_machdep.c,v 1.1 2008/04/07 22:32:46 miod Exp $ */
+/*	$OpenBSD: ip32_machdep.c,v 1.2 2008/04/24 12:29:34 jsing Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -48,6 +48,10 @@ void crime_configure_memory(void);
 
 extern int bootdriveoffs;
 
+extern bus_addr_t comconsaddr;
+extern bus_space_tag_t comconsiot;
+extern int comconsfreq;
+
 void
 crime_configure_memory(void)
 {
@@ -134,7 +138,7 @@ ip32_setup()
 		break;
 	}
 
-	sys_config.cons_ioaddr = MACE_ISA_SER1_OFFS;
-	sys_config.cons_baudclk = 1843200;		/*XXX*/
-	sys_config.cons_iot = &macebus_tag;
+	comconsaddr = MACE_ISA_SER1_OFFS;
+	comconsfreq = 1843200;
+	comconsiot = &macebus_tag;
 }