new umsm device: Toshiba 3G HSDPA MiniCard

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

new umsm device: Toshiba 3G HSDPA MiniCard

David Coppa
This makes the umsm driver recognize the WWAN module integrated in my
Dell Latitude D630... And it works as intended, using cuaU2 as device.

Before:

spkr0 at pcppi0
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
mtrr: Pentium Pro MTRR support
ugen0 at uhub3 port 2 "Novatel Wireless Novatel Wireless HSDPA Modem"
rev 1.10/0.00 addr 2

After:

spkr0 at pcppi0
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
mtrr: Pentium Pro MTRR support
umsm0 at uhub3 port 2 configuration 1 interface 0 "Novatel Wireless
Novatel Wireless HSDPA Modem" rev 1.10/0.00 addr 2
ucom0 at umsm0
umsm1 at uhub3 port 2 configuration 1 interface 1 "Novatel Wireless
Novatel Wireless HSDPA Modem" rev 1.10/0.00 addr 2
ucom1 at umsm1
umsm2 at uhub3 port 2 configuration 1 interface 2 "Novatel Wireless
Novatel Wireless HSDPA Modem" rev 1.10/0.00 addr 2
ucom2 at umsm2
umsm3 at uhub3 port 2 configuration 1 interface 3 "Novatel Wireless
Novatel Wireless HSDPA Modem" rev 1.10/0.00 addr 2
ucom3 at umsm3

Here's the diff.
Comment is borrowed from linux kernel (from the option.c driver)

Comments, OKs?

Index: umsm.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/umsm.c,v
retrieving revision 1.71
diff -u -p -r1.71 umsm.c
--- umsm.c 25 Jan 2011 20:03:36 -0000 1.71
+++ umsm.c 1 Feb 2011 08:43:59 -0000
@@ -231,6 +231,8 @@ static const struct umsm_type umsm_devs[
  {{ USB_VENDOR_TCTMOBILE, USB_PRODUCT_TCTMOBILE_UMASS }, DEV_UMASS3},
  {{ USB_VENDOR_TCTMOBILE, USB_PRODUCT_TCTMOBILE_UMSM }, 0},

+ {{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_HSDPA_MINICARD }, 0},
+
  {{ USB_VENDOR_HP, USB_PRODUCT_HP_HS2300 }, 0},

  {{ USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU510 }, 0}, /* ??? */
Index: usbdevs
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.539
diff -u -p -r1.539 usbdevs
--- usbdevs 30 Jan 2011 17:28:05 -0000 1.539
+++ usbdevs 1 Feb 2011 08:44:02 -0000
@@ -3681,6 +3681,7 @@ product TODOS ARGOS_MINI 0x0002 Argos Mi

 /* Toshiba Corp products */
 product TOSHIBA RT3070 0x0a07 RT3070
+product TOSHIBA HSDPA_MINICARD 0x1302 3G HSDPA MiniCard

 /* Trek Technology products */
 product TREK THUMBDRIVE 0x1111 ThumbDrive
Index: usbdevs.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.549
diff -u -p -r1.549 usbdevs.h
--- usbdevs.h 30 Jan 2011 17:28:56 -0000 1.549
+++ usbdevs.h 1 Feb 2011 08:44:07 -0000
@@ -3688,6 +3688,7 @@

 /* Toshiba Corp products */
 #define USB_PRODUCT_TOSHIBA_RT3070 0x0a07 /* RT3070 */
+#define USB_PRODUCT_TOSHIBA_HSDPA_MINICARD 0x1302 /* Toshiba 3G HSDPA
== Novatel Expedite EU870D MiniCard */

 /* Trek Technology products */
 #define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */
Index: usbdevs_data.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.543
diff -u -p -r1.543 usbdevs_data.h
--- usbdevs_data.h 30 Jan 2011 17:28:56 -0000 1.543
+++ usbdevs_data.h 1 Feb 2011 08:44:11 -0000
@@ -9166,6 +9166,10 @@ const struct usb_known_product usb_known
     "RT3070",
  },
  {
+    USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_HSDPA_MINICARD,
+    "3G HSDPA MiniCard",
+ },
+ {
     USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
     "ThumbDrive",
  },

