diff options
Diffstat (limited to 'sys/dev/usb/usb_process.c')
| -rw-r--r-- | sys/dev/usb/usb_process.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c index f36d57c..0732ee05 100644 --- a/sys/dev/usb/usb_process.c +++ b/sys/dev/usb/usb_process.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#define USB_DEBUG_VAR usb2_proc_debug +#define USB_DEBUG_VAR usb_proc_debug #include <dev/usb/usb_core.h> #include <dev/usb/usb_process.h> @@ -53,10 +53,10 @@ #endif #if USB_DEBUG -static int usb2_proc_debug; +static int usb_proc_debug; SYSCTL_NODE(_hw_usb, OID_AUTO, proc, CTLFLAG_RW, 0, "USB process"); -SYSCTL_INT(_hw_usb_proc, OID_AUTO, debug, CTLFLAG_RW, &usb2_proc_debug, 0, +SYSCTL_INT(_hw_usb_proc, OID_AUTO, debug, CTLFLAG_RW, &usb_proc_debug, 0, "Debug level"); #endif @@ -164,7 +164,7 @@ usb_process(void *arg) } /*------------------------------------------------------------------------* - * usb2_proc_create + * usb_proc_create * * This function will create a process using the given "prio" that can * execute callbacks. The mutex pointed to by "p_mtx" will be applied @@ -177,7 +177,7 @@ usb_process(void *arg) * Else: failure *------------------------------------------------------------------------*/ int -usb2_proc_create(struct usb_process *up, struct mtx *p_mtx, +usb_proc_create(struct usb_process *up, struct mtx *p_mtx, const char *pmesg, uint8_t prio) { up->up_mtx = p_mtx; @@ -197,12 +197,12 @@ usb2_proc_create(struct usb_process *up, struct mtx *p_mtx, return (0); error: - usb2_proc_free(up); + usb_proc_free(up); return (ENOMEM); } /*------------------------------------------------------------------------* - * usb2_proc_free + * usb_proc_free * * NOTE: If the structure pointed to by "up" is all zero, this * function does nothing. @@ -211,13 +211,13 @@ error: * removed nor called. *------------------------------------------------------------------------*/ void -usb2_proc_free(struct usb_process *up) +usb_proc_free(struct usb_process *up) { /* check if not initialised */ if (up->up_mtx == NULL) return; - usb2_proc_drain(up); + usb_proc_drain(up); cv_destroy(&up->up_cv); cv_destroy(&up->up_drain); @@ -227,7 +227,7 @@ usb2_proc_free(struct usb_process *up) } /*------------------------------------------------------------------------* - * usb2_proc_msignal + * usb_proc_msignal * * This function will queue one of the passed USB process messages on * the USB process queue. The first message that is not already queued @@ -238,7 +238,7 @@ usb2_proc_free(struct usb_process *up) * at a time. The message that was queued is returned. *------------------------------------------------------------------------*/ void * -usb2_proc_msignal(struct usb_process *up, void *_pm0, void *_pm1) +usb_proc_msignal(struct usb_process *up, void *_pm0, void *_pm1) { struct usb_proc_msg *pm0 = _pm0; struct usb_proc_msg *pm1 = _pm1; @@ -314,14 +314,14 @@ usb2_proc_msignal(struct usb_process *up, void *_pm0, void *_pm1) } /*------------------------------------------------------------------------* - * usb2_proc_is_gone + * usb_proc_is_gone * * Return values: * 0: USB process is running * Else: USB process is tearing down *------------------------------------------------------------------------*/ uint8_t -usb2_proc_is_gone(struct usb_process *up) +usb_proc_is_gone(struct usb_process *up) { if (up->up_gone) return (1); @@ -331,14 +331,14 @@ usb2_proc_is_gone(struct usb_process *up) } /*------------------------------------------------------------------------* - * usb2_proc_mwait + * usb_proc_mwait * * This function will return when the USB process message pointed to * by "pm" is no longer on a queue. This function must be called * having "up->up_mtx" locked. *------------------------------------------------------------------------*/ void -usb2_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) +usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) { struct usb_proc_msg *pm0 = _pm0; struct usb_proc_msg *pm1 = _pm1; @@ -371,7 +371,7 @@ usb2_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) } /*------------------------------------------------------------------------* - * usb2_proc_drain + * usb_proc_drain * * This function will tear down an USB process, waiting for the * currently executing command to return. @@ -380,7 +380,7 @@ usb2_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) * this function does nothing. *------------------------------------------------------------------------*/ void -usb2_proc_drain(struct usb_process *up) +usb_proc_drain(struct usb_process *up) { /* check if not initialised */ if (up->up_mtx == NULL) |
