u3g(4): Add new USB IDs.

Submitted by:	Matthew Luckie <mjl@luckie.org.nz>
Sponsored by:	NVIDIA Networking

(cherry picked from commit a75444c14304e63a3b0369d01c86a077e98fc9f9)

diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c
index 33e6339be85dd166cbedc6ef1828df843951318a..b83c2ebf8d474961b8fa9672db05ee66bf57f190 100644 (file)
--- a/sys/dev/usb/serial/u3g.c
+++ b/sys/dev/usb/serial/u3g.c
@@ -240,6 +240,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
        U3G_DEV(DLINK, DWM157_2, 0),
        U3G_DEV(DLINK, DWM222_CD, U3GINIT_SCSIEJECT),
        U3G_DEV(DLINK, DWM222, 0),
+       U3G_DEV(DLINK, DWM222_CD_2, U3GINIT_SCSIEJECT),
+       U3G_DEV(DLINK, DWM222_2, 0),
        U3G_DEV(DLINK3, DWM652, 0),
        U3G_DEV(HP, EV2200, 0),
        U3G_DEV(HP, HS2300, 0),

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 2ad3b5b1e5f7843648d72704f1708d93aab3a3de..5757f5f90e814d5e9cca0f53264824250d7fb96d 100644 (file)
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1752,10 +1752,12 @@ product DLINK DWM157            0x7d02  DWM-157
 product DLINK DWM157_2         0x7d0e  DWM-157 
 product DLINK DWR510           0x7e12  DWR-510
 product DLINK DWM222           0x7e35  DWM-222
+product DLINK DWM222_2         0x7e3d  DWM-222
 product DLINK DWM157_CD_2      0xa407  DWM-157 CD-ROM Mode
 product DLINK DWM157_CD                0xa707  DWM-157 CD-ROM Mode
 product DLINK DWR510_CD                0xa805  DWR-510 CD-ROM Mode
 product DLINK DWM222_CD                0xab00  DWM-222 CD-ROM Mode
+product DLINK DWM222_CD_2      0xac01  DWM-222 CD-ROM Mode
 product DLINK DSB650           0xabc1  10/100 Ethernet
 product DLINK DUBH7            0xf103  DUB-H7 USB 2.0 7-Port Hub
 product DLINK2 RTL8192SU_1     0x3300  RTL8192SU