From owner-p4-projects@FreeBSD.ORG Mon Aug 25 19:54:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FE5E16A4C1; Mon, 25 Aug 2003 19:54:42 -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 C657016A4BF for ; Mon, 25 Aug 2003 19:54:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7183F43FFB for ; Mon, 25 Aug 2003 19:54:41 -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 h7Q2sf0U021776 for ; Mon, 25 Aug 2003 19:54:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7Q2seKu021773 for perforce@freebsd.org; Mon, 25 Aug 2003 19:54:40 -0700 (PDT) Date: Mon, 25 Aug 2003 19:54:40 -0700 (PDT) Message-Id: <200308260254.h7Q2seKu021773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 36926 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: Tue, 26 Aug 2003 02:54:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=36926 Change 36926 by marcel@marcel_nfs on 2003/08/25 19:54:14 On panther.freebsd.org the ns8250 based UARTs are called su_pnp, not su. Match it. NOTE: The detection of the console isn't right. We should not be using /chosen to get the ihandle, because it doesn't give us information about options. It's the device options that are used to destinguish between channel A or channel B of the se device. Hence, we cannot currently use channel B for the console. Affected files ... .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#4 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#4 (text+ko) ==== @@ -90,7 +90,7 @@ return (ENXIO); if (!strcmp(buffer, "se")) di->ops = uart_sab82532_ops; - else if (!strcmp(buffer, "su")) + else if (!strcmp(buffer, "su") || !strcmp(buffer, "su_pnp")) di->ops = uart_ns8250_ops; else return (ENXIO);