Define a few structures instead of including a file, add "static"

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5225 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-09-15 14:57:11 +00:00
parent fe25591e7b
commit d9cf15784f
1 changed files with 20 additions and 2 deletions

View File

@ -35,11 +35,29 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <signal.h> #include <signal.h>
#include <linux/usb/ch9.h>
#include <linux/usbdevice_fs.h> #include <linux/usbdevice_fs.h>
#include <linux/version.h> #include <linux/version.h>
#include "hw/usb.h" #include "hw/usb.h"
/* We redefine it to avoid version problems */
struct usb_ctrltransfer {
uint8_t bRequestType;
uint8_t bRequest;
uint16_t wValue;
uint16_t wIndex;
uint16_t wLength;
uint32_t timeout;
void *data;
};
struct usb_ctrlrequest {
uint8_t bRequestType;
uint8_t bRequest;
uint16_t wValue;
uint16_t wIndex;
uint16_t wLength;
};
typedef int USBScanFunc(void *opaque, int bus_num, int addr, int class_id, typedef int USBScanFunc(void *opaque, int bus_num, int addr, int class_id,
int vendor_id, int product_id, int vendor_id, int product_id,
const char *product_name, int speed); const char *product_name, int speed);
@ -710,7 +728,7 @@ static int do_token_out(USBDevice *dev, USBPacket *p)
* *
* Returns length of the transaction or one of the USB_RET_XXX codes. * Returns length of the transaction or one of the USB_RET_XXX codes.
*/ */
int usb_host_handle_packet(USBDevice *s, USBPacket *p) static int usb_host_handle_packet(USBDevice *s, USBPacket *p)
{ {
switch(p->pid) { switch(p->pid) {
case USB_MSG_ATTACH: case USB_MSG_ATTACH: