From owner-p4-projects@FreeBSD.ORG Fri Sep 26 12:09:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BC1816A4C0; Fri, 26 Sep 2003 12:09:53 -0700 (PDT) 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 EAB6516A4B3 for ; Fri, 26 Sep 2003 12:09:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 511F043F93 for ; Fri, 26 Sep 2003 12:09:52 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8QJ9qXJ040314 for ; Fri, 26 Sep 2003 12:09:52 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8QJ9pMB040311 for perforce@freebsd.org; Fri, 26 Sep 2003 12:09:51 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Fri, 26 Sep 2003 12:09:51 -0700 (PDT) Message-Id: <200309261909.h8QJ9pMB040311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2003 19:09:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=38673 Change 38673 by sam@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 -__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 -__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 #include @@ -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,