zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rlink: eliminate spurious indentation 

Rework rlink_init to use less indentation.  Best viewed with diff -w.
__archive__
Zachary T Welch 2009-11-19 12:12:21 -08:00
parent de9a182ca6
commit ec5e484fd6
1 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/jtag/rlink/rlink.c
View File

@ -1635,66 +1635,65 @@ int rlink_init(void)
for (dev = bus->devices; dev; dev = dev->next) for (dev = bus->devices; dev; dev = dev->next)
{ {
if ((dev->descriptor.idVendor == USB_IDVENDOR) && (dev->descriptor.idProduct == USB_IDPRODUCT)) if ((dev->descriptor.idVendor != USB_IDVENDOR) ||
(dev->descriptor.idProduct != USB_IDPRODUCT))
{ {
found = 1; continue;
LOG_DEBUG("Found device on bus.\n"); }
found = 1;
LOG_DEBUG("Found device on bus.\n");
do if (dev->descriptor.bNumConfigurations > 1)
{
LOG_ERROR("Whoops! NumConfigurations is not 1, don't know what to do...\n");
break;
}
if (dev->config->bNumInterfaces > 1)
{
LOG_ERROR("Whoops! NumInterfaces is not 1, don't know what to do...\n");
break;
}
pHDev = usb_open(dev);
if (!pHDev)
{
LOG_ERROR ("Failed to open device.\n");
break;
}
LOG_DEBUG("Opened device, pHDev = %p\n",pHDev);
/* usb_set_configuration required under win32 */
usb_set_configuration(pHDev, dev->config[0].bConfigurationValue);
retries = 3;
do
{
i = usb_claim_interface(pHDev,0);
if (i)
{ {
if (dev->descriptor.bNumConfigurations > 1) LOG_ERROR("usb_claim_interface: %s", usb_strerror());
{
LOG_ERROR("Whoops! NumConfigurations is not 1, don't know what to do...\n");
break;
}
if (dev->config->bNumInterfaces > 1)
{
LOG_ERROR("Whoops! NumInterfaces is not 1, don't know what to do...\n");
break;
}
pHDev = usb_open(dev);
if (!pHDev)
LOG_ERROR ("Failed to open device.\n");
else
{
LOG_DEBUG("Opened device, pHDev = %p\n",pHDev);
/* usb_set_configuration required under win32 */
usb_set_configuration(pHDev, dev->config[0].bConfigurationValue);
retries = 3;
do
{
i = usb_claim_interface(pHDev,0);
if (i)
{
LOG_ERROR("usb_claim_interface: %s", usb_strerror());
#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP #ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
j = usb_detach_kernel_driver_np(pHDev, 0); j = usb_detach_kernel_driver_np(pHDev, 0);
if (j) if (j)
LOG_ERROR("detach kernel driver: %s", usb_strerror()); LOG_ERROR("detach kernel driver: %s", usb_strerror());
#endif #endif
} }
else else
{ {
LOG_DEBUG("interface claimed!\n"); LOG_DEBUG("interface claimed!\n");
break; break;
} }
} while (--retries); } while (--retries);
if (!i) if (!i)
{ {
if (usb_set_altinterface(pHDev,0)) if (usb_set_altinterface(pHDev,0))
{ {
LOG_ERROR("Failed to set interface.\n"); LOG_ERROR("Failed to set interface.\n");
break; break;
} }
else else
success = 1; success = 1;
}
}
} while (0);
} }
} }
} }