diff options
| -rw-r--r-- | sys/dev/usb/controller/usb_controller.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usb_freebsd.h | 1 | ||||
| -rw-r--r-- | sys/dev/usb/usb_transfer.c | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index 867f8c537d44..408390c86a73 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -206,8 +206,9 @@ usb_detach(device_t dev) usb_proc_free(&bus->control_xfer_proc); +#if USB_HAVE_PF usbpf_detach(bus); - +#endif return (0); } @@ -436,8 +437,9 @@ usb_attach_sub(device_t dev, struct usb_bus *bus) usb_devclass_ptr = devclass_find("usbus"); mtx_unlock(&Giant); +#if USB_HAVE_PF usbpf_attach(bus); - +#endif /* Initialise USB process messages */ bus->explore_msg[0].hdr.pm_callback = &usb_bus_explore; bus->explore_msg[0].bus = bus; diff --git a/sys/dev/usb/usb_freebsd.h b/sys/dev/usb/usb_freebsd.h index efc27f20990d..49aa47149ca6 100644 --- a/sys/dev/usb/usb_freebsd.h +++ b/sys/dev/usb/usb_freebsd.h @@ -41,6 +41,7 @@ #define USB_HAVE_TT_SUPPORT 1 #define USB_HAVE_POWERD 1 #define USB_HAVE_MSCTEST 1 +#define USB_HAVE_PF 1 #define USB_TD_GET_PROC(td) (td)->td_proc #define USB_PROC_GET_GID(td) (td)->p_pgid diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c index b355d1ade4b1..11d67d580e30 100644 --- a/sys/dev/usb/usb_transfer.c +++ b/sys/dev/usb/usb_transfer.c @@ -2196,9 +2196,10 @@ usbd_callback_wrapper(struct usb_xfer_queue *pq) } } +#if USB_HAVE_PF if (xfer->usb_state != USB_ST_SETUP) usbpf_xfertap(xfer, USBPF_XFERTAP_DONE); - +#endif /* call processing routine */ (xfer->callback) (xfer, xfer->error); @@ -2386,8 +2387,9 @@ usbd_transfer_start_cb(void *arg) DPRINTF("start\n"); +#if USB_HAVE_PF usbpf_xfertap(xfer, USBPF_XFERTAP_SUBMIT); - +#endif /* start the transfer */ (ep->methods->start) (xfer); @@ -2565,8 +2567,9 @@ usbd_pipe_start(struct usb_xfer_queue *pq) } DPRINTF("start\n"); +#if USB_HAVE_PF usbpf_xfertap(xfer, USBPF_XFERTAP_SUBMIT); - +#endif /* start USB transfer */ (ep->methods->start) (xfer); |