diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-05-21 13:43:59 +0100 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-05-21 13:43:59 +0100 |
| commit | 1688e69d7c704e050b9cb8218a767477e1a5548e (patch) | |
| tree | 3a11eb79446c4d4fba4cd1a2669a2ac6868792ce | |
| parent | 006828e61c3e63e0f3a688038110d4193af33b17 (diff) | |
| download | libusb-1688e69d7c704e050b9cb8218a767477e1a5548e.tar.gz | |
use LIBUSB_DEVADDR_MAX for HCDspbr279
Using 0 can conflict with driverless devices.
| -rw-r--r-- | libusb/os/windows_usb.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index fcc2735..760ab9f 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -835,9 +835,9 @@ static int usb_enumerate_hub(struct libusb_context *ctx, struct discovered_devs continue; } - if (conn_info.DeviceAddress == 0) { - usbi_warn(ctx, "program assertion failed - device address is zero " - "(conflicts with root hub), ignoring device"); + if (conn_info.DeviceAddress == LIBUSB_DEVADDR_MAX) { + usbi_warn(ctx, "program assertion failed - device address is %d " + "(conflicts with root hub), ignoring device", LIBUSB_DEVADDR_MAX); continue; } @@ -846,7 +846,7 @@ static int usb_enumerate_hub(struct libusb_context *ctx, struct discovered_devs else { // HCDs have only 1 node, and it's always a hub - conn_info.DeviceAddress = 0; + conn_info.DeviceAddress = LIBUSB_DEVADDR_MAX; // using 0 can conflict with driverless devices conn_info.DeviceIsHub = true; conn_info.CurrentConfigurationValue = 1; } @@ -902,7 +902,8 @@ static int usb_enumerate_hub(struct libusb_context *ctx, struct discovered_devs // Generate a session ID // Will need to change the session_id computation if this assertion fails if (conn_info.DeviceAddress > LIBUSB_DEVADDR_MAX) { - usbi_warn(ctx, "program assertion failed - device address is greater than 255, ignoring device"); + usbi_warn(ctx, "program assertion failed - device address is greater than %d, ignoring device", + LIBUSB_DEVADDR_MAX); continue; } else { devaddr = (uint8_t)conn_info.DeviceAddress; |