Skip to content

Commit 230efa4

Browse files
committed
Add a variant of the D-Link DWM-222.
umodeswitch works correctly, but the ucom does not seem to attach.
1 parent a3291ff commit 230efa4

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

sys/dev/usb/u3g.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: u3g.c,v 1.45 2024/07/04 00:23:48 christos Exp $ */
1+
/* $NetBSD: u3g.c,v 1.46 2025/10/16 13:26:50 sborrill Exp $ */
22

33
/*-
44
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
5050
*/
5151

5252
#include <sys/cdefs.h>
53-
__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.45 2024/07/04 00:23:48 christos Exp $");
53+
__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.46 2025/10/16 13:26:50 sborrill Exp $");
5454

5555
#include <sys/param.h>
5656
#include <sys/systm.h>
@@ -263,6 +263,7 @@ static const struct usb_devno u3g_devs[] = {
263263
{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157 },
264264
{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157E },
265265
{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM222 },
266+
{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM222_2 },
266267
};
267268

268269
static bool

sys/dev/usb/umodeswitch.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: umodeswitch.c,v 1.6 2023/08/04 13:25:17 manu Exp $ */
1+
/* $NetBSD: umodeswitch.c,v 1.7 2025/10/16 13:26:50 sborrill Exp $ */
22

33
/*-
44
* Copyright (c) 2009, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
3030

3131

3232
#include <sys/cdefs.h>
33-
__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.6 2023/08/04 13:25:17 manu Exp $");
33+
__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.7 2025/10/16 13:26:50 sborrill Exp $");
3434

3535
#include <sys/param.h>
3636
#include <sys/systm.h>
@@ -441,6 +441,7 @@ umodeswitch_match(device_t parent, cfdata_t match, void *aux)
441441
case USB_PRODUCT_DLINK_DWM157E_CD:
442442
case USB_PRODUCT_DLINK_DWM157_CD:
443443
case USB_PRODUCT_DLINK_DWM222_CD:
444+
case USB_PRODUCT_DLINK_DWM222_CD_2:
444445
(void)u3g_bulk_ata_eject(uaa->uaa_device);
445446
(void)u3g_bulk_scsi_eject(uaa->uaa_device);
446447
return UMATCH_HIGHEST;

sys/dev/usb/usbdevs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: usbdevs,v 1.823 2025/07/29 19:31:21 hgutch Exp $
1+
$NetBSD: usbdevs,v 1.824 2025/10/16 13:26:50 sborrill Exp $
22

33
/*-
44
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1473,7 +1473,9 @@ product DLINK DWM157_CD 0xa707 DWM-157 CD-ROM Mode
14731473
product DLINK DWM157 0x7d02 DWM-157 LTE
14741474
product DLINK DWM157E 0x7d0e DWM-157 LTE
14751475
product DLINK DWM222_CD 0xab00 DWM-222 CD-ROM Mode
1476+
product DLINK DWM222_CD_2 0xab01 DWM-222 CD-ROM Mode
14761477
product DLINK DWM222 0x7e35 DWM-222 LTE
1478+
product DLINK DWM222_2 0x7e3d DWM-222 LTE
14771479
product DLINK DWR510_CD 0xa805 DWR-510 CD-ROM Mode
14781480
product DLINK DWR510 0x7e12 DWR-510 LTE
14791481

0 commit comments

Comments
 (0)