motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 07:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb destroy API change (Lonnie Mendez)

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2066 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-07-19 18:06:15 +00:00
parent 3b2ccc57c7
commit 059809e451
7 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
usb-linux.c
View file

@ -58,16 +58,8 @@ typedef struct USBHostDevice {
int fd;
} USBHostDevice;
static void usb_host_handle_reset(USBDevice *dev, int destroy)
static void usb_host_handle_reset(USBDevice *dev)
{
USBHostDevice *s = (USBHostDevice *)dev;
if (destroy) {
if (s->fd >= 0)
close(s->fd);
qemu_free(s);
return;
}
#if 0
USBHostDevice *s = (USBHostDevice *)dev;
/* USBDEVFS_RESET, but not the first time as it has already be
@ -76,6 +68,15 @@ static void usb_host_handle_reset(USBDevice *dev, int destroy)
#endif
}
static void usb_host_handle_destroy(USBDevice *dev)
{
USBHostDevice *s = (USBHostDevice *)dev;
if (s->fd >= 0)
close(s->fd);
qemu_free(s);
}
static int usb_host_handle_control(USBDevice *dev,
int request,
int value,
@ -244,6 +245,7 @@ USBDevice *usb_host_device_open(const char *devname)
dev->dev.handle_reset = usb_host_handle_reset;
dev->dev.handle_control = usb_host_handle_control;
dev->dev.handle_data = usb_host_handle_data;
dev->dev.handle_destroy = usb_host_handle_destroy;
if (product_name[0] == '\0')
snprintf(dev->dev.devname, sizeof(dev->dev.devname),