From owner-p4-projects@FreeBSD.ORG  Tue Apr 11 02:27:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 006EF16A407; Tue, 11 Apr 2006 02:27:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 C7B4E16A400
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 02:27:43 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 75BDB43D66
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 02:27:43 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B2RhBe098976
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 02:27:43 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B2Rh0o098973
	for perforce@freebsd.org; Tue, 11 Apr 2006 02:27:43 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 11 Apr 2006 02:27:43 GMT
Message-Id: <200604110227.k3B2Rh0o098973@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>
Cc: 
Subject: PERFORCE change 94967 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 11 Apr 2006 02:27:44 -0000

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

Change 94967 by marcel@marcel_nfs on 2006/04/11 02:27:30

	Revert the addition of a register shift and revert the exposure
	of the port number. Both are not needed anymore.

Affected files ...

.. //depot/projects/uart/dev/puc/puc.c#19 edit
.. //depot/projects/uart/dev/puc/pucvar.h#14 edit
.. //depot/projects/uart/dev/uart/uart_bus_puc.c#13 edit

Differences ...

==== //depot/projects/uart/dev/puc/puc.c#19 (text+ko) ====

@@ -102,8 +102,6 @@
 
 struct puc_device {
 	struct resource_list resources;
-	int	port;
-	int	regshft;
 	u_int	serialfreq;
 };
 
@@ -314,9 +312,7 @@
 			rman_set_bushandle(rle->res, bh);
 		}
 
-		pdev->port = i + 1;
 		pdev->serialfreq = sc->sc_desc.ports[i].serialfreq;
-		pdev->regshft = sc->sc_desc.ports[i].regshft;
 
 		childunit = puc_find_free_unit(typestr);
 		sc->sc_ports[i].dev = device_add_child(dev, typestr,
@@ -576,12 +572,6 @@
 	case PUC_IVAR_FREQ:
 		*result = pdev->serialfreq;
 		break;
-	case PUC_IVAR_PORT:
-		*result = pdev->port;
-		break;
-	case PUC_IVAR_REGSHFT:
-		*result = pdev->regshft;
-		break;
 	default:
 		return (ENOENT);
 	}

==== //depot/projects/uart/dev/puc/pucvar.h#14 (text+ko) ====

@@ -78,7 +78,6 @@
 		int	offset;
 		u_int	serialfreq;
 		u_int	flags;
-		int	regshft;
 	} ports[PUC_MAX_PORTS];
 	uint32_t	ilr_type;
 	uint32_t	ilr_offset[2];
@@ -104,9 +103,7 @@
 #define PUC_MAX_BAR		6
 
 enum puc_device_ivars {
-	PUC_IVAR_FREQ,
-	PUC_IVAR_REGSHFT,
-	PUC_IVAR_PORT
+	PUC_IVAR_FREQ
 };
 
 #ifdef PUC_ENTRAILS

==== //depot/projects/uart/dev/uart/uart_bus_puc.c#13 (text+ko) ====

@@ -70,7 +70,7 @@
 {
 	device_t parent;
 	struct uart_softc *sc;
-	uintptr_t rclk, regshft;
+	uintptr_t rclk;
 
 	parent = device_get_parent(dev);
 	sc = device_get_softc(dev);
@@ -79,9 +79,7 @@
 
 	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_FREQ, &rclk))
 		rclk = 0;
-	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_REGSHFT, &regshft))
-		regshft = 0;
-	return (uart_bus_probe(dev, regshft, rclk, 0, 0));
+	return (uart_bus_probe(dev, 0, rclk, 0, 0));
 }
 
 DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0);