From owner-p4-projects@FreeBSD.ORG  Tue Sep  5 19:18:32 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 CB48E16A4E2; Tue,  5 Sep 2006 19:18:31 +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 8F85016A4DD
	for <perforce@FreeBSD.org>; Tue,  5 Sep 2006 19:18:31 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8824C43D46
	for <perforce@FreeBSD.org>; Tue,  5 Sep 2006 19:18:30 +0000 (GMT)
	(envelope-from hselasky@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 k85JIUCf096348
	for <perforce@FreeBSD.org>; Tue, 5 Sep 2006 19:18:30 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85JIU6d096345
	for perforce@freebsd.org; Tue, 5 Sep 2006 19:18:30 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 5 Sep 2006 19:18:30 GMT
Message-Id: <200609051918.k85JIU6d096345@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 105689 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, 05 Sep 2006 19:18:32 -0000

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

Change 105689 by hselasky@hselasky_mini_itx on 2006/09/05 19:18:11

	Define "device_get_dma_tag()" to "bus_get_dma_tag()",
	when "bus_get_dma_tag()" is available on FreeBSD.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#20 (text+ko) ====

@@ -738,8 +738,12 @@
 usbd_mem_free_sub(struct usbd_page *page);
 
 #ifdef __FreeBSD__
+#if (__FreeBSD_version >= 700020)
+#define device_get_dma_tag(dev) bus_get_dma_tag(dev)
+#else
 #define device_get_dma_tag(dev) NULL /* XXX */
 #endif
+#endif
 
 void
 usbd_std_transfer_setup(struct usbd_xfer *xfer, const struct usbd_config *setup,