From owner-p4-projects@FreeBSD.ORG  Fri Aug 29 14:50:27 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 580CB16A4C1; Fri, 29 Aug 2003 14:50:27 -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 1644E16A4BF
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 14:50:27 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9B14043FCB
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 14:50:26 -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 h7TLoQ0U060472
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 14:50:26 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7TLoQ6o060469
	for perforce@freebsd.org; Fri, 29 Aug 2003 14:50:26 -0700 (PDT)
Date: Fri, 29 Aug 2003 14:50:26 -0700 (PDT)
Message-Id: <200308292150.h7TLoQ6o060469@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 37196 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: Fri, 29 Aug 2003 21:50:27 -0000

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

Change 37196 by marcel@marcel_nfs on 2003/08/29 14:49:45

	Apply a quick hack. Channel A is at offset 4; channel B at
	offset 0. Since the console on the test box is on channel A,
	add 4 to the handle.
	
	As I mentioned before, we should ideally be looking at
	"input-device" and "output-device" under /options instead
	of looking at "stdin" and "stdout" under /chosen. That
	way we can consider the arguments given to the device and
	properly adjust the handle based on the channel referenced
	by the properties. I'll do that later.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#7 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#7 (text+ko) ====

@@ -98,9 +98,10 @@
 		di->ops = uart_sab82532_ops;
 	else if (!strcmp(buffer, "su") || !strcmp(buffer, "su_pnp"))
 		di->ops = uart_ns8250_ops;
-	else if (!strcmp(buffer, "zs"))
+	else if (!strcmp(buffer, "zs")) {
 		di->ops = uart_z8530_ops;
-	else
+		di->bas.bsh += 4;
+	} else
 		return (ENXIO);
 
 	/*