From owner-p4-projects@FreeBSD.ORG Thu Nov 6 17:06:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FBFC106567B; Thu, 6 Nov 2008 17:06:33 +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 C71331065678 for ; Thu, 6 Nov 2008 17:06:32 +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 B43618FC0A for ; Thu, 6 Nov 2008 17:06:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA6H6WTM091833 for ; Thu, 6 Nov 2008 17:06:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA6H6WWw091831 for perforce@freebsd.org; Thu, 6 Nov 2008 17:06:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 6 Nov 2008 17:06:32 GMT Message-Id: <200811061706.mA6H6WWw091831@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 152584 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: Thu, 06 Nov 2008 17:06:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=152584 Change 152584 by hselasky@hselasky_laptop001 on 2008/11/06 17:05:48 Remove "ucom" dependancy from USB serial drivers. Remove some device ID's from ugensa which are no longer present in usbdevs. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#9 (text+ko) ==== @@ -174,7 +174,6 @@ DRIVER_MODULE(uark, ushub, uark_driver, uark_devclass, NULL, 0); MODULE_DEPEND(uark, usb2_serial, 1, 1, 1); MODULE_DEPEND(uark, usb2_core, 1, 1, 1); -MODULE_DEPEND(uark, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static const struct usb2_device_id uark_devs[] = { {USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)}, ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#13 (text+ko) ==== @@ -293,7 +293,6 @@ DRIVER_MODULE(ubsa, ushub, ubsa_driver, ubsa_devclass, NULL, 0); MODULE_DEPEND(ubsa, usb2_serial, 1, 1, 1); MODULE_DEPEND(ubsa, usb2_core, 1, 1, 1); -MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static int ubsa_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#9 (text+ko) ==== @@ -227,7 +227,6 @@ DRIVER_MODULE(ubser, ushub, ubser_driver, ubser_devclass, NULL, 0); MODULE_DEPEND(ubser, usb2_serial, 1, 1, 1); MODULE_DEPEND(ubser, usb2_core, 1, 1, 1); -MODULE_DEPEND(ubser, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static int ubser_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#10 (text+ko) ==== @@ -1035,4 +1035,3 @@ DRIVER_MODULE(uchcom, ushub, uchcom_driver, uchcom_devclass, NULL, 0); MODULE_DEPEND(uchcom, usb2_serial, 1, 1, 1); MODULE_DEPEND(uchcom, usb2_core, 1, 1, 1); -MODULE_DEPEND(uchcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#10 (text+ko) ==== @@ -173,7 +173,6 @@ DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0); MODULE_DEPEND(ucycom, usb2_serial, 1, 1, 1); MODULE_DEPEND(ucycom, usb2_core, 1, 1, 1); -MODULE_DEPEND(ucycom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); /* * Supported devices ==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#12 (text+ko) ==== @@ -335,7 +335,6 @@ DRIVER_MODULE(ufoma, ushub, ufoma_driver, ufoma_devclass, NULL, 0); MODULE_DEPEND(ufoma, usb2_serial, 1, 1, 1); MODULE_DEPEND(ufoma, usb2_core, 1, 1, 1); -MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static int ufoma_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#10 (text+ko) ==== @@ -222,7 +222,6 @@ DRIVER_MODULE(uftdi, ushub, uftdi_driver, uftdi_devclass, NULL, 0); MODULE_DEPEND(uftdi, usb2_serial, 1, 1, 1); MODULE_DEPEND(uftdi, usb2_core, 1, 1, 1); -MODULE_DEPEND(uftdi, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static struct usb2_device_id uftdi_devs[] = { {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, UFTDI_TYPE_SIO)}, ==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#13 (text+ko) ==== @@ -172,14 +172,13 @@ DRIVER_MODULE(ugensa, ushub, ugensa_driver, ugensa_devclass, NULL, 0); MODULE_DEPEND(ugensa, usb2_serial, 1, 1, 1); MODULE_DEPEND(ugensa, usb2_core, 1, 1, 1); -MODULE_DEPEND(ugensa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static const struct usb2_device_id ugensa_devs[] = { {USB_VPI(USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, 0)}, {USB_VPI(USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM1, 0)}, {USB_VPI(USB_VENDOR_KYOCERA2, USB_PRODUCT_KYOCERA2_CDMA_MSM_K, 0)}, {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_49GPLUS, 0)}, - {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, 0)}, +/* {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, 0)}, */ {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, 0)}, {USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, 0)}, {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, 0)}, @@ -188,7 +187,7 @@ {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727, 0)}, {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740, 0)}, {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2, 0)}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D, 0)}, +/* {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D, 0)}, */ {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620, 0)}, {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640, 0)}, {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720, 0)}, ==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#11 (text+ko) ==== @@ -1094,7 +1094,6 @@ DRIVER_MODULE(uipaq, ushub, uipaq_driver, uipaq_devclass, NULL, 0); MODULE_DEPEND(uipaq, usb2_serial, 1, 1, 1); MODULE_DEPEND(uipaq, usb2_core, 1, 1, 1); -MODULE_DEPEND(uipaq, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static int uipaq_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#9 (text+ko) ==== @@ -237,7 +237,6 @@ DRIVER_MODULE(umct, ushub, umct_driver, umct_devclass, NULL, 0); MODULE_DEPEND(umct, usb2_serial, 1, 1, 1); MODULE_DEPEND(umct, usb2_core, 1, 1, 1); -MODULE_DEPEND(umct, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static int umct_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#12 (text+ko) ==== @@ -278,7 +278,6 @@ DRIVER_MODULE(umodem, ushub, umodem_driver, umodem_devclass, NULL, 0); MODULE_DEPEND(umodem, usb2_serial, 1, 1, 1); MODULE_DEPEND(umodem, usb2_core, 1, 1, 1); -MODULE_DEPEND(umodem, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(umodem, UMODEM_MODVER); static int ==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#10 (text+ko) ==== @@ -296,7 +296,6 @@ DRIVER_MODULE(umoscom, ushub, umoscom_driver, umoscom_devclass, NULL, 0); MODULE_DEPEND(umoscom, usb2_serial, 1, 1, 1); MODULE_DEPEND(umoscom, usb2_core, 1, 1, 1); -MODULE_DEPEND(umoscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static const struct usb2_device_id umoscom_devs[] = { {USB_VPI(USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703, 0)} ==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#11 (text+ko) ==== @@ -331,7 +331,6 @@ DRIVER_MODULE(uplcom, ushub, uplcom_driver, uplcom_devclass, NULL, 0); MODULE_DEPEND(uplcom, usb2_serial, 1, 1, 1); MODULE_DEPEND(uplcom, usb2_core, 1, 1, 1); -MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uplcom, UPLCOM_MODVER); static int ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#16 (text+ko) ==== @@ -147,8 +147,7 @@ .tsw_free = usb2_com_free, }; -MODULE_DEPEND(ucom, usb2_core, 1, 1, 1); -MODULE_VERSION(ucom, UCOM_MODVER); +MODULE_DEPEND(usb2_serial, usb2_core, 1, 1, 1); MODULE_VERSION(usb2_serial, 1); #define UCOM_UNIT_MAX 0x1000 /* exclusive */ ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#10 (text+ko) ==== @@ -256,7 +256,6 @@ DRIVER_MODULE(uvisor, ushub, uvisor_driver, uvisor_devclass, NULL, 0); MODULE_DEPEND(uvisor, usb2_serial, 1, 1, 1); MODULE_DEPEND(uvisor, usb2_core, 1, 1, 1); -MODULE_DEPEND(uvisor, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); static const struct usb2_device_id uvisor_devs[] = { {USB_VPI(USB_VENDOR_ACEECA, USB_PRODUCT_ACEECA_MEZ1000, UVISOR_FLAG_PALM4)}, ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#10 (text+ko) ==== @@ -283,7 +283,6 @@ DRIVER_MODULE(uvscom, ushub, uvscom_driver, uvscom_devclass, NULL, 0); MODULE_DEPEND(uvscom, usb2_serial, 1, 1, 1); MODULE_DEPEND(uvscom, usb2_core, 1, 1, 1); -MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uvscom, UVSCOM_MODVER); static int