PERFORCE change 159375 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Mar 18 06:47:49 PDT 2009
http://perforce.freebsd.org/chv.cgi?CH=159375
Change 159375 by hselasky at hselasky_laptop001 on 2009/03/18 13:47:14
USB serial: Further remove Giant dependancy.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#3 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#3 (text+ko) ====
@@ -244,8 +244,8 @@
req.wIndex[0] = sc->sc_iface_no;
req.wIndex[1] = 0;
USETW(req.wLength, 1);
- error = usb2_do_request_flags
- (uaa->device, &Giant, &req, &sc->sc_numser,
+ error = usb2_do_request_flags(uaa->device, NULL,
+ &req, &sc->sc_numser,
0, NULL, USB_DEFAULT_TIMEOUT);
if (error || (sc->sc_numser == 0)) {
==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#3 (text+ko) ====
@@ -222,8 +222,7 @@
/* get report descriptor */
- error = usb2_req_get_hid_desc
- (uaa->device, &Giant,
+ error = usb2_req_get_hid_desc(uaa->device, NULL,
&urd_ptr, &urd_len, M_USBDEV,
UCYCOM_IFACE_INDEX);
==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#5 (text+ko) ====
@@ -769,7 +769,7 @@
USETW(req.wLength, UCDC_ABSTRACT_STATE_LENGTH);
USETW(ast.wState, state);
- return (usb2_do_request(udev, &Giant, &req, &ast));
+ return (usb2_do_request(udev, NULL, &req, &ast));
}
static int
==== //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#3 (text+ko) ====
@@ -441,7 +441,7 @@
req.wIndex[1] = 0;
USETW(req.wLength, 0);
- return (usb2_do_request(udev, &Giant, &req, NULL));
+ return (usb2_do_request(udev, NULL, &req, NULL));
}
struct pl2303x_init {
@@ -485,7 +485,7 @@
USETW(req.wIndex, pl2303x[i].index);
USETW(req.wLength, pl2303x[i].length);
- err = usb2_do_request(udev, &Giant, &req, buf);
+ err = usb2_do_request(udev, NULL, &req, buf);
if (err) {
DPRINTF("error=%s\n", usb2_errstr(err));
return (EIO);
==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#3 (text+ko) ====
@@ -373,8 +373,8 @@
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE);
- err = usb2_do_request_flags
- (udev, &Giant, &req, &coninfo, USB_SHORT_XFER_OK,
+ err = usb2_do_request_flags(udev, NULL,
+ &req, &coninfo, USB_SHORT_XFER_OK,
&actlen, USB_DEFAULT_TIMEOUT);
if (err) {
@@ -427,7 +427,7 @@
USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN);
err = usb2_do_request_flags
- (udev, &Giant, &req, &pconinfo, USB_SHORT_XFER_OK,
+ (udev, NULL, &req, &pconinfo, USB_SHORT_XFER_OK,
&actlen, USB_DEFAULT_TIMEOUT);
if (err) {
@@ -468,7 +468,7 @@
USETW(req.wIndex, 0);
USETW(req.wLength, 1);
- err = usb2_do_request(udev, &Giant, &req, buffer);
+ err = usb2_do_request(udev, NULL, &req, buffer);
if (err) {
goto done;
}
@@ -479,7 +479,7 @@
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, 1);
- err = usb2_do_request(udev, &Giant, &req, buffer);
+ err = usb2_do_request(udev, NULL, &req, buffer);
if (err) {
goto done;
}
@@ -490,7 +490,7 @@
USETW(req.wValue, 0);
USETW(req.wIndex, 5);
USETW(req.wLength, sizeof(wAvail));
- err = usb2_do_request(udev, &Giant, &req, &wAvail);
+ err = usb2_do_request(udev, NULL, &req, &wAvail);
if (err) {
goto done;
}
More information about the p4-projects
mailing list