From 3d9271a28a78cdd0401ecc965c425b2452ae6f53 Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Fri, 6 Jun 1997 13:09:55 +0000
Subject: [PATCH] Synchronize with sys/i386/isa/sio.c and sioreg.h
 revisions1.171 and 1.10, respectively.

---
 sys/pc98/cbus/sio.c    | 4 ++--
 sys/pc98/pc98/sio.c    | 4 ++--
 sys/pc98/pc98/sioreg.h | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index b79eb0e9bcac..157579cfd2b1 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.26 1997/06/02 10:51:34 kato Exp $
+ *	$Id: sio.c,v 1.27 1997/06/04 10:27:53 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -441,7 +441,7 @@ static struct cdevsw sio_cdevsw = {
 };
 
 static	int	comconsole = -1;
-static	volatile speed_t	comdefaultrate = TTYDEF_SPEED;
+static	volatile speed_t	comdefaultrate = CONSPEED;
 static	u_int	com_events;	/* input chars + weighted output completions */
 static	Port_t	siocniobase;
 static	int	sio_timeout;
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index b79eb0e9bcac..157579cfd2b1 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.26 1997/06/02 10:51:34 kato Exp $
+ *	$Id: sio.c,v 1.27 1997/06/04 10:27:53 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -441,7 +441,7 @@ static struct cdevsw sio_cdevsw = {
 };
 
 static	int	comconsole = -1;
-static	volatile speed_t	comdefaultrate = TTYDEF_SPEED;
+static	volatile speed_t	comdefaultrate = CONSPEED;
 static	u_int	com_events;	/* input chars + weighted output completions */
 static	Port_t	siocniobase;
 static	int	sio_timeout;
diff --git a/sys/pc98/pc98/sioreg.h b/sys/pc98/pc98/sioreg.h
index b39e256a1e3f..840df10841be 100644
--- a/sys/pc98/pc98/sioreg.h
+++ b/sys/pc98/pc98/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.5 1997/04/05 15:05:16 kato Exp $
+ *	$Id: sioreg.h,v 1.6 1997/06/04 10:27:53 kato Exp $
  */
 
 
@@ -111,4 +111,9 @@
 #define	MSR_DCTS	0x01
 
 /* speed to initialize to during chip tests */
-#define	SIO_TEST_SPEED	9600
+#define SIO_TEST_SPEED	9600
+
+/* default serial console speed if not set with sysctl or probed from boot */
+#ifndef CONSPEED
+#define CONSPEED 9600
+#endif