Module Name: src
Committed By: martin
Date: Sun Apr 28 13:26:36 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-10]: uftdi.c usbdevs
Log Message:
Pull up following revision(s) (requested by maya in ticket #679):
sys/dev/usb/uftdi.c: revision 1.78
sys/dev/usb/usbdevs: revision 1.815
Add some USB serial adapters
>From Cameron Williams in PR kern/58127
Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127
To generate a diff of this commit:
cvs rdiff -u -r1.76.6.2 -r1.76.6.3 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.806.4.2 -r1.806.4.3 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.76.6.2 src/sys/dev/usb/uftdi.c:1.76.6.3
--- src/sys/dev/usb/uftdi.c:1.76.6.2 Sun Apr 28 13:07:17 2024
+++ src/sys/dev/usb/uftdi.c Sun Apr 28 13:26:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $ */
+/* $NetBSD: uftdi.c,v 1.76.6.3 2024/04/28 13:26:36 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.3 2024/04/28 13:26:36 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -126,6 +126,25 @@ static const struct ucom_methods uftdi_m
*/
static const struct usb_devno uftdi_devs[] = {
{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.806.4.2 src/sys/dev/usb/usbdevs:1.806.4.3
--- src/sys/dev/usb/usbdevs:1.806.4.2 Sun Jan 14 15:51:05 2024
+++ src/sys/dev/usb/usbdevs Sun Apr 28 13:26:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.806.4.2 2024/01/14 15:51:05 martin Exp $
+$NetBSD: usbdevs,v 1.806.4.3 2024/04/28 13:26:36 martin Exp $
/*-
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1116,6 +1116,27 @@ product BILLIONTON USBEL100 0x0988 USB10
product BILLIONTON USBE100 0x8511 USBE100
product BILLIONTON USB2AR 0x90ff USB2AR Ethernet
+/* Brainboxes Limited products */
+product BRAINBOXES US101 0x1011 US-101 USB2Serial 1xRS232
+product BRAINBOXES US159 0x1021 US-159 USB2Serial 1xRS232
+product BRAINBOXES US235 0x1017 US-235 USB2Serial 1xRS232
+product BRAINBOXES US257 0x5001 US-257 USB2Serial 2xRS232
+product BRAINBOXES US279_12 0x2021 US-279 USB2Serial 8xRS232 (Port 1 and 2)
+product BRAINBOXES US279_34 0x2022 US-279 USB2Serial 8xRS232 (Port 3 and 4)
+product BRAINBOXES US279_56 0x2023 US-279 USB2Serial 8xRS232 (Port 5 and 6)
+product BRAINBOXES US279_78 0x2024 US-279 USB2Serial 8xRS232 (Port 7 and 8)
+product BRAINBOXES US313 0x6001 US-313 USB2Serial 2xRS422/485
+product BRAINBOXES US320 0x1019 US-320 USB2Serial 1xRS422/485
+product BRAINBOXES US324 0x1013 US-324 USB2Serial 1xRS422/485
+product BRAINBOXES US346_12 0x3011 US-346 USB2Serial 4xRS422/485 (Port 1 and 2)
+product BRAINBOXES US346_34 0x3012 US-346 USB2Serial 4xRS422/485 (Port 3 and 4)
+product BRAINBOXES US701_12 0x2011 US-701 USB2Serial 4xRS232 (Port 1 and 2)
+product BRAINBOXES US701_34 0x2012 US-701 USB2Serial 4xRS232 (Port 3 and 4)
+product BRAINBOXES US842_12 0x8001 US-842 USB2Serial 8xRS422/485 (Port 1 and 2)
+product BRAINBOXES US842_34 0x8002 US-842 USB2Serial 8xRS422/485 (Port 3 and 4)
+product BRAINBOXES US842_56 0x8003 US-842 USB2Serial 8xRS422/485 (Port 5 and 6)
+product BRAINBOXES US842_78 0x8004 US-842 USB2Serial 8xRS422/485 (Port 7 and 8)
+
/* Broadcom products */
product BROADCOM BCMFW 0x0bdc BCMFW
product BROADCOM BCM2033 0x2000 BCM2033
