Fixed the compiling with DBG set to 1. Modified: trunk/reactos/drivers/usb/cromwell/core/config.c Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c _____
Modified: trunk/reactos/drivers/usb/cromwell/core/config.c --- trunk/reactos/drivers/usb/cromwell/core/config.c 2005-06-03 12:30:09 UTC (rev 15747) +++ trunk/reactos/drivers/usb/cromwell/core/config.c 2005-06-03 16:04:40 UTC (rev 15748) @@ -453,8 +453,9 @@
/* configuration is */ result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, 8); if (result < 8) { - if (result < 0) + if (result < 0) { err("unable to get descriptor"); + } else { err("config descriptor too short (expected %i, got %i)", 8, result); result = -EINVAL; _____
Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c --- trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-03 12:30:09 UTC (rev 15747) +++ trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-03 16:04:40 UTC (rev 15748) @@ -289,9 +289,10 @@
int ret;
ret = get_hub_status(dev, &hub->status->hub); - if (ret < 0) + if (ret < 0) { dev_err (hubdev (dev), "%s failed (err = %d)\n", __FUNCTION__, ret); + } else { *status = le16_to_cpu(hub->status->hub.wHubStatus); *change = le16_to_cpu(hub->status->hub.wHubChange); @@ -703,9 +704,10 @@ int ret;
ret = get_port_status(dev, port + 1, &hub->status->port); - if (ret < 0) + if (ret < 0) { dev_err (hubdev (dev), "%s failed (err = %d)\n", __FUNCTION__, ret); + } else { *status = le16_to_cpu(hub->status->port.wPortStatus); *change = le16_to_cpu(hub->status->port.wPortChange); @@ -1115,8 +1117,9 @@ } /* end for i */
/* deal with hub status changes */ - if (hub_hub_status(hub, &hubstatus, &hubchange) < 0) + if (hub_hub_status(hub, &hubstatus, &hubchange) < 0) { dev_err (&hub->intf->dev, "get_hub_status failed\n"); + } else { if (hubchange & HUB_CHANGE_LOCAL_POWER) { dev_dbg (&hub->intf->dev, "power change\n"); @@ -1321,15 +1324,16 @@
ret = usb_get_device_descriptor(dev); if (ret < sizeof(dev->descriptor)) { - if (ret < 0) + if (ret < 0) { err("unable to get device %s descriptor " "(error=%d)", dev->devpath, ret); - else + } + else { err("USB device %s descriptor short read " "(expected %Zi, got %i)", dev->devpath, sizeof(dev->descriptor), ret); - + } clear_bit(dev->devnum, dev->bus->devmap.devicemap); dev->devnum = -1; return -EIO; _____
Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c --- trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-06-03 12:30:09 UTC (rev 15747) +++ trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-06-03 16:04:40 UTC (rev 15748) @@ -275,12 +275,13 @@
return;
// FIXME change API to report an error in this case - if (iface->driver) + if (iface->driver) { err ("%s driver booted %s off interface %p", driver->name, iface->driver->name, iface); - else + } + else { dbg("%s driver claimed interface %p", driver->name, iface); - + } iface->driver = driver; usb_set_intfdata(iface, priv); } @@ -1139,10 +1140,12 @@ }
if (err < 8) { - if (err < 0) + if (err < 0) { dev_err(&dev->dev, "USB device not responding, giving up (error=%d)\n", err); - else + } + else { dev_err(&dev->dev, "USB device descriptor short read (expected %i, got %i)\n", 8, err); + } clear_bit(dev->devnum, dev->bus->devmap.devicemap); dev->devnum = -1; return 1; @@ -1156,11 +1159,13 @@
err = usb_get_device_descriptor(dev); if (err < (signed)sizeof(dev->descriptor)) { - if (err < 0) + if (err < 0) { dev_err(&dev->dev, "unable to get device descriptor (error=%d)\n", err); - else + } + else { dev_err(&dev->dev, "USB device descriptor short read (expected %Zi, got %i)\n", sizeof(dev->descriptor), err); + } clear_bit(dev->devnum, dev->bus->devmap.devicemap); dev->devnum = -1;
-
hbirr＠svn.reactos.com