svn commit: r199332 - head/sys/dev/usb/serial
Andrew Thompson
thompsa at FreeBSD.org
Mon Nov 16 20:36:43 UTC 2009
Author: thompsa
Date: Mon Nov 16 20:36:43 2009
New Revision: 199332
URL: http://svn.freebsd.org/changeset/base/199332
Log:
Sort ID list by vendor.
Modified:
head/sys/dev/usb/serial/u3g.c
Modified: head/sys/dev/usb/serial/u3g.c
==============================================================================
--- head/sys/dev/usb/serial/u3g.c Mon Nov 16 20:35:16 2009 (r199331)
+++ head/sys/dev/usb/serial/u3g.c Mon Nov 16 20:36:43 2009 (r199332)
@@ -174,6 +174,10 @@ MODULE_DEPEND(u3g, usb, 1, 1, 1);
static const struct usb_device_id u3g_devs[] = {
#define U3G_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }
U3G_DEV(CURITEL, UM175, 0),
+ /* OEM: Huawei */
+ U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
+ U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
+ U3G_DEV(HUAWEI, E220, U3GFL_HUAWEI_INIT),
/* OEM: Option */
U3G_DEV(OPTION, GT3G, 0),
U3G_DEV(OPTION, GT3GQUAD, 0),
@@ -187,10 +191,8 @@ static const struct usb_device_id u3g_de
/* OEM: Qualcomm, Inc. */
U3G_DEV(QUALCOMMINC, ZTE_STOR, U3GFL_SCSI_EJECT),
U3G_DEV(QUALCOMMINC, CDMA_MSM, U3GFL_SCSI_EJECT),
- /* OEM: Huawei */
- U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
- U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
- U3G_DEV(HUAWEI, E220, U3GFL_HUAWEI_INIT),
+ /* OEM: Merlin */
+ U3G_DEV(MERLIN, V620, 0),
/* OEM: Novatel */
U3G_DEV(NOVATEL, CDMA_MODEM, 0),
U3G_DEV(NOVATEL, ES620, 0),
@@ -209,8 +211,6 @@ static const struct usb_device_id u3g_de
U3G_DEV(NOVATEL, ZEROCD, U3GFL_SCSI_EJECT),
U3G_DEV(NOVATEL, U760, U3GFL_SCSI_EJECT),
U3G_DEV(DELL, U740, 0),
- /* OEM: Merlin */
- U3G_DEV(MERLIN, V620, 0),
/* OEM: Sierra Wireless: */
U3G_DEV(SIERRA, AIRCARD580, 0),
U3G_DEV(SIERRA, AIRCARD595, 0),
More information about the svn-src-head
mailing list