PERFORCE change 106215 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sat Sep 16 10:55:36 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=106215
Change 106215 by hselasky at hselasky_mini_itx on 2006/09/16 17:55:29
Undo change 106147 until further, to reduce the
number of differences between FreeBSD-7-current
and the USB project.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#19 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#19 (text+ko) ====
@@ -142,29 +142,29 @@
}
}
#ifdef USBVERBOSE
- if ((vendor == NULL) || (product == NULL)) {
+ if (vendor == NULL || product == NULL) {
for(kdp = usb_knowndevs;
kdp->vendorname != NULL;
kdp++) {
- if ((kdp->vendor == UGETW(udd->idVendor)) &&
- ((kdp->product == UGETW(udd->idProduct)) ||
- (kdp->flags & USB_KNOWNDEV_NOPROD)))
+ if (kdp->vendor == UGETW(udd->idVendor) &&
+ (kdp->product == UGETW(udd->idProduct) ||
+ (kdp->flags & USB_KNOWNDEV_NOPROD) != 0))
break;
}
if (kdp->vendorname != NULL) {
if (vendor == NULL)
vendor = kdp->vendorname;
if (product == NULL)
- product = ((kdp->flags & USB_KNOWNDEV_NOPROD) == 0) ?
+ product = (kdp->flags & USB_KNOWNDEV_NOPROD) == 0 ?
kdp->productname : NULL;
}
}
#endif
- if ((vendor != NULL) && *vendor)
+ if (vendor != NULL && *vendor)
strcpy(v, vendor);
else
sprintf(v, "vendor 0x%04x", UGETW(udd->idVendor));
- if ((product != NULL) && *product)
+ if (product != NULL && *product)
strcpy(p, product);
else
sprintf(p, "product 0x%04x", UGETW(udd->idProduct));
More information about the p4-projects
mailing list