Date: Sat, 21 Dec 2002 19:19:16 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22603 for review Message-ID: <200212220319.gBM3JG1h066687@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212220319.gBM3JG1h066687>