From owner-p4-projects  Sat Dec 21 19:19:19 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A96AB37B405; Sat, 21 Dec 2002 19:19:17 -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 2AE9837B401
	for <perforce@freebsd.org>; Sat, 21 Dec 2002 19:19:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D7A5D43EE5
	for <perforce@freebsd.org>; Sat, 21 Dec 2002 19:19:16 -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 gBM3JGfh066690
	for <perforce@freebsd.org>; Sat, 21 Dec 2002 19:19:16 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBM3JG1h066687
	for perforce@freebsd.org; Sat, 21 Dec 2002 19:19:16 -0800 (PST)
Date: Sat, 21 Dec 2002 19:19:16 -0800 (PST)
Message-Id: <200212220319.gBM3JG1h066687@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 22603 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=22603

Change 22603 by marcel@marcel_nfs on 2002/12/21 19:18:31

	o  Don't declare comdefaultrate as volatile.
	o  If the current com_s is the console, set the device pointer
	   in struct consdev. this is not done in siocnprobe or siocninit
	   because we don't know at that time what the device pointer
	   will be.

Affected files ...

.. //depot/projects/ia64/sys/dev/sio/sio.c#22 edit

Differences ...

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

@@ -68,6 +68,7 @@
 #include <sys/rman.h>
 #include <sys/timepps.h>
 #include <sys/uio.h>
+#include <sys/cons.h>
 
 #include <isa/isavar.h>
 
@@ -214,7 +215,7 @@
 	/* kqfilter */	ttykqfilter,
 };
 
-volatile speed_t comdefaultrate = CONSPEED;
+speed_t comdefaultrate = CONSPEED;
 
 u_long comdefaultrclk = DEFAULT_RCLK;
 SYSCTL_ULONG(_machdep, OID_AUTO, conrclk, CTLFLAG_RW, &comdefaultrclk, 0, "");
@@ -780,6 +781,10 @@
 
 	if (unit >= sio_numunits)
 		sio_numunits = unit + 1;
+
+	if (com->consdev)
+		com->consdev->cn_dev = makedev(CDEV_MAJOR, unit);
+
 	/*
 	 * sioprobe() has initialized the device registers as follows:
 	 *	o cfcr = LCR_8BITS.

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