aboutsummaryrefslogtreecommitdiffstats
path: root/usb-bsd.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2011-08-04 14:54:19 +0200
committerGerd Hoffmann <kraxel@redhat.com>2011-08-04 15:47:51 +0200
commitfa57ee8ed246cfea53acd09663203deda64b4f33 (patch)
treefcfacc3a1004904414468f3db26f511bcec0fc06 /usb-bsd.c
parenta6f4e09d90cef88be07cd597c2f2a9f0b3ed0763 (diff)
re-activate usb-host for bsd
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>
Diffstat (limited to 'usb-bsd.c')
-rw-r--r--usb-bsd.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/usb-bsd.c b/usb-bsd.c
index 3b97eb491..ab8e3b729 100644
--- a/usb-bsd.c
+++ b/usb-bsd.c
@@ -62,7 +62,6 @@ typedef struct USBHostDevice {
} USBHostDevice;
-#if 0
static int ensure_ep_open(USBHostDevice *dev, int ep, int mode)
{
char buf[32];
@@ -110,7 +109,6 @@ static void ensure_eps_closed(USBHostDevice *dev)
epnum++;
}
}
-#endif
static void usb_host_handle_reset(USBDevice *dev)
{
@@ -119,7 +117,6 @@ static void usb_host_handle_reset(USBDevice *dev)
#endif
}
-#if 0
/* XXX:
* -check device states against transfer requests
* and return appropriate response
@@ -278,7 +275,6 @@ static int usb_host_handle_data(USBDevice *dev, USBPacket *p)
return ret;
}
}
-#endif
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)
{
struct usb_device_info bus_info, dev_info;
- USBDevice *d = NULL;
- USBHostDevice *dev, *ret = NULL;
+ USBDevice *d = NULL, *ret = NULL;
+ USBHostDevice *dev;
char ctlpath[PATH_MAX + 1];
char buspath[PATH_MAX + 1];
int bfd, dfd, bus, address, i;
@@ -408,10 +404,8 @@ static struct USBDeviceInfo usb_host_dev_info = {
.init = usb_host_initfn,
.handle_packet = usb_generic_handle_packet,
.handle_reset = usb_host_handle_reset,
-#if 0
.handle_control = usb_host_handle_control,
.handle_data = usb_host_handle_data,
-#endif
.handle_destroy = usb_host_handle_destroy,
};