merged trunk changes

This commit is contained in:
Markus Fröschle
2013-05-12 06:30:17 +00:00
parent 56b822fa5f
commit a95752d243
16 changed files with 800 additions and 60 deletions

View File

@@ -34,6 +34,7 @@
#include "mod_devicetable.h"
#include "pci_ids.h"
#include "part.h"
#include "wait.h"
#ifdef PCI_XBIOS
@@ -337,7 +338,7 @@ int usb_bulk_msg(struct usb_device *dev, unsigned int pipe, void *data, int len,
int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int transfer_len, int interval);
void usb_disable_asynch(int disable);
int usb_maxpacket(struct usb_device *dev, unsigned long pipe);
inline void wait_ms(unsigned long ms);
int usb_get_configuration_no(struct usb_device *dev, unsigned char *buffer, int cfgno);
int usb_get_report(struct usb_device *dev, int ifnum, unsigned char type, unsigned char id, void *buf, int size);
int usb_get_class_descriptor(struct usb_device *dev, int ifnum, unsigned char type, unsigned char id, void *buf, int size);