PERFORCE change 133582 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Fri Jan 18 11:52:12 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=133582
Change 133582 by hselasky at hselasky_laptop001 on 2008/01/18 19:51:15
One of my scripts had mistakenly converted "USBD_SHORT_XFER_OK" into
"USBD_ERR_SHORT_XFER_OK". Fix this.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/uchcom.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#41 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#32 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#107 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#35 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#22 (text+ko) ====
@@ -434,7 +434,7 @@
goto done;
}
err = usbd_do_request_flags(sc->sc_udev, &Giant, req,
- data, USBD_ERR_SHORT_XFER_OK, &actlen, 1000);
+ data, USBD_SHORT_XFER_OK, &actlen, 1000);
if (err) {
DPRINTFN(-1, "device request failed, err=%s "
==== //depot/projects/usb/src/sys/dev/usb/ugen.c#38 (text+ko) ====
@@ -1901,7 +1901,7 @@
}
error = usbd_do_request_flags
(sc->sc_udev, NULL, &ur->ucr_request, data,
- (ur->ucr_flags & USBD_ERR_SHORT_XFER_OK), &actlen,
+ (ur->ucr_flags & USBD_SHORT_XFER_OK), &actlen,
USBD_DEFAULT_TIMEOUT);
ur->ucr_actlen = actlen;
==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#41 (text+ko) ====
@@ -591,7 +591,7 @@
USETW(req.wValue, cd->bConfigurationValue);
USETW2(req.wIndex, id->bInterfaceNumber, id->bAlternateSetting);
USETW(req.wLength, sizeof devinfo - 1);
- error = usbd_do_request_flags(dev, &req, devinfo, USBD_ERR_SHORT_XFER_OK,
+ error = usbd_do_request_flags(dev, &req, devinfo, USBD_SHORT_XFER_OK,
&alen, USBD_DEFAULT_TIMEOUT);
if (error) {
device_printf(sc->sc_dev, "cannot get device id\n");
==== //depot/projects/usb/src/sys/dev/usb/usb.h#32 (text+ko) ====
@@ -577,7 +577,7 @@
void *ucr_data;
int ucr_flags;
#define USBD_USE_POLLING 0x0001 /* internal flag */
-#define USBD_ERR_SHORT_XFER_OK 0x0004 /* allow short reads */
+#define USBD_SHORT_XFER_OK 0x0004 /* allow short reads */
#define USBD_DELAY_STATUS_STAGE 0x0010 /* insert delay before STATUS stage */
int ucr_actlen; /* actual length transferred */
};
==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#107 (text+ko) ====
@@ -3608,7 +3608,7 @@
PRINTFN(0, ("USB device mode\n"));
usbd_temp_get_desc(udev, req, &desc, &temp);
if (length > temp) {
- if (!(flags & USBD_ERR_SHORT_XFER_OK)) {
+ if (!(flags & USBD_SHORT_XFER_OK)) {
return (USBD_ERR_SHORT_XFER);
}
length = temp;
@@ -3734,7 +3734,7 @@
if (temp > xfer->actlen) {
temp = xfer->actlen;
- if (!(flags & USBD_ERR_SHORT_XFER_OK)) {
+ if (!(flags & USBD_SHORT_XFER_OK)) {
err = USBD_ERR_SHORT_XFER;
}
length = temp;
==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#35 (text+ko) ====
@@ -436,7 +436,7 @@
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE);
err = usbd_do_request_flags
- (udev, &Giant, &req, &coninfo, USBD_ERR_SHORT_XFER_OK,
+ (udev, &Giant, &req, &coninfo, USBD_SHORT_XFER_OK,
&actlen, USBD_DEFAULT_TIMEOUT);
if (err) {
@@ -489,7 +489,7 @@
USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN);
err = usbd_do_request_flags
- (udev, &Giant, &req, &pconinfo, USBD_ERR_SHORT_XFER_OK,
+ (udev, &Giant, &req, &pconinfo, USBD_SHORT_XFER_OK,
&actlen, USBD_DEFAULT_TIMEOUT);
if (err) {
More information about the p4-projects
mailing list