PERFORCE change 38673 for review

[Sam Leffler]

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

Change 38673 by sam at sam_ebb on 2003/09/26 12:09:20

	IFC @ 38672 to get syscons fix

Affected files ...

.. //depot/projects/netperf/sys/dev/syscons/syscons.c#4 integrate
.. //depot/projects/netperf/sys/dev/uart/uart_tty.c#2 integrate

Differences ...

==== //depot/projects/netperf/sys/dev/syscons/syscons.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.407 2003/08/25 07:48:42 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.408 2003/09/26 18:57:34 phk Exp $");
 
 #include "opt_syscons.h"
 #include "opt_splash.h"
@@ -1395,7 +1395,7 @@
 	return;
 
     /* initialize required fields */
-    cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLECTL);
+    sprintf(cp->cn_name, "consolectl");
 #endif /* __i386__ || __ia64__ || __amd64__ || __sparc64__ */
 
 #if __alpha__
@@ -1475,7 +1475,7 @@
     scinit(unit, flags | SC_KERNEL_CONSOLE);
     sc_console_unit = unit;
     sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
-    consdev.cn_dev = makedev(CDEV_MAJOR, 0);
+    sprintf(consdev.cn_name, "ttyv%r", 0);
     cnadd(&consdev);
 }
 

==== //depot/projects/netperf/sys/dev/uart/uart_tty.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.2 2003/09/11 23:06:42 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.3 2003/09/26 18:10:30 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -85,7 +85,6 @@
 uart_cnprobe(struct consdev *cp)
 {
 
-	cp->cn_dev = NULL;
 	cp->cn_pri = CN_DEAD;
 
 	KASSERT(uart_console.cookie == NULL, ("foo"));
@@ -343,8 +342,8 @@
 	tp->t_stop = uart_tty_stop;
 
 	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
-		((struct consdev *)sc->sc_sysdev->cookie)->cn_dev =
-		    makedev(uart_cdevsw.d_maj, device_get_unit(sc->sc_dev));
+		sprintf(((struct consdev *)sc->sc_sysdev->cookie)->cn_name,
+		    "ttyu%r", device_get_unit(sc->sc_dev));
 	}
 
 	swi_add(&tty_ithd, uart_driver_name, uart_tty_intr, sc, SWI_TTY,