diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-14 08:05:40 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-02-14 08:05:40 -0500 |
| commit | b5d68a3c28d0b7a947373344cbda2a2369d0b67d (patch) | |
| tree | 56115103f327201bc30b76df8d06368963ccebb5 | |
| parent | 99038f96fd458848c18d63db8cc7668cc8f1a1c7 (diff) | |
| download | system_core-b5d68a3c28d0b7a947373344cbda2a2369d0b67d.zip system_core-b5d68a3c28d0b7a947373344cbda2a2369d0b67d.tar.gz system_core-b5d68a3c28d0b7a947373344cbda2a2369d0b67d.tar.bz2 | |
libusbhost: Save endpoint ID in usb_request struct
Change-Id: I2cf189cee67c2efbcf919c8bae1447a6cb112f02
Signed-off-by: Mike Lockwood <lockwood@android.com>
| -rw-r--r-- | include/usbhost/usbhost.h | 5 | ||||
| -rw-r--r-- | libusbhost/usbhost.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/usbhost/usbhost.h b/include/usbhost/usbhost.h index c330cab..9a6b59c 100644 --- a/include/usbhost/usbhost.h +++ b/include/usbhost/usbhost.h @@ -47,6 +47,7 @@ struct usb_request int actual_length; int max_packet_size; void *private_data; /* struct usbdevfs_urb* */ + int endpoint; void *client_data; /* free for use by client */ }; @@ -185,7 +186,9 @@ int usb_device_control_transfer(struct usb_device *device, int length, unsigned int timeout); -/* Reads or writes on a bulk endpoint */ +/* Reads or writes on a bulk endpoint. + * Returns number of bytes transferred, or negative value for error. + */ int usb_device_bulk_transfer(struct usb_device *device, int endpoint, void* buffer, diff --git a/libusbhost/usbhost.c b/libusbhost/usbhost.c index 576ee00..f5a7c3f 100644 --- a/libusbhost/usbhost.c +++ b/libusbhost/usbhost.c @@ -512,6 +512,7 @@ struct usb_request *usb_request_new(struct usb_device *dev, req->dev = dev; req->max_packet_size = __le16_to_cpu(ep_desc->wMaxPacketSize); req->private_data = urb; + req->endpoint = urb->endpoint; urb->usercontext = req; return req; |