Module Name: src Committed By: kardel Date: Sat Jun 19 22:41:33 UTC 2010
Modified Files: src/sys/dev/usb: u3g.c usbdevs usbdevs.h usbdevs_data.h Log Message: add Huawei E1750 Mobile Broadband HSPA USB Stick To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/u3g.c cvs rdiff -u -r1.558 -r1.559 src/sys/dev/usb/usbdevs cvs rdiff -u -r1.551 -r1.552 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.552 -r1.553 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/u3g.c diff -u src/sys/dev/usb/u3g.c:1.14 src/sys/dev/usb/u3g.c:1.15 --- src/sys/dev/usb/u3g.c:1.14 Thu Jun 17 23:25:01 2010 +++ src/sys/dev/usb/u3g.c Sat Jun 19 22:41:32 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: u3g.c,v 1.14 2010/06/17 23:25:01 riz Exp $ */ +/* $NetBSD: u3g.c,v 1.15 2010/06/19 22:41:32 kardel Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.14 2010/06/17 23:25:01 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.15 2010/06/19 22:41:32 kardel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -450,10 +450,15 @@ if (uaa->product == USB_PRODUCT_HUAWEI_K3765) return UMATCH_NONE; - if (uaa->product == USB_PRODUCT_HUAWEI_K3765INIT) + switch (uaa->product) { + case USB_PRODUCT_HUAWEI_E1750INIT: + case USB_PRODUCT_HUAWEI_K3765INIT: return u3g_huawei_k3765_reinit(uaa->device); - else + break; + default: return u3g_huawei_reinit(uaa->device); + break; + } } if (uaa->vendor == USB_VENDOR_NOVATEL2) { Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.558 src/sys/dev/usb/usbdevs:1.559 --- src/sys/dev/usb/usbdevs:1.558 Thu Jun 17 23:22:21 2010 +++ src/sys/dev/usb/usbdevs Sat Jun 19 22:41:32 2010 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.558 2010/06/17 23:22:21 riz Exp $ +$NetBSD: usbdevs,v 1.559 2010/06/19 22:41:32 kardel Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1292,6 +1292,7 @@ /* Huawei Technologies products */ product HUAWEI MOBILE 0x1001 Huawei Mobile product HUAWEI E220 0x1003 Huawei E220 +product HUAWEI E1750INIT 0x1446 Huawei E1750 USB CD product HUAWEI K3765 0x1465 Huawei K3765 product HUAWEI K3765INIT 0x1520 Huawei K3765 USB CD Index: src/sys/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.551 src/sys/dev/usb/usbdevs.h:1.552 --- src/sys/dev/usb/usbdevs.h:1.551 Thu Jun 17 23:22:50 2010 +++ src/sys/dev/usb/usbdevs.h Sat Jun 19 22:41:33 2010 @@ -1,4 +1,4 @@ -/* ??? */ +/* $NetBSD: usbdevs.h,v 1.552 2010/06/19 22:41:33 kardel Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -1299,6 +1299,7 @@ /* Huawei Technologies products */ #define USB_PRODUCT_HUAWEI_MOBILE 0x1001 /* Huawei Mobile */ #define USB_PRODUCT_HUAWEI_E220 0x1003 /* Huawei E220 */ +#define USB_PRODUCT_HUAWEI_E1750INIT 0x1446 /* Huawei E1750 USB CD */ #define USB_PRODUCT_HUAWEI_K3765 0x1465 /* Huawei K3765 */ #define USB_PRODUCT_HUAWEI_K3765INIT 0x1520 /* Huawei K3765 USB CD */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.552 src/sys/dev/usb/usbdevs_data.h:1.553 --- src/sys/dev/usb/usbdevs_data.h:1.552 Thu Jun 17 23:22:50 2010 +++ src/sys/dev/usb/usbdevs_data.h Sat Jun 19 22:41:33 2010 @@ -1,4 +1,4 @@ -/* ??? */ +/* $NetBSD: usbdevs_data.h,v 1.553 2010/06/19 22:41:33 kardel Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -3883,6 +3883,10 @@ "Huawei E220", }, { + USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E1750INIT, + "Huawei E1750 USB CD", + }, + { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3765, "Huawei K3765", }, @@ -7307,4 +7311,4 @@ "Prestige", }, }; -const int usb_nproducts = 1345; +const int usb_nproducts = 1346;