From owner-p4-projects  Tue Dec 24  0:28: 7 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACA5037B405; Tue, 24 Dec 2002 00:28:05 -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 5A99137B401
	for <perforce@freebsd.org>; Tue, 24 Dec 2002 00:28:05 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1579843EE5
	for <perforce@freebsd.org>; Tue, 24 Dec 2002 00:28:05 -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 gBO8S4fh005694
	for <perforce@freebsd.org>; Tue, 24 Dec 2002 00:28:04 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO8S4jb005691
	for perforce@freebsd.org; Tue, 24 Dec 2002 00:28:04 -0800 (PST)
Date: Tue, 24 Dec 2002 00:28:04 -0800 (PST)
Message-Id: <200212240828.gBO8S4jb005691@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 22698 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=22698

Change 22698 by marcel@marcel_nfs on 2002/12/24 00:27:44

	When we initialize FCR and MCR, update the softc where we
	keep an image of them.

Affected files ...

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

Differences ...

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

@@ -162,12 +162,13 @@
 	/* XXX barrier */
 
 	/* Disable the FIFO (if present). */
-	sio_setreg(&sio_console, com_fcr, 0);
+	sio_console.reg_fcr = 0;
+	sio_setreg(&sio_console, com_fcr, sio_console.reg_fcr);
 	/* XXX barrier */
-	sio_console.reg_fcr = 0;
 
 	/* Set MCR. */
-	sio_setreg(&sio_console, com_mcr, MCR_IENABLE | MCR_RTS | MCR_DTR);
+	sio_console.reg_mcr = MCR_IENABLE | MCR_RTS | MCR_DTR;
+	sio_setreg(&sio_console, com_mcr, sio_console.reg_mcr);
 	/* XXX barrier */
 
 	/*

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