PERFORCE change 159376 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=159376

Change 159376 by hselasky at hselasky_laptop001 on 2009/03/18 13:48:22

	
	USB input: Further remove Giant dependancy.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/uhid.c#4 (text+ko) ====

@@ -668,8 +668,8 @@
 			 * feature report ID 2 before it'll start
 			 * returning digitizer data.
 			 */
-			error = usb2_req_set_report
-			    (uaa->device, &Giant, reportbuf, sizeof(reportbuf),
+			error = usb2_req_set_report(uaa->device, NULL,
+			    reportbuf, sizeof(reportbuf),
 			    uaa->info.bIfaceIndex, UHID_FEATURE_REPORT, 2);
 
 			if (error) {
@@ -691,16 +691,16 @@
 	}
 	if (sc->sc_repdesc_ptr == NULL) {
 
-		error = usb2_req_get_hid_desc
-		    (uaa->device, &Giant, &sc->sc_repdesc_ptr,
-		    &sc->sc_repdesc_size, M_USBDEV, uaa->info.bIfaceIndex);
+		error = usb2_req_get_hid_desc(uaa->device, NULL,
+		    &sc->sc_repdesc_ptr, &sc->sc_repdesc_size,
+		    M_USBDEV, uaa->info.bIfaceIndex);
 
 		if (error) {
 			device_printf(dev, "no report descriptor\n");
 			goto detach;
 		}
 	}
-	error = usb2_req_set_idle(uaa->device, &Giant,
+	error = usb2_req_set_idle(uaa->device, NULL,
 	    uaa->info.bIfaceIndex, 0, 0);
 
 	if (error) {

==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#6 (text+ko) ====

@@ -338,7 +338,7 @@
 	    (id->bInterfaceClass != UICLASS_HID))
 		return (ENXIO);
 
-	error = usb2_req_get_hid_desc(uaa->device, &Giant,
+	error = usb2_req_get_hid_desc(uaa->device, NULL,
 	    &d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex);
 
 	if (error)
@@ -395,8 +395,7 @@
 		DPRINTF("error=%s\n", usb2_errstr(err));
 		goto detach;
 	}
-	err = usb2_req_get_hid_desc
-	    (uaa->device, &Giant, &d_ptr,
+	err = usb2_req_get_hid_desc(uaa->device, NULL, &d_ptr,
 	    &d_len, M_TEMP, uaa->info.bIfaceIndex);
 
 	if (err) {