talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make USB packet filtering code optional. 

Approved by:	thompsa (mentor)
This commit is contained in:
Hans Petter Selasky 2011-01-18 21:18:51 +00:00
parent 0d5ccb45d8
commit 8be0933446
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/usb/controller/usb_controller.c
View File

@ -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;

1
sys/dev/usb/usb_freebsd.h
View File

@ -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

9
sys/dev/usb/usb_transfer.c
View File

@ -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);