34c34
< * $FreeBSD: head/sys/dev/usb/usb_pf.h 218165 2011-02-01 10:25:48Z hselasky $
---
> * $FreeBSD: head/sys/dev/usb/usb_pf.h 220301 2011-04-03 20:03:45Z hselasky $
40a41
> uint32_t up_totlen; /* Total length including all headers */
42,43c43,46
< uint8_t up_address; /* USB device address */
< uint8_t up_endpoint; /* USB endpoint */
---
> uint8_t up_address; /* USB device index */
> uint8_t up_mode; /* Mode of transfer */
> #define USBPF_MODE_HOST 0
> #define USBPF_MODE_DEVICE 1
45c48
< uint8_t up_xfertype; /* Transfer type */
---
> uint8_t up_xfertype; /* Transfer type, see USB2.0 spec. */
70d72
< #if USB_HAVE_BUSDMA
74d75
< #endif
79,82c80,86
< uint32_t up_length; /* Total data length (submit/actual) */
< uint32_t up_frames; /* USB frame number (submit/actual) */
< uint32_t up_error; /* usb_error_t */
< uint32_t up_interval; /* for interrupt and isoc */
---
> uint32_t up_error; /* USB error, see USB_ERR_XXX */
> uint32_t up_interval; /* For interrupt and isoc (ms) */
> uint32_t up_frames; /* Number of following frames */
> uint32_t up_packet_size; /* Packet size used */
> uint32_t up_packet_count; /* Packet count used */
> uint32_t up_endpoint; /* USB endpoint / stream ID */
> uint8_t up_speed; /* USB speed, see USB_SPEED_XXX */
84c88
< uint8_t up_reserved[96];
---
> uint8_t up_reserved[83];
87c91,101
< #define USBPF_HDR_LEN 128
---
> struct usbpf_framehdr {
> /*
> * The frame length field excludes length of frame header and
> * any alignment.
> */
> uint32_t length;
> #define USBPF_FRAME_ALIGN(x) (((x) + 3) & ~3)
> uint32_t flags;
> #define USBPF_FRAMEFLAG_READ (1 << 0)
> #define USBPF_FRAMEFLAG_DATA_FOLLOWS (1 << 1)
> };
88a103,110
> #define USBPF_HDR_LEN 128 /* bytes */
> #define USBPF_FRAME_HDR_LEN 8 /* bytes */
>
> extern uint8_t usbpf_pkthdr_size_ok[
> (sizeof(struct usbpf_pkthdr) == USBPF_HDR_LEN) ? 1 : -1];
> extern uint8_t usbpf_framehdr_size_ok[
> (sizeof(struct usbpf_framehdr) == USBPF_FRAME_HDR_LEN) ? 1 : -1];
>