Hello,
this makes the E1820 work and due to shared IDs probably some other
devices as well.
Index: usbdevs
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.511
diff -u -r1.511 usbdevs
--- usbdevs 29 Jul 2010 12:32:04 -0000 1.511
+++ usbdevs 20 Aug 2010 15:20:17 -0000
@@ -1865,9 +1865,10 @@
product HUAWEI Mobile 0x1008 HUAWEI Mobile Modem
product HUAWEI E180 0x140c HUAWEI Mobile E180
product HUAWEI E510 0x1411 HUAWEI Mobile E510
-product HUAWEI E182 0x1429 HUWAEI Mobile Modem
+product HUAWEI E182 0x1429 HUAWEI Mobile Modem
product HUAWEI E161 0x1446 HUAWEI Mobile E161
product HUAWEI K3765 0x1465 HUAWEI Mobile K3765
+product HUAWEI E1820 0x14ac HUAWEI Mobile Modem
product HUAWEI K3765_INIT 0x1520 HUAWEI Mobile K3765 Initial
/* HUMAX products */
Index: umsm.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/umsm.c,v
retrieving revision 1.66
diff -u -r1.66 umsm.c
--- umsm.c 26 Jun 2010 00:34:19 -0000 1.66
+++ umsm.c 20 Aug 2010 15:13:24 -0000
@@ -131,6 +131,7 @@
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E161 }, DEV_UMASS5},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E180 }, DEV_HUAWEI},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E182 }, DEV_UMASS5},
+ {{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E1820 }, DEV_UMASS5},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 }, DEV_HUAWEI},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E510 }, DEV_HUAWEI},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E618 }, DEV_HUAWEI},
Before: The interfaces get detached, but the relevant interfaces don't
appear after modeswitching.
# dmesg
OpenBSD 4.8 (GENERIC) #134: Mon Aug 9 11:58:12 MDT 2010
[email protected]:/usr/src/sys/arch/i386/compile/GENERIC
[...]
umsm0 at uhub0 port 8 configuration 1 interface 0 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
umsm1 at uhub0 port 8 configuration 1 interface 1 "HUAWEI Technologies
HUAWEI Mobile E161" rev 2.00/0.00 addr 2
umsm0 detached
umsm1 detached
softraid0 at root
root on wd0a swap on wd0b dump on wd0b
umass0 at uhub0 port 8 configuration 1 interface 4 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
umass0: using SCSI over Bulk-Only
scsibus2 at umass0: 2 targets, initiator 0
cd2 at scsibus2 targ 1 lun 0: <HUAWEI, Mass Storage, 2.31> SCSI2 5/cdrom
removable
umass1 at uhub0 port 8 configuration 1 interface 5 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
umass1: using SCSI over Bulk-Only
scsibus3 at umass1: 2 targets, initiator 0
sd0 at scsibus3 targ 1 lun 0: <HUAWEI, TF CARD Storage, > SCSI2 0/direct
removable
sd0: drive offline
# usbdevs -dv
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 powered
port 4 powered
port 5 powered
port 6 powered
port 7 powered
port 8 addr 2: high speed, self powered, config 1, HUAWEI
Mobile(0x14ac), Huawei Technologies(0x12d1), rev 0.00
umass0
umass1
Controller /dev/usb1:
addr 1: full speed, self powered, config 1, UHCI root hub(0x0000),
Intel(0x8086), rev 1.00
uhub1
port 1 powered
port 2 powered
[...]
After: The interfaces appear, but umass doesn't get attached on
interfaces 4 and 5 (the micro SD card slot). The modem works though.
# dmesg
[...]
umsm0 at uhub0 port 8 configuration 1 interface 0 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
umsm1 at uhub0 port 8 configuration 1 interface 1 "HUAWEI Technologies
HUAWEI Mobile E161" rev 2.00/0.00 addr 2
umsm0 detached
umsm1 detached
softraid0 at root
root on wd0a swap on wd0b dump on wd0b
umsm0 at uhub0 port 8 configuration 1 interface 0 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom0 at umsm0
umsm1 at uhub0 port 8 configuration 1 interface 1 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom1 at umsm1
umsm2 at uhub0 port 8 configuration 1 interface 2 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom2 at umsm2
umsm3 at uhub0 port 8 configuration 1 interface 3 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom3 at umsm3
umsm4 at uhub0 port 8 configuration 1 interface 4 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
umsm5 at uhub0 port 8 configuration 1 interface 5 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
# usbdevs -dv
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 powered
port 4 powered
port 5 powered
port 6 powered
port 7 powered
port 8 addr 2: high speed, self powered, config 1, HUAWEI
Mobile(0x14ac), Huawei Technologies(0x12d1), rev 0.00
umsm0
umsm1
umsm2
umsm3
Controller /dev/usb1:
addr 1: full speed, self powered, config 1, UHCI root hub(0x0000),
Intel(0x8086), rev 1.00
uhub1
port 1 powered
port 2 powered
[...]
full dmesg
OpenBSD 4.8 (GENERIC) #4: Thu Aug 12 21:18:11 CEST 2010
[email protected]:/usr/src/sys/arch/i386/compile/GENERIC
cpu0: Intel(R) Celeron(R) CPU 2.66GHz ("GenuineIntel" 686-class) 2.67 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,CNXT-ID,xTPR
real mem = 258830336 (246MB)
avail mem = 244641792 (233MB)
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 11/24/05, BIOS32 rev. 0 @ 0xf0010,
SMBIOS rev. 2.3 @ 0xfa180 (45 entries)
bios0: vendor American Megatrends Inc. version "1.17" date 11/24/2005
bios0: Hewlett-Packard 08FCh
acpi0 at bios0: rev 0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC OEMB
acpi0: wakeup devices P0P4(S4) MC97(S4) USB1(S4) USB2(S4) USB3(S4)
USB4(S4) EUSB(S4) PS2K(S4) PS2M(S4) GBEN(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: apic clock running at 133MHz
ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 24 pins
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (P0P4)
acpicpu0 at acpi0
acpitz0 at acpi0acpitz0: THRM: failed to read _TMP
acpipwrres0 at acpi0: GFAN
acpibtn0 at acpi0: PWRB
bios0: ROM list: 0xc0000/0xaa00 0xcb000/0x1800
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
pchb0 at pci0 dev 0 function 0 "Intel 82865G Host" rev 0x02
vga1 at pci0 dev 2 function 0 "Intel 82865G Video" rev 0x02
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
intagp0 at vga1
agp0 at intagp0: aperture at 0xf0000000, size 0x8000000
inteldrm0 at vga1: apic 1 int 16 (irq 10)
drm0 at inteldrm0
uhci0 at pci0 dev 29 function 0 "Intel 82801EB/ER USB" rev 0x02: apic 1
int 16 (irq 10)
uhci1 at pci0 dev 29 function 1 "Intel 82801EB/ER USB" rev 0x02: apic 1
int 19 (irq 5)
uhci2 at pci0 dev 29 function 2 "Intel 82801EB/ER USB" rev 0x02: apic 1
int 18 (irq 5)
uhci3 at pci0 dev 29 function 3 "Intel 82801EB/ER USB" rev 0x02: apic 1
int 16 (irq 10)
ehci0 at pci0 dev 29 function 7 "Intel 82801EB/ER USB2" rev 0x02: apic 1
int 23 (irq 11)
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
ppb0 at pci0 dev 30 function 0 "Intel 82801BA Hub-to-PCI" rev 0xc2
pci1 at ppb0 bus 1
fxp0 at pci1 dev 8 function 0 "Intel PRO/100 VE" rev 0x02, i82562: apic
1 int 20 (irq 5), address 00:0f:fe:17:75:2e
inphy0 at fxp0 phy 1: i82562ET 10/100 PHY, rev. 0
ichpcib0 at pci0 dev 31 function 0 "Intel 82801EB/ER LPC" rev 0x02
pciide0 at pci0 dev 31 function 1 "Intel 82801EB/ER IDE" rev 0x02: DMA,
channel 0 configured to compatibility, channel 1 configured to compatibility
wd0 at pciide0 channel 0 drive 0: <ST340014A>
wd0: 16-sector PIO, LBA, 38166MB, 78165360 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 5
atapiscsi0 at pciide0 channel 1 drive 0
scsibus0 at atapiscsi0: 2 targets
cd0 at scsibus0 targ 0 lun 0: <LITE-ON, CD-ROM LTN-487T, 6QSG> ATAPI
5/cdrom removable
atapiscsi1 at pciide0 channel 1 drive 1
scsibus1 at atapiscsi1: 2 targets
cd1 at scsibus1 targ 0 lun 0: <_NEC, DVD_RW ND-3520AW, 3.07> ATAPI
5/cdrom removable
cd0(pciide0:1:0): using PIO mode 4, DMA mode 2
cd1(pciide0:1:1): using PIO mode 4, Ultra-DMA mode 2
ichiic0 at pci0 dev 31 function 3 "Intel 82801EB/ER SMBus" rev 0x02:
apic 1 int 17 (irq 5)
iic0 at ichiic0
admtm0 at iic0 addr 0x2d: 47m192
spdmem0 at iic0 addr 0x50: 256MB DDR SDRAM non-parity PC3200CL3.0
auich0 at pci0 dev 31 function 5 "Intel 82801EB/ER AC97" rev 0x02: apic
1 int 17 (irq 5), ICH5 AC97
ac97: codec id 0x41445368 (Analog Devices AD1888)
ac97: codec features headphone, 20 bit DAC, No 3D Stereo
audio0 at auich0
usb1 at uhci0: USB revision 1.0
uhub1 at usb1 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb2 at uhci1: USB revision 1.0
uhub2 at usb2 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb3 at uhci2: USB revision 1.0
uhub3 at usb3 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb4 at uhci3: USB revision 1.0
uhub4 at usb4 "Intel UHCI root hub" rev 1.00/1.00 addr 1
isa0 at ichpcib0
isadma0 at isa0
com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
lpt0 at isa0 port 0x378/4 irq 7
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
fd0 at fdc0 drive 0: 1.44MB 80 cyl, 2 head, 18 sec
mtrr: Pentium Pro MTRR support
umsm0 at uhub0 port 8 configuration 1 interface 0 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
umsm1 at uhub0 port 8 configuration 1 interface 1 "HUAWEI Technologies
HUAWEI Mobile E161" rev 2.00/0.00 addr 2
umsm0 detached
umsm1 detached
softraid0 at root
root on wd0a swap on wd0b dump on wd0b
umsm0 at uhub0 port 8 configuration 1 interface 0 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom0 at umsm0
umsm1 at uhub0 port 8 configuration 1 interface 1 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom1 at umsm1
umsm2 at uhub0 port 8 configuration 1 interface 2 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom2 at umsm2
umsm3 at uhub0 port 8 configuration 1 interface 3 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
ucom3 at umsm3
umsm4 at uhub0 port 8 configuration 1 interface 4 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
umsm5 at uhub0 port 8 configuration 1 interface 5 "Huawei Technologies
HUAWEI Mobile" rev 2.00/0.00 addr 2
