svn commit: r188985 - head/sys/dev/usb
Andrew Thompson
thompsa at FreeBSD.org
Mon Feb 23 19:40:49 PST 2009
Author: thompsa
Date: Tue Feb 24 03:40:48 2009
New Revision: 188985
URL: http://svn.freebsd.org/changeset/base/188985
Log:
MFp4 //depot/projects/usb at 157909
Changes to make implementing USB NDIS easier.
Submitted by: Hans Petter Selasky
Modified:
head/sys/dev/usb/usb_device.c
head/sys/dev/usb/usb_device.h
head/sys/dev/usb/usb_request.c
head/sys/dev/usb/usb_request.h
Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c Tue Feb 24 03:40:09 2009 (r188984)
+++ head/sys/dev/usb/usb_device.c Tue Feb 24 03:40:48 2009 (r188985)
@@ -323,6 +323,40 @@ usb2_free_pipe_data(struct usb2_device *
}
/*------------------------------------------------------------------------*
+ * usb2_pipe_foreach
+ *
+ * This function will iterate all the USB endpoints except the control
+ * endpoint. This function is NULL safe.
+ *
+ * Return values:
+ * NULL: End of USB pipes
+ * Else: Pointer to next USB pipe
+ *------------------------------------------------------------------------*/
+struct usb2_pipe *
+usb2_pipe_foreach(struct usb2_device *udev, struct usb2_pipe *pipe)
+{
+ struct usb2_pipe *pipe_end = udev->pipes + USB_EP_MAX;
+
+ /* be NULL safe */
+ if (udev == NULL)
+ return (NULL);
+
+ /* get next pipe */
+ if (pipe == NULL)
+ pipe = udev->pipes;
+ else
+ pipe++;
+
+ /* find next allocated pipe */
+ while (pipe != pipe_end) {
+ if (pipe->edesc != NULL)
+ return (pipe);
+ pipe++;
+ }
+ return (NULL);
+}
+
+/*------------------------------------------------------------------------*
* usb2_fill_iface_data
*
* This function will fill in interface data and allocate USB pipes
@@ -1430,7 +1464,7 @@ usb2_alloc_device(device_t parent_dev, s
* 0. If this value is different from "USB_MAX_IPACKET" a new
* USB control request will be setup!
*/
- err = usb2_req_get_desc(udev, &Giant, &udev->ddesc,
+ err = usb2_req_get_desc(udev, &Giant, NULL, &udev->ddesc,
USB_MAX_IPACKET, USB_MAX_IPACKET, 0, UDESC_DEVICE, 0, 0);
if (err) {
DPRINTFN(0, "getting device descriptor "
Modified: head/sys/dev/usb/usb_device.h
==============================================================================
--- head/sys/dev/usb/usb_device.h Tue Feb 24 03:40:09 2009 (r188984)
+++ head/sys/dev/usb/usb_device.h Tue Feb 24 03:40:48 2009 (r188985)
@@ -183,5 +183,6 @@ void *usb2_find_descriptor(struct usb2_d
uint8_t subtype, uint8_t subtype_mask);
void usb_linux_free_device(struct usb_device *dev);
uint8_t usb2_peer_can_wakeup(struct usb2_device *udev);
+struct usb2_pipe *usb2_pipe_foreach(struct usb2_device *udev, struct usb2_pipe *pipe);
#endif /* _USB2_DEVICE_H_ */
Modified: head/sys/dev/usb/usb_request.c
==============================================================================
--- head/sys/dev/usb/usb_request.c Tue Feb 24 03:40:09 2009 (r188984)
+++ head/sys/dev/usb/usb_request.c Tue Feb 24 03:40:48 2009 (r188985)
@@ -615,17 +615,24 @@ done:
* argument specifies the minimum descriptor length. The "max_len"
* argument specifies the maximum descriptor length. If the real
* descriptor length is less than the minimum length the missing
- * byte(s) will be zeroed. The length field, first byte, of the USB
- * descriptor will get overwritten in case it indicates a length that
- * is too big. Also the type field, second byte, of the USB descriptor
- * will get forced to the correct type.
+ * byte(s) will be zeroed. The type field, the second byte of the USB
+ * descriptor, will get forced to the correct type. If the "actlen"
+ * pointer is non-NULL, the actual length of the transfer will get
+ * stored in the 16-bit unsigned integer which it is pointing to. The
+ * first byte of the descriptor will not get updated. If the "actlen"
+ * pointer is NULL the first byte of the descriptor will get updated
+ * to reflect the actual length instead. If "min_len" is not equal to
+ * "max_len" then this function will try to retrive the beginning of
+ * the descriptor and base the maximum length on the first byte of the
+ * descriptor.
*
* Returns:
* 0: Success
* Else: Failure
*------------------------------------------------------------------------*/
usb2_error_t
-usb2_req_get_desc(struct usb2_device *udev, struct mtx *mtx, void *desc,
+usb2_req_get_desc(struct usb2_device *udev,
+ struct mtx *mtx, uint16_t *actlen, void *desc,
uint16_t min_len, uint16_t max_len,
uint16_t id, uint8_t type, uint8_t index,
uint8_t retries)
@@ -667,11 +674,11 @@ usb2_req_get_desc(struct usb2_device *ud
if (min_len == max_len) {
- /* enforce correct type and length */
-
- if (buf[0] > min_len) {
+ /* enforce correct length */
+ if ((buf[0] > min_len) && (actlen == NULL))
buf[0] = min_len;
- }
+
+ /* enforce correct type */
buf[1] = type;
goto done;
@@ -693,6 +700,12 @@ usb2_req_get_desc(struct usb2_device *ud
min_len = max_len;
}
done:
+ if (actlen != NULL) {
+ if (err)
+ *actlen = 0;
+ else
+ *actlen = min_len;
+ }
return (err);
}
@@ -808,7 +821,7 @@ usb2_req_get_string_desc(struct usb2_dev
uint16_t max_len, uint16_t lang_id,
uint8_t string_index)
{
- return (usb2_req_get_desc(udev, mtx, sdesc, 2, max_len, lang_id,
+ return (usb2_req_get_desc(udev, mtx, NULL, sdesc, 2, max_len, lang_id,
UDESC_STRING, string_index, 0));
}
@@ -827,7 +840,7 @@ usb2_req_get_config_desc(struct usb2_dev
DPRINTFN(4, "confidx=%d\n", conf_index);
- err = usb2_req_get_desc(udev, mtx, d, sizeof(*d),
+ err = usb2_req_get_desc(udev, mtx, NULL, d, sizeof(*d),
sizeof(*d), 0, UDESC_CONFIG, conf_index, 0);
if (err) {
goto done;
@@ -878,7 +891,7 @@ usb2_req_get_config_desc_full(struct usb
if (cdesc == NULL) {
return (USB_ERR_NOMEM);
}
- err = usb2_req_get_desc(udev, mtx, cdesc, len, len, 0,
+ err = usb2_req_get_desc(udev, mtx, NULL, cdesc, len, len, 0,
UDESC_CONFIG, index, 3);
if (err) {
free(cdesc, mtype);
@@ -904,7 +917,7 @@ usb2_req_get_device_desc(struct usb2_dev
struct usb2_device_descriptor *d)
{
DPRINTFN(4, "\n");
- return (usb2_req_get_desc(udev, mtx, d, sizeof(*d),
+ return (usb2_req_get_desc(udev, mtx, NULL, d, sizeof(*d),
sizeof(*d), 0, UDESC_DEVICE, 0, 3));
}
@@ -1407,7 +1420,7 @@ retry:
usb2_pause_mtx(mtx, USB_MS_TO_TICKS(USB_SET_ADDRESS_SETTLE));
/* get the device descriptor */
- err = usb2_req_get_desc(udev, mtx, &udev->ddesc,
+ err = usb2_req_get_desc(udev, mtx, NULL, &udev->ddesc,
USB_MAX_IPACKET, USB_MAX_IPACKET, 0, UDESC_DEVICE, 0, 0);
if (err) {
DPRINTFN(0, "getting device descriptor "
Modified: head/sys/dev/usb/usb_request.h
==============================================================================
--- head/sys/dev/usb/usb_request.h Tue Feb 24 03:40:09 2009 (r188984)
+++ head/sys/dev/usb/usb_request.h Tue Feb 24 03:40:48 2009 (r188985)
@@ -50,8 +50,9 @@ usb2_error_t usb2_req_get_config_desc_fu
struct mtx *mtx, struct usb2_config_descriptor **ppcd,
struct malloc_type *mtype, uint8_t conf_index);
usb2_error_t usb2_req_get_desc(struct usb2_device *udev, struct mtx *mtx,
- void *desc, uint16_t min_len, uint16_t max_len, uint16_t id,
- uint8_t type, uint8_t index, uint8_t retries);
+ uint16_t *actlen, void *desc, uint16_t min_len,
+ uint16_t max_len, uint16_t id, uint8_t type,
+ uint8_t index, uint8_t retries);
usb2_error_t usb2_req_get_device_desc(struct usb2_device *udev, struct mtx *mtx,
struct usb2_device_descriptor *d);
usb2_error_t usb2_req_get_device_status(struct usb2_device *udev,
More information about the svn-src-all
mailing list