PERFORCE change 144626 for review

[Hans Petter Selasky]

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

Change 144626 by hselasky at hselasky_laptop001 on 2008/07/04 14:32:07

	
	Move HID parsing routines into the USB core, hence they
	are used by both usb2_input and usb2_serial. And we don't
	want a dependancy between these two modules.

Affected files ...

.. //depot/projects/usb/src/sys/conf/files#31 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#1 add
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#3 add
.. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/input/usb2_hid.c#3 delete
.. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#2 delete
.. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#3 edit
.. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#5 edit
.. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#3 edit

Differences ...

==== //depot/projects/usb/src/sys/conf/files#31 (text+ko) ====

@@ -1361,6 +1361,7 @@
 dev/usb2/core/usb2_error.c		optional usb2_core
 dev/usb2/core/usb2_generic.c		optional usb2_core
 dev/usb2/core/usb2_handle_request.c	optional usb2_core
+dev/usb2/core/usb2_hid.c		optional usb2_core
 dev/usb2/core/usb2_hub.c		optional usb2_core
 dev/usb2/core/usb2_if.m			optional usb2_core
 dev/usb2/core/usb2_lookup.c		optional usb2_core
@@ -1429,7 +1430,6 @@
 dev/usb2/input/uhid2.c		optional usb2_core usb2_input
 dev/usb2/input/ukbd2.c		optional usb2_core usb2_input
 dev/usb2/input/ums2.c		optional usb2_core usb2_input
-dev/usb2/input/usb2_hid.c	optional usb2_core usb2_input
 dev/usb2/input/usb2_input.c	optional usb2_core usb2_input
 #
 # USB2 quirks

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

@@ -67,6 +67,7 @@
 #include <dev/usb2/core/usb2_dynamic.h>
 #include <dev/usb2/core/usb2_mbuf.h>
 #include <dev/usb2/core/usb2_dev.h>
+#include <dev/usb2/core/usb2_hid.h>
 
 #include <dev/usb2/input/usb2_input.h>
 #include <dev/usb2/input/usb2_rdesc.h>
@@ -722,7 +723,7 @@
 	}
 	if (sc->sc_repdesc_ptr == NULL) {
 
-		error = hid_read_report_desc_from_usb
+		error = usb2_req_get_hid_desc
 		    (uaa->device, &Giant, &(sc->sc_repdesc_ptr),
 		    &(sc->sc_repdesc_size), M_USBDEV, uaa->info.bIfaceIndex);
 

==== //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#3 (text+ko) ====

@@ -63,6 +63,7 @@
 #include <dev/usb2/core/usb2_transfer.h>
 #include <dev/usb2/core/usb2_request.h>
 #include <dev/usb2/core/usb2_dynamic.h>
+#include <dev/usb2/core/usb2_hid.h>
 
 #include <dev/usb2/input/usb2_input.h>
 

==== //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#3 (text+ko) ====

@@ -60,6 +60,7 @@
 #include <dev/usb2/core/usb2_dynamic.h>
 #include <dev/usb2/core/usb2_mbuf.h>
 #include <dev/usb2/core/usb2_dev.h>
+#include <dev/usb2/core/usb2_hid.h>
 
 #include <dev/usb2/input/usb2_input.h>
 
@@ -377,7 +378,7 @@
 	    (id->bInterfaceClass != UICLASS_HID)) {
 		return (ENXIO);
 	}
-	error = hid_read_report_desc_from_usb
+	error = usb2_req_get_hid_desc
 	    (uaa->device, &Giant,
 	    &d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex);
 
@@ -436,7 +437,7 @@
 		DPRINTF(0, "error=%s\n", usb2_errstr(err));
 		goto detach;
 	}
-	err = hid_read_report_desc_from_usb
+	err = usb2_req_get_hid_desc
 	    (uaa->device, &Giant, &d_ptr,
 	    &d_len, M_TEMP, uaa->info.bIfaceIndex);
 

==== //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#2 (text+ko) ====


==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#3 (text+ko) ====

@@ -52,11 +52,10 @@
 #include <dev/usb2/core/usb2_lookup.h>
 #include <dev/usb2/core/usb2_util.h>
 #include <dev/usb2/core/usb2_busdma.h>
+#include <dev/usb2/core/usb2_hid.h>
 
 #include <dev/usb2/serial/usb2_serial.h>
 
-#include <dev/usb2/input/usb2_input.h>
-
 #define	UCYCOM_MAX_IOLEN	(1024 + 2)	/* bytes */
 
 #define	UCYCOM_ENDPT_MAX	3	/* units */
@@ -173,7 +172,6 @@
 
 DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0);
 MODULE_DEPEND(ucycom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ucycom, usb2_input, 1, 1, 1);
 MODULE_DEPEND(ucycom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 /*
@@ -235,7 +233,7 @@
 
 	/* get report descriptor */
 
-	error = hid_read_report_desc_from_usb
+	error = usb2_req_get_hid_desc
 	    (uaa->device, &Giant,
 	    &urd_ptr, &urd_len, M_USBDEV,
 	    UCYCOM_IFACE_INDEX);

==== //depot/projects/usb/src/sys/modules/usb2/core/Makefile#5 (text+ko) ====

@@ -17,6 +17,7 @@
 SRCS+= usb2_error.c
 SRCS+= usb2_generic.c
 SRCS+= usb2_handle_request.c
+SRCS+= usb2_hid.c
 SRCS+= usb2_hub.c
 SRCS+= usb2_lookup.c
 SRCS+= usb2_mbuf.c

==== //depot/projects/usb/src/sys/modules/usb2/input/Makefile#3 (text+ko) ====

@@ -9,7 +9,6 @@
 SRCS+= uhid2.c
 SRCS+= ukbd2.c
 SRCS+= ums2.c
-SRCS+= usb2_hid.c
 SRCS+= usb2_input.c
 
 .include <bsd.kmod.mk>