From owner-svn-src-head@FreeBSD.ORG Thu Nov 6 17:26:13 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B27D106564A; Thu, 6 Nov 2008 17:26:13 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 187BE8FC20; Thu, 6 Nov 2008 17:26:13 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA6HQD9U061413; Thu, 6 Nov 2008 17:26:13 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA6HQCfm061397; Thu, 6 Nov 2008 17:26:12 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200811061726.mA6HQCfm061397@svn.freebsd.org> From: Warner Losh Date: Thu, 6 Nov 2008 17:26:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184736 - head/sys/dev/usb2/serial X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2008 17:26:13 -0000 Author: imp Date: Thu Nov 6 17:26:12 2008 New Revision: 184736 URL: http://svn.freebsd.org/changeset/base/184736 Log: Bring in http://perforce.freebsd.org/chv.cgi?CH=152584 from hps. Submitted by: hps Modified: head/sys/dev/usb2/serial/uark2.c head/sys/dev/usb2/serial/ubsa2.c head/sys/dev/usb2/serial/ubser2.c head/sys/dev/usb2/serial/uchcom2.c head/sys/dev/usb2/serial/ucycom2.c head/sys/dev/usb2/serial/ufoma2.c head/sys/dev/usb2/serial/uftdi2.c head/sys/dev/usb2/serial/ugensa2.c head/sys/dev/usb2/serial/uipaq2.c head/sys/dev/usb2/serial/umct2.c head/sys/dev/usb2/serial/umodem2.c head/sys/dev/usb2/serial/umoscom2.c head/sys/dev/usb2/serial/uplcom2.c head/sys/dev/usb2/serial/usb2_serial.c head/sys/dev/usb2/serial/uvisor2.c head/sys/dev/usb2/serial/uvscom2.c Modified: head/sys/dev/usb2/serial/uark2.c ============================================================================== --- head/sys/dev/usb2/serial/uark2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/uark2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -174,7 +174,6 @@ static driver_t uark_driver = { 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)}, Modified: head/sys/dev/usb2/serial/ubsa2.c ============================================================================== --- head/sys/dev/usb2/serial/ubsa2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/ubsa2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -313,7 +313,6 @@ static driver_t ubsa_driver = { 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) Modified: head/sys/dev/usb2/serial/ubser2.c ============================================================================== --- head/sys/dev/usb2/serial/ubser2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/ubser2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -227,7 +227,6 @@ static driver_t ubser_driver = { 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) Modified: head/sys/dev/usb2/serial/uchcom2.c ============================================================================== --- head/sys/dev/usb2/serial/uchcom2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/uchcom2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -1035,4 +1035,3 @@ static devclass_t uchcom_devclass; 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); Modified: head/sys/dev/usb2/serial/ucycom2.c ============================================================================== --- head/sys/dev/usb2/serial/ucycom2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/ucycom2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -173,7 +173,6 @@ static driver_t ucycom_driver = { 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 Modified: head/sys/dev/usb2/serial/ufoma2.c ============================================================================== --- head/sys/dev/usb2/serial/ufoma2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/ufoma2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -335,7 +335,6 @@ static driver_t ufoma_driver = { 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) Modified: head/sys/dev/usb2/serial/uftdi2.c ============================================================================== --- head/sys/dev/usb2/serial/uftdi2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/uftdi2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -222,7 +222,6 @@ static driver_t uftdi_driver = { 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)}, Modified: head/sys/dev/usb2/serial/ugensa2.c ============================================================================== --- head/sys/dev/usb2/serial/ugensa2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/ugensa2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -172,7 +172,6 @@ static driver_t ugensa_driver = { 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)}, Modified: head/sys/dev/usb2/serial/uipaq2.c ============================================================================== --- head/sys/dev/usb2/serial/uipaq2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/uipaq2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -1094,7 +1094,6 @@ static driver_t uipaq_driver = { 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) Modified: head/sys/dev/usb2/serial/umct2.c ============================================================================== --- head/sys/dev/usb2/serial/umct2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/umct2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -237,7 +237,6 @@ static driver_t umct_driver = { 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) Modified: head/sys/dev/usb2/serial/umodem2.c ============================================================================== --- head/sys/dev/usb2/serial/umodem2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/umodem2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -278,7 +278,6 @@ static driver_t umodem_driver = { 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 Modified: head/sys/dev/usb2/serial/umoscom2.c ============================================================================== --- head/sys/dev/usb2/serial/umoscom2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/umoscom2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -296,7 +296,6 @@ static driver_t umoscom_driver = { 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)} Modified: head/sys/dev/usb2/serial/uplcom2.c ============================================================================== --- head/sys/dev/usb2/serial/uplcom2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/uplcom2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -331,7 +331,6 @@ static driver_t uplcom_driver = { 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 Modified: head/sys/dev/usb2/serial/usb2_serial.c ============================================================================== --- head/sys/dev/usb2/serial/usb2_serial.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/usb2_serial.c Thu Nov 6 17:26:12 2008 (r184736) @@ -147,8 +147,7 @@ static struct ttydevsw usb2_com_class = .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 */ Modified: head/sys/dev/usb2/serial/uvisor2.c ============================================================================== --- head/sys/dev/usb2/serial/uvisor2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/uvisor2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -256,7 +256,6 @@ static driver_t uvisor_driver = { 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)}, Modified: head/sys/dev/usb2/serial/uvscom2.c ============================================================================== --- head/sys/dev/usb2/serial/uvscom2.c Thu Nov 6 17:00:19 2008 (r184735) +++ head/sys/dev/usb2/serial/uvscom2.c Thu Nov 6 17:26:12 2008 (r184736) @@ -283,7 +283,6 @@ static driver_t uvscom_driver = { 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