diff options
| author | Andrew Thompson <thompsa@FreeBSD.org> | 2009-05-29 18:46:57 +0000 |
|---|---|---|
| committer | Andrew Thompson <thompsa@FreeBSD.org> | 2009-05-29 18:46:57 +0000 |
| commit | e0a69b51ac09dc0376611274903ba683e2d1ace7 (patch) | |
| tree | 5ff9fef81906105040348e5e28fafc3efac89f62 /sys/dev/usb/usb_compat_linux.h | |
| parent | 623469c996b7c4bfdb768b72564d8e3d6ff21396 (diff) | |
| download | src-e0a69b51ac09dc0376611274903ba683e2d1ace7.tar.gz src-e0a69b51ac09dc0376611274903ba683e2d1ace7.zip | |
s/usb2_/usb_/ on all typedefs for the USB stack.
Notes
Notes:
svn path=/head/; revision=193045
Diffstat (limited to 'sys/dev/usb/usb_compat_linux.h')
| -rw-r--r-- | sys/dev/usb/usb_compat_linux.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/usb/usb_compat_linux.h b/sys/dev/usb/usb_compat_linux.h index 6f3e1e8401e9..0d2446b9ed85 100644 --- a/sys/dev/usb/usb_compat_linux.h +++ b/sys/dev/usb/usb_compat_linux.h @@ -278,10 +278,10 @@ struct urb { void *context; /* (in) context for completion */ usb_complete_t *complete; /* (in) completion routine */ - usb2_size_t transfer_buffer_length;/* (in) data buffer length */ - usb2_size_t bsd_length_rem; - usb2_size_t actual_length; /* (return) actual transfer length */ - usb2_timeout_t timeout; /* FreeBSD specific */ + size_t transfer_buffer_length;/* (in) data buffer length */ + size_t bsd_length_rem; + size_t actual_length; /* (return) actual transfer length */ + usb_timeout_t timeout; /* FreeBSD specific */ uint16_t transfer_flags; /* (in) */ #define URB_SHORT_NOT_OK 0x0001 /* report short transfers like errors */ @@ -292,8 +292,8 @@ struct urb { #define URB_WAIT_WAKEUP 0x0010 /* custom flags */ #define URB_IS_SLEEPING 0x0020 /* custom flags */ - usb2_frcount_t start_frame; /* (modify) start frame (ISO) */ - usb2_frcount_t number_of_packets; /* (in) number of ISO packets */ + usb_frcount_t start_frame; /* (modify) start frame (ISO) */ + usb_frcount_t number_of_packets; /* (in) number of ISO packets */ uint16_t interval; /* (modify) transfer interval * (INT/ISO) */ uint16_t error_count; /* (return) number of ISO errors */ @@ -313,11 +313,11 @@ int usb_unlink_urb(struct urb *urb); int usb_clear_halt(struct usb_device *dev, struct usb_host_endpoint *uhe); int usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *pipe, uint8_t request, uint8_t requesttype, uint16_t value, - uint16_t index, void *data, uint16_t size, usb2_timeout_t timeout); + uint16_t index, void *data, uint16_t size, usb_timeout_t timeout); int usb_set_interface(struct usb_device *dev, uint8_t ifnum, uint8_t alternate); int usb_setup_endpoint(struct usb_device *dev, - struct usb_host_endpoint *uhe, usb2_frlength_t bufsize); + struct usb_host_endpoint *uhe, usb_frlength_t bufsize); struct usb_host_endpoint *usb_find_host_endpoint(struct usb_device *dev, uint8_t type, uint8_t ep); @@ -326,11 +326,11 @@ struct usb_host_interface *usb_altnum_to_altsetting( const struct usb_interface *intf, uint8_t alt_index); struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, uint8_t iface_no); -void *usb_buffer_alloc(struct usb_device *dev, usb2_size_t size, +void *usb_buffer_alloc(struct usb_device *dev, size_t size, uint16_t mem_flags, uint8_t *dma_addr); void *usb_get_intfdata(struct usb_interface *intf); -void usb_buffer_free(struct usb_device *dev, usb2_size_t size, void *addr, uint8_t dma_addr); +void usb_buffer_free(struct usb_device *dev, size_t size, void *addr, uint8_t dma_addr); void usb_free_urb(struct urb *urb); void usb_init_urb(struct urb *urb); void usb_kill_urb(struct urb *urb); |