From owner-p4-projects@FreeBSD.ORG  Wed Sep  3 19:58:57 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B05C16A4C1; Wed,  3 Sep 2003 19:58:57 -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 E6EED16A4BF
	for <perforce@freebsd.org>; Wed,  3 Sep 2003 19:58:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5B0B943FAF
	for <perforce@freebsd.org>; Wed,  3 Sep 2003 19:58:56 -0700 (PDT)
	(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 h842wu0U048212
	for <perforce@freebsd.org>; Wed, 3 Sep 2003 19:58:56 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h842wteX048209
	for perforce@freebsd.org; Wed, 3 Sep 2003 19:58:55 -0700 (PDT)
Date: Wed, 3 Sep 2003 19:58:55 -0700 (PDT)
Message-Id: <200309040258.h842wteX048209@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 37471 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Sep 2003 02:58:57 -0000

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

Change 37471 by marcel@marcel_nfs on 2003/09/03 19:58:22

	o  Display flow control capabilities of the UART.
	o  Display the line settings (baudrate, parity, databits and
	   stopbits) for system devices.
	
	The SAB 82532 driver (with uncommitted support for HW
	flow control) now announces itself as:
	
		:
	uart0: <SAB 82532 v3.2, channel A> on puc0
	uart0: RTS iflow, CTS oflow
	uart0: console (9600,n,8,1)
	uart1: <SAB 82532 v3.2, channel B> on puc0
	uart1: RTS iflow, CTS oflow
		:

Affected files ...

.. //depot/projects/uart/dev/uart/uart_core.c#26 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_core.c#26 (text+ko) ====

@@ -345,21 +345,18 @@
 	if (error)
 		goto fail;
 
-	if (sc->sc_sysdev != NULL) {
-		switch (sc->sc_sysdev->type) {
-		case UART_DEV_CONSOLE:
-			device_printf(dev, "console\n");
-			break;
-		case UART_DEV_DBGPORT:
-			device_printf(dev, "debug port\n");
-			break;
-		case UART_DEV_KEYBOARD:
-			device_printf(dev, "keyboard\n");
-			break;
-		default:
-			device_printf(dev, "unknown system device\n");
-			break;
+	if (sc->sc_hwiflow || sc->sc_hwoflow) {
+		sep = "";
+		device_print_prettyname(dev);
+		if (sc->sc_hwiflow) {
+			printf("%sRTS iflow", sep);
+			sep = ", ";
+		}
+		if (sc->sc_hwoflow) {
+			printf("%sCTS oflow", sep);
+			sep = ", ";
 		}
+		printf("\n");
 	}
 
 	if (bootverbose && (sc->sc_fastintr || sc->sc_polled)) {
@@ -376,6 +373,26 @@
 		printf("\n");
 	}
 
+	if (sc->sc_sysdev != NULL) {
+		switch (sc->sc_sysdev->type) {
+		case UART_DEV_CONSOLE:
+			device_printf(dev, "console");
+			break;
+		case UART_DEV_DBGPORT:
+			device_printf(dev, "debug port");
+			break;
+		case UART_DEV_KEYBOARD:
+			device_printf(dev, "keyboard");
+			break;
+		default:
+			device_printf(dev, "unknown system device");
+			break;
+		}
+		printf(" (%d,%c,%d,%d)\n", sc->sc_sysdev->baudrate,
+		    "noems"[sc->sc_sysdev->parity], sc->sc_sysdev->databits,
+		    sc->sc_sysdev->stopbits);
+	}
+
 	error = (sc->sc_sysdev != NULL && sc->sc_sysdev->attach != NULL)
 	    ? (*sc->sc_sysdev->attach)(sc) : uart_tty_attach(sc);
 	if (error)