From owner-p4-projects@FreeBSD.ORG Fri Jul 4 14:32:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B19921065671; Fri, 4 Jul 2008 14:32:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75B40106566C for ; Fri, 4 Jul 2008 14:32:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6351B8FC14 for ; Fri, 4 Jul 2008 14:32:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m64EWn2i020104 for ; Fri, 4 Jul 2008 14:32:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m64EWn3I020102 for perforce@freebsd.org; Fri, 4 Jul 2008 14:32:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 4 Jul 2008 14:32:49 GMT Message-Id: <200807041432.m64EWn3I020102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 144626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2008 14:32:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=144626 Change 144626 by hselasky@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 #include #include +#include #include #include @@ -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 #include #include +#include #include ==== //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#3 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include @@ -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 #include #include +#include #include -#include - #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