From owner-p4-projects@FreeBSD.ORG  Sun Nov 11 20:56:58 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 697D816A419; Sun, 11 Nov 2007 20:56:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09DA016A420
	for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:56:58 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EEAB413C4B5
	for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:56:57 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABKuvZx081638
	for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:56:57 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABKuvRp081635
	for perforce@freebsd.org; Sun, 11 Nov 2007 20:56:57 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 11 Nov 2007 20:56:57 GMT
Message-Id: <200711112056.lABKuvRp081635@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 128946 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, 11 Nov 2007 20:56:58 -0000

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

Change 128946 by hselasky@hselasky_laptop001 on 2007/11/11 20:56:29

	
	Substitute "__usbd_callback" by "usbd_callback_wrapper",
	hence double underscored functions are reserved for the
	system domain.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#51 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#41 edit

Differences ...

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

@@ -698,7 +698,7 @@
 void	usbd_transfer_start(struct usbd_xfer *xfer);
 void	usbd_transfer_stop(struct usbd_xfer *xfer);
 void	usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, uint32_t frindex);
-void	__usbd_callback(struct usbd_xfer *xfer);
+void	usbd_callback_wrapper(struct usbd_xfer *xfer);
 void	usbd_do_callback(struct usbd_xfer **pp_xfer, struct thread *td);
 void	usbd_transfer_enqueue(struct usbd_xfer *xfer);
 void	usbd_transfer_dequeue(struct usbd_xfer *xfer, usbd_status error);

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

@@ -1203,7 +1203,7 @@
 	mtx_lock(xfer->usb_mtx);
 	usbd_transfer_dequeue(xfer, error);
 	mtx_unlock(xfer->usb_mtx);
-	__usbd_callback(xfer);
+	usbd_callback_wrapper(xfer);
 	return;
 }
 
@@ -1338,7 +1338,7 @@
 	}
 	if (!xfer->flags_int.transferring) {
 		/* call callback */
-		__usbd_callback(xfer);
+		usbd_callback_wrapper(xfer);
 
 		/*
 		 * wait for completion if polling is selected
@@ -1358,7 +1358,7 @@
 
 				/*
 				 * call the interrupt handler, which will
-				 * call __usbd_callback():
+				 * call usbd_callback_wrapper():
 				 */
 				(bus->methods->do_poll) (bus);
 			}
@@ -1415,7 +1415,7 @@
 			 * call callback, which will clear
 			 * "flags_int.transferring"
 			 */
-			__usbd_callback(xfer);
+			usbd_callback_wrapper(xfer);
 		}
 	}
 	return;
@@ -1435,13 +1435,13 @@
 }
 
 /*---------------------------------------------------------------------------*
- *	__usbd_callback
+ *	usbd_callback_wrapper
  *
  * This is a wrapper for USB callbacks, which handles
  * recursation, which can happen during boot.
  *---------------------------------------------------------------------------*/
 void
-__usbd_callback(struct usbd_xfer *xfer)
+usbd_callback_wrapper(struct usbd_xfer *xfer)
 {
 	mtx_assert(xfer->priv_mtx, MA_OWNED);
 
@@ -1506,7 +1506,7 @@
 
 		if (tmp) {
 			/* call callback */
-			__usbd_callback(xfer);
+			usbd_callback_wrapper(xfer);
 		}
 		/*
 		 * else already called back !