rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-17 23:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

USB: Update to FreeBSD trunk 2015-11-10

Browse Source
This commit is contained in:
Sebastian Huber
2015-11-12 13:01:12 +01:00
parent c1644467b1
commit 02279d6272
49 changed files with 2001 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
freebsd/sys/dev/usb/usb_parse.c
View File

@@ -26,6 +26,9 @@
* SUCH DAMAGE.
*/
#ifdef USB_GLOBAL_INCLUDE_FILE
#include USB_GLOBAL_INCLUDE_FILE
#else
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <rtems/bsd/sys/param.h>
@@ -49,6 +52,11 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#define USB_DEBUG_VAR usb_debug
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_debug.h>
#endif /* USB_GLOBAL_INCLUDE_FILE */
/*------------------------------------------------------------------------*
* usb_desc_foreach
@@ -141,7 +149,7 @@ usb_idesc_foreach(struct usb_config_descriptor *cd,
}
if (ps->desc == NULL) {
/* first time */
/* first time or zero descriptors */
} else if (new_iface) {
/* new interface */
ps->iface_index ++;
@@ -150,6 +158,14 @@ usb_idesc_foreach(struct usb_config_descriptor *cd,
/* new alternate interface */
ps->iface_index_alt ++;
}
#if (USB_IFACE_MAX <= 0)
#error "USB_IFACE_MAX must be defined greater than zero"
#endif
/* check for too many interfaces */
if (ps->iface_index >= USB_IFACE_MAX) {
DPRINTF("Interface limit reached\n");
id = NULL;
}
/* store and return current descriptor */
ps->desc = (struct usb_descriptor *)id;