Date: Sun, 11 Nov 2007 20:56:57 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 128946 for review Message-ID: <200711112056.lABKuvRp081635@repoman.freebsd.org>
index | next in thread | raw e-mail
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 !help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711112056.lABKuvRp081635>