diff options
Diffstat (limited to 'sys/dev/usb/usb_compat_linux.c')
| -rw-r--r-- | sys/dev/usb/usb_compat_linux.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/usb/usb_compat_linux.c b/sys/dev/usb/usb_compat_linux.c index b422df1..9641a81 100644 --- a/sys/dev/usb/usb_compat_linux.c +++ b/sys/dev/usb/usb_compat_linux.c @@ -67,7 +67,7 @@ static usb2_callback_t usb_linux_non_isoc_callback; static usb_complete_t usb_linux_wait_complete; static uint16_t usb_max_isoc_frames(struct usb_device *); -static int usb_start_wait_urb(struct urb *, uint32_t, uint16_t *); +static int usb_start_wait_urb(struct urb *, usb2_timeout_t, uint16_t *); static const struct usb_device_id *usb_linux_lookup_id( const struct usb_device_id *, struct usb2_attach_arg *); static struct usb_driver *usb_linux_get_usb_driver(struct usb_linux_softc *); @@ -564,7 +564,7 @@ usb_clear_halt(struct usb_device *dev, struct usb_host_endpoint *uhe) * Linux USB transfers. *------------------------------------------------------------------------*/ static int -usb_start_wait_urb(struct urb *urb, uint32_t timeout, uint16_t *p_actlen) +usb_start_wait_urb(struct urb *urb, usb2_timeout_t timeout, uint16_t *p_actlen) { int err; @@ -620,7 +620,7 @@ int usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *uhe, uint8_t request, uint8_t requesttype, uint16_t value, uint16_t index, void *data, - uint16_t size, uint32_t timeout) + uint16_t size, usb2_timeout_t timeout) { struct usb2_device_request req; struct urb *urb; @@ -741,7 +741,7 @@ usb_set_interface(struct usb_device *dev, uint8_t iface_no, uint8_t alt_index) *------------------------------------------------------------------------*/ int usb_setup_endpoint(struct usb_device *dev, - struct usb_host_endpoint *uhe, uint32_t bufsize) + struct usb_host_endpoint *uhe, usb2_size_t bufsize) { struct usb2_config cfg[2]; uint8_t type = uhe->desc.bmAttributes & UE_XFERTYPE; @@ -836,7 +836,7 @@ usb_linux_create_usb_device(struct usb2_device *udev, device_t dev) struct usb_interface *p_ui = NULL; struct usb_host_interface *p_uhi = NULL; struct usb_host_endpoint *p_uhe = NULL; - uint32_t size; + usb2_size_t size; uint16_t niface_total; uint16_t nedesc; uint16_t iface_no_curr; @@ -971,7 +971,7 @@ struct urb * usb_alloc_urb(uint16_t iso_packets, uint16_t mem_flags) { struct urb *urb; - uint32_t size; + usb2_size_t size; if (iso_packets == 0xFFFF) { /* @@ -1102,7 +1102,7 @@ usb_ifnum_to_if(struct usb_device *dev, uint8_t iface_no) * usb_buffer_alloc *------------------------------------------------------------------------*/ void * -usb_buffer_alloc(struct usb_device *dev, uint32_t size, uint16_t mem_flags, uint8_t *dma_addr) +usb_buffer_alloc(struct usb_device *dev, usb2_size_t size, uint16_t mem_flags, uint8_t *dma_addr) { return (malloc(size, M_USBDEV, M_WAITOK | M_ZERO)); } @@ -1193,7 +1193,7 @@ usb_linux_free_device(struct usb_device *dev) * usb_buffer_free *------------------------------------------------------------------------*/ void -usb_buffer_free(struct usb_device *dev, uint32_t size, +usb_buffer_free(struct usb_device *dev, usb2_size_t size, void *addr, uint8_t dma_addr) { free(addr, M_USBDEV); @@ -1326,9 +1326,9 @@ usb_linux_complete(struct usb2_xfer *xfer) static void usb_linux_isoc_callback(struct usb2_xfer *xfer) { - uint32_t max_frame = xfer->max_frame_size; - uint32_t offset; - uint16_t x; + usb2_frlength_t max_frame = xfer->max_frame_size; + usb2_frlength_t offset; + usb2_frcount_t x; struct urb *urb = xfer->priv_fifo; struct usb_host_endpoint *uhe = xfer->priv_sc; struct usb_iso_packet_descriptor *uipd; @@ -1500,7 +1500,7 @@ usb_linux_non_isoc_callback(struct usb2_xfer *xfer) struct urb *urb = xfer->priv_fifo; struct usb_host_endpoint *uhe = xfer->priv_sc; uint8_t *ptr; - uint32_t max_bulk = xfer->max_data_length; + usb2_frlength_t max_bulk = xfer->max_data_length; uint8_t data_frame = xfer->flags_int.control_xfr ? 1 : 0; DPRINTF("\n"); |
