From owner-p4-projects  Sat Dec 21 19:25:27 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACB7E37B405; Sat, 21 Dec 2002 19:25:25 -0800 (PST)
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 4422637B401
	for <perforce@freebsd.org>; Sat, 21 Dec 2002 19:25:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F02FE43EE5
	for <perforce@freebsd.org>; Sat, 21 Dec 2002 19:25:24 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBM3POfh070185
	for <perforce@freebsd.org>; Sat, 21 Dec 2002 19:25:24 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBM3PO4n070182
	for perforce@freebsd.org; Sat, 21 Dec 2002 19:25:24 -0800 (PST)
Date: Sat, 21 Dec 2002 19:25:24 -0800 (PST)
Message-Id: <200212220325.gBM3PO4n070182@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 22604 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 22604 by marcel@marcel_nfs on 2002/12/21 19:24:26

	o  Save the divisor latch in siocnprobe so that we can use it later
	   without having to fiddle with DLAB,
	o  Set comdefaultrate and comdefaultrclk in siocninit as we know
	   at that time that we have a serial console.
	
	Note that we still don't handle the case of not finding the UART
	during bus enumeration while it's the serial console. It may be
	better to deal with that somewhere else...

Affected files ...

.. //depot/projects/ia64/sys/dev/sio/sio_cons.c#4 edit

Differences ...

==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#4 (text+ko) ====

@@ -149,6 +149,8 @@
 	sio_setreg(&sio_console, com_lcr, lcr);
 	/* XXX barrier */
 
+	sio_console.reg_dl = divisor;
+
 	cp->cn_pri = (boothowto & RB_SERIAL) ? CN_REMOTE : CN_NORMAL;
 }
 
@@ -170,7 +172,7 @@
 	sio_console.reg_fcr = fcr;
 
 	/* Set MCR. */
-	sio_setreg(&sio_console, com_mcr, MCR_IENABLE | MCR_DTR);
+	sio_setreg(&sio_console, com_mcr, MCR_IENABLE | MCR_RTS | MCR_DTR);
 	/* XXX barrier */
 
 	/*
@@ -193,6 +195,9 @@
 
 	/* It's official... */
 	sio_console.consdev = cp;
+
+	comdefaultrclk = sio_console.rclk;
+	comdefaultrate = (comdefaultrclk / sio_console.reg_dl) >> 4;
 }
 
 static void

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message