From owner-p4-projects@FreeBSD.ORG  Sun Sep 17 17:31:37 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 ACCCF16A416; Sun, 17 Sep 2006 17:31:37 +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 88E8B16A40F
	for <perforce@freebsd.org>; Sun, 17 Sep 2006 17:31:37 +0000 (UTC)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 55D5B43D55
	for <perforce@freebsd.org>; Sun, 17 Sep 2006 17:31:37 +0000 (GMT)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HHVbux053646
	for <perforce@freebsd.org>; Sun, 17 Sep 2006 17:31:37 GMT
	(envelope-from trhodes@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HHVbmp053643
	for perforce@freebsd.org; Sun, 17 Sep 2006 17:31:37 GMT
	(envelope-from trhodes@freebsd.org)
Date: Sun, 17 Sep 2006 17:31:37 GMT
Message-Id: <200609171731.k8HHVbmp053643@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trhodes@freebsd.org using -f
From: Tom Rhodes <trhodes@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106251 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: Sun, 17 Sep 2006 17:31:38 -0000

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

Change 106251 by trhodes@trhodes_local on 2006/09/17 17:31:03

	Remove code block for allocating a dma tag for transfer buffers.
	This is now handled by usb_subr.c's usbd_dma_tag_alloc()
	function.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#8 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#8 (text+ko) ====

@@ -309,29 +309,6 @@
 #endif
 	pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 2);
 
-	/* Allocate a parent dma tag for DMA maps */
-	err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
-	    BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT,
-	    USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL,
-	    &sc->sc_bus.parent_dmatag);
-	if (err) {
-		device_printf(self, "Could not allocate parent DMA tag (%d)\n",
-		    err);
-		uhci_pci_detach(self);
-		return ENXIO;
-	}
-	/* Allocate a dma tag for transfer buffers */
-	err = bus_dma_tag_create(sc->sc_bus.parent_dmatag, 1, 0,
-	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
-	    BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0,
-	    busdma_lock_mutex, &Giant, &sc->sc_bus.buffer_dmatag);
-	if (err) {
-		device_printf(self, "Could not allocate transfer tag (%d)\n",
-		    err);
-		uhci_pci_detach(self);
-		return ENXIO;
-	}
-
 	err = uhci_init(sc);
 	if(!err)
 	{