OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

re-activate usb-host for bsd

Browse Source 
A bunch of code was disabled via #if 0, for a quite long time (since
Sept 2009).  Surprisingly the code builds just fine when they are
removed (tested on OpenBSD).  /me wonders nevertheless whenever there
are any users of those bits when this went unnoticed for almost two
years ...

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2011-08-04 14:54:19 +02:00
parent a6f4e09d90
commit fa57ee8ed2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usb-bsd.c
View File

@ -62,7 +62,6 @@ typedef struct USBHostDevice {
} USBHostDevice; } USBHostDevice;
#if 0
static int ensure_ep_open(USBHostDevice *dev, int ep, int mode) static int ensure_ep_open(USBHostDevice *dev, int ep, int mode)
{ {
char buf[32]; char buf[32];
@ -110,7 +109,6 @@ static void ensure_eps_closed(USBHostDevice *dev)
epnum++; epnum++;
} }
} }
#endif
static void usb_host_handle_reset(USBDevice *dev) static void usb_host_handle_reset(USBDevice *dev)
{ {
@ -119,7 +117,6 @@ static void usb_host_handle_reset(USBDevice *dev)
#endif #endif
} }
#if 0
/* XXX: /* XXX:
* -check device states against transfer requests * -check device states against transfer requests
* and return appropriate response * and return appropriate response
@ -278,7 +275,6 @@ static int usb_host_handle_data(USBDevice *dev, USBPacket *p)
return ret; return ret;
} }
} }
#endif
static void usb_host_handle_destroy(USBDevice *opaque) static void usb_host_handle_destroy(USBDevice *opaque)
{ {
@ -305,8 +301,8 @@ static int usb_host_initfn(USBDevice *dev)
USBDevice *usb_host_device_open(const char *devname) USBDevice *usb_host_device_open(const char *devname)
{ {
struct usb_device_info bus_info, dev_info; struct usb_device_info bus_info, dev_info;
USBDevice *d = NULL; USBDevice *d = NULL, *ret = NULL;
USBHostDevice *dev, *ret = NULL; USBHostDevice *dev;
char ctlpath[PATH_MAX + 1]; char ctlpath[PATH_MAX + 1];
char buspath[PATH_MAX + 1]; char buspath[PATH_MAX + 1];
int bfd, dfd, bus, address, i; int bfd, dfd, bus, address, i;
@ -408,10 +404,8 @@ static struct USBDeviceInfo usb_host_dev_info = {
.init = usb_host_initfn, .init = usb_host_initfn,
.handle_packet = usb_generic_handle_packet, .handle_packet = usb_generic_handle_packet,
.handle_reset = usb_host_handle_reset, .handle_reset = usb_host_handle_reset,
#if 0
.handle_control = usb_host_handle_control, .handle_control = usb_host_handle_control,
.handle_data = usb_host_handle_data, .handle_data = usb_host_handle_data,
#endif
.handle_destroy = usb_host_handle_destroy, .handle_destroy = usb_host_handle_destroy,
}; };