Reply | Threaded
Open this post in threaded view
|

Re: new umsm device: Toshiba 3G HSDPA MiniCard

Stuart Henderson
On 2011/02/01 10:34, David Coppa wrote:
> This makes the umsm driver recognize the WWAN module integrated in my
> Dell Latitude D630... And it works as intended, using cuaU2 as device.

> --- usbdevs.h 30 Jan 2011 17:28:56 -0000 1.549
> +++ usbdevs.h 1 Feb 2011 08:44:07 -0000
> @@ -3688,6 +3688,7 @@
>
>  /* Toshiba Corp products */
>  #define USB_PRODUCT_TOSHIBA_RT3070 0x0a07 /* RT3070 */
> +#define USB_PRODUCT_TOSHIBA_HSDPA_MINICARD 0x1302 /* Toshiba 3G HSDPA
> == Novatel Expedite EU870D MiniCard */

This file should be as generated by 'make', no extra comments

Reply | Threaded
Open this post in threaded view
|

Re: new umsm device: Toshiba 3G HSDPA MiniCard

David Coppa
On Tue, Feb 1, 2011 at 12:34 PM, Stuart Henderson <[hidden email]> wrote:

> This file should be as generated by 'make', no extra comments

Right.

Here's the updated diff:

Index: umsm.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/umsm.c,v
retrieving revision 1.71
diff -u -p -r1.71 umsm.c
--- umsm.c 25 Jan 2011 20:03:36 -0000 1.71
+++ umsm.c 1 Feb 2011 11:06:18 -0000
@@ -231,6 +231,8 @@ static const struct umsm_type umsm_devs[
  {{ USB_VENDOR_TCTMOBILE, USB_PRODUCT_TCTMOBILE_UMASS }, DEV_UMASS3},
  {{ USB_VENDOR_TCTMOBILE, USB_PRODUCT_TCTMOBILE_UMSM }, 0},

+ {{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_HSDPA_MINICARD }, 0},
+
  {{ USB_VENDOR_HP, USB_PRODUCT_HP_HS2300 }, 0},

  {{ USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU510 }, 0}, /* ??? */
Index: usbdevs
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.539
diff -u -p -r1.539 usbdevs
--- usbdevs 30 Jan 2011 17:28:05 -0000 1.539
+++ usbdevs 1 Feb 2011 11:06:22 -0000
@@ -3681,6 +3681,7 @@ product TODOS ARGOS_MINI 0x0002 Argos Mi

 /* Toshiba Corp products */
 product TOSHIBA RT3070 0x0a07 RT3070
+product TOSHIBA HSDPA_MINICARD 0x1302 3G HSDPA MiniCard

 /* Trek Technology products */
 product TREK THUMBDRIVE 0x1111 ThumbDrive
Index: usbdevs.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.549
diff -u -p -r1.549 usbdevs.h
--- usbdevs.h 30 Jan 2011 17:28:56 -0000 1.549
+++ usbdevs.h 1 Feb 2011 11:06:27 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs.h,v 1.549 2011/01/30 17:28:56 tedu Exp $ */
+/* $OpenBSD$ */

 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -3688,6 +3688,7 @@

 /* Toshiba Corp products */
 #define USB_PRODUCT_TOSHIBA_RT3070 0x0a07 /* RT3070 */
+#define USB_PRODUCT_TOSHIBA_HSDPA_MINICARD 0x1302 /* 3G HSDPA MiniCard */

 /* Trek Technology products */
 #define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */
Index: usbdevs_data.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.543
diff -u -p -r1.543 usbdevs_data.h
--- usbdevs_data.h 30 Jan 2011 17:28:56 -0000 1.543
+++ usbdevs_data.h 1 Feb 2011 11:06:31 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs_data.h,v 1.543 2011/01/30 17:28:56 tedu Exp $ */
+/* $OpenBSD$ */

 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -9164,6 +9164,10 @@ const struct usb_known_product usb_known
  {
     USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_RT3070,
     "RT3070",
+ },
+ {
+    USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_HSDPA_MINICARD,
+    "3G HSDPA MiniCard",
  },
  {
     USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,