Date: Wed, 29 Oct 2008 08:08:55 +0000 (UTC) From: Nick Hibma <n_hibma@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184436 - head/sys/dev/usb Message-ID: <200810290808.m9T88tDD016760@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: n_hibma Date: Wed Oct 29 08:08:55 2008 New Revision: 184436 URL: http://svn.freebsd.org/changeset/base/184436 Log: Add the device ID for the mass storage device that appears before the modem appears to facilitate faster switching to modem mode. Modified: head/sys/dev/usb/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/u3g.c ============================================================================== --- head/sys/dev/usb/u3g.c Wed Oct 29 07:16:49 2008 (r184435) +++ head/sys/dev/usb/u3g.c Wed Oct 29 08:08:55 2008 (r184436) @@ -51,14 +51,12 @@ #endif #include "usbdevs.h" -//#define U3G_DEBUG +#define U3G_DEBUG #ifdef U3G_DEBUG #define DPRINTF(x...) do { if (u3gdebug) device_printf(sc->sc_dev, ##x); } while (0) -#define DPRINTFN(n, x...) do { if (u3gdebug > (n)) device_printf(self, ##x); } while (0) int u3gdebug = 1; #else #define DPRINTF(x...) /* nop */ -#define DPRINTFN(n, x...) /* nop */ #endif #define U3G_MAXPORTS 4 @@ -135,7 +133,8 @@ static const struct u3g_dev_type_s u3g_d {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA }, U3GSP_HSDPA, U3GFL_NONE }, {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G }, U3GSP_UMTS, U3GFL_NONE }, /* OEM: Qualcomm, Inc. */ - {{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM }, U3GSP_CDMA, U3GFL_STUB_WAIT }, + {{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR }, U3GSP_CDMA, U3GFL_SCSI_EJECT }, + {{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM }, U3GSP_CDMA, U3GFL_SCSI_EJECT }, /* OEM: Huawei */ {{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE }, U3GSP_HSDPA, U3GFL_HUAWEI_INIT }, {{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 }, U3GSP_HSPA, U3GFL_HUAWEI_INIT }, Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Wed Oct 29 07:16:49 2008 (r184435) +++ head/sys/dev/usb/usbdevs Wed Oct 29 08:08:55 2008 (r184436) @@ -1996,6 +1996,7 @@ product QUALCOMM CDMA_MSM 0x6000 CDMA Te product QUALCOMM2 RWT_FCT 0x3100 RWT FCT-CDMA 2000 1xRTT modem product QUALCOMM2 CDMA_MSM 0x3196 CDMA Technologies MSM modem product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem +product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage /* Qtronix products */ product QTRONIX 980N 0x2011 Scorpion-980N keyboard
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810290808.m9T88tDD016760>