The diff below add an entry for the Alcatel One Touch X220 (also
good for the X210 which is more or less identical).

Tested with a X220 (it's the new usb modem my employer is giving
to on-call sysadmins).

Ok?

Cheers!
David

P.S.: is the naming sufficiently clear?


Controller /dev/usb0:
addr 1: high speed, self powered, config 1, EHCI root hub(0x0000), 
Intel(0x8086), rev 1.00
  uhub0
 port 1 powered
 port 2 powered
 port 3 addr 3: high speed, power 500 mA, config 1, HSPA Data Card(0x0017), 
USBModem(0x1bbb), rev 0.00, iSerialNumber 1234567890ABCDEF
   umass1
   ugen0

Before:

umsm0 at uhub0 port 3 configuration 1 interface 0 "USBModem HSPA Data Card" rev 
2.00/0.00 addr 3
umsm0 detached
umass1 at uhub0 port 3 configuration 1 interface 4 "USBModem HSPA Data Card" 
rev 2.00/0.00 addr 3
umass1: using SCSI over Bulk-Only
scsibus4 at umass1: 2 targets, initiator 0
sd3 at scsibus4 targ 1 lun 0: <ALCATEL, Mass Storage, 2.31> SCSI2 0/direct 
removable serial.1bbb0017567890ABCDEF
ugen0 at uhub0 port 3 configuration 1 "USBModem HSPA Data Card" rev 2.00/0.00 
addr 3

After:

umsm0 at uhub0 port 3 configuration 1 interface 0 "USBModem HSPA Data Card" rev 
2.00/0.00 addr 3
umsm0 detached
umsm0 at uhub0 port 3 configuration 1 interface 0 "USBModem HSPA Data Card" rev 
2.00/0.00 addr 3
ucom0 at umsm0
umsm1 at uhub0 port 3 configuration 1 interface 1 "USBModem HSPA Data Card" rev 
2.00/0.00 addr 3
ucom1 at umsm1
umsm2 at uhub0 port 3 configuration 1 interface 2 "USBModem HSPA Data Card" rev 
2.00/0.00 addr 3
ucom2 at umsm2
umsm3 at uhub0 port 3 configuration 1 interface 3 "USBModem HSPA Data Card" rev 
2.00/0.00 addr 3
ucom3 at umsm3
umass1 at uhub0 port 3 configuration 1 interface 4 "USBModem HSPA Data Card" 
rev 2.00/0.00 addr 3
umass1: using SCSI over Bulk-Only
scsibus4 at umass1: 2 targets, initiator 0
sd3 at scsibus4 targ 1 lun 0: <ALCATEL, Mass Storage, 2.31> SCSI2 0/direct 
removable serial.1bbb0017567890ABCDEF
umsm4 at uhub0 port 3 configuration 1 interface 5 "USBModem HSPA Data Card" rev 
2.00/0.00 addr 3
ucom4 at umsm4

# cu -l cuaU3
Connected
ATI
Manufacturer: TCT Mobile International Limited
Model: HSPA Data Card
Revision: S11B2400XX
IMEI: ***************
+GCAP: +CGSM,+DS,+ES


Index: share/man/man4/umsm.4
===================================================================
RCS file: /cvs/src/share/man/man4/umsm.4,v
retrieving revision 1.73
diff -u -p -r1.73 umsm.4
--- share/man/man4/umsm.4       18 Oct 2011 08:28:58 -0000      1.73
+++ share/man/man4/umsm.4       20 Oct 2011 09:16:11 -0000
@@ -39,6 +39,8 @@ driver:
 .It Li "AirPrime PC5220" Ta "CardBus"
 .It Li "Alcatel One Touch X060" Ta "USB"
 .It Li "Alcatel One Touch X200" Ta "USB"
+.It Li "Alcatel One Touch X210" Ta "USB"
+.It Li "Alcatel One Touch X220" Ta "USB"
 .It Li "AnyDATA ADU-500A" Ta "USB"
 .It Li "AnyDATA ADU-E100H" Ta "USB"
 .It Li "AnyDATA A2502" Ta "USB"
Index: sys/dev/usb/umsm.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/umsm.c,v
retrieving revision 1.79
diff -u -p -r1.79 umsm.c
--- sys/dev/usb/umsm.c  22 Jul 2011 11:37:09 -0000      1.79
+++ sys/dev/usb/umsm.c  20 Oct 2011 09:16:45 -0000
@@ -238,6 +238,7 @@ 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_TCTMOBILE, USB_PRODUCT_TCTMOBILE_UMSM_2 }, 0},
 
        {{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_HSDPA }, 0},
 
Index: sys/dev/usb/usbdevs
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.558
diff -u -p -r1.558 usbdevs
--- sys/dev/usb/usbdevs 7 Oct 2011 06:01:49 -0000       1.558
+++ sys/dev/usb/usbdevs 20 Oct 2011 09:16:49 -0000
@@ -3642,7 +3642,8 @@ product SWEEX ZD1211              0x1809  ZD1211
 product SYNTECH SERIAL         0x0001  Serial
 
 /* TCT Mobile products */
-product TCTMOBILE UMSM         0x0000  Modem mode
+product TCTMOBILE UMSM         0x0000  Modem mode (Alcatel One Touch X060/X200)
+product TCTMOBILE UMSM_2       0x0017  Modem mode (Alcatel One Touch X210/X220)
 product TCTMOBILE UMASS                0xf000  Storage mode
 
 /* Tangtop products */

Reply via email to