From owner-p4-projects@FreeBSD.ORG  Mon Sep  1 15:01:08 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D05116A4C1; Mon,  1 Sep 2003 15:01:08 -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 399A316A4BF
	for <perforce@freebsd.org>; Mon,  1 Sep 2003 15:01:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BBAC243FCB
	for <perforce@freebsd.org>; Mon,  1 Sep 2003 15:01:07 -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 h81M170U097086
	for <perforce@freebsd.org>; Mon, 1 Sep 2003 15:01:07 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81M17p9097083
	for perforce@freebsd.org; Mon, 1 Sep 2003 15:01:07 -0700 (PDT)
Date: Mon, 1 Sep 2003 15:01:07 -0700 (PDT)
Message-Id: <200309012201.h81M17p9097083@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 37340 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: Mon, 01 Sep 2003 22:01:09 -0000

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

Change 37340 by marcel@marcel_nfs on 2003/09/01 15:00:27

	Got it: we were setting CLOCAL and ~HUPCL in the wrong
	structure. It was never properly set for the tty. I
	think I must always have had DCD wired to DSR with my
	null-modem cables.
	
	Ok, so now that I can login (yay!) I still need to
	figure out if a have the DCD and CTS signals with the
	right polarity, because apparently DCD is not set
	according to the z8530 driver. If I look at zs(4),
	I think this is right, but I have no visual way to
	confirm this. It's trivial to fix, so I'm not going
	to worry about it until I get some definite reports.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_tty.c#10 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_tty.c#10 (text+ko) ====

@@ -191,9 +191,12 @@
 		return (ENODEV);
 	if (t->c_ispeed != t->c_ospeed && t->c_ospeed != 0)
 		return (EINVAL);
-	/* Hardwire the speed of system devices. */
-	if (sc->sc_sysdev != NULL)
+	/* Fixate certain parameters for system devices. */
+	if (sc->sc_sysdev != NULL) {
 		t->c_ispeed = t->c_ospeed = sc->sc_sysdev->baudrate;
+		t->c_cflag |= CLOCAL;
+		t->c_cflag &= ~HUPCL;
+	}
 	if (t->c_ospeed == 0) {
 		UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS);
 		return (0);
@@ -215,10 +218,6 @@
 	if ((t->c_cflag & CRTS_IFLOW) == 0)
 		UART_SETSIG(sc, UART_SIG_DRTS | UART_SIG_RTS);
 	ttsetwater(tp);
-	if (sc->sc_sysdev != NULL) {
-		tp->t_cflag |= CLOCAL;
-		tp->t_cflag &= ~HUPCL;
-	}
 	return (0);
 }