Wed Apr 17 02:34:45 2024 UTC (23d)
Add support for a range of USB serial adapters

From Cameron Williams in PR kern/58127


(maya)
diff -r1.77 -r1.78 src/sys/dev/usb/uftdi.c

cvs diff -r1.77 -r1.78 src/sys/dev/usb/uftdi.c (expand / switch to unified diff)

--- src/sys/dev/usb/uftdi.c 2024/03/26 03:38:02 1.77
+++ src/sys/dev/usb/uftdi.c 2024/04/17 02:34:45 1.78
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $ */ 1/* $NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 The NetBSD Foundation, Inc. 4 * Copyright (c) 2000 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Lennart Augustsson (lennart@augustsson.net). 8 * by Lennart Augustsson (lennart@augustsson.net).
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $");
34 34
35#ifdef _KERNEL_OPT 35#ifdef _KERNEL_OPT
36#include "opt_usb.h" 36#include "opt_usb.h"
37#endif 37#endif
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/systm.h> 40#include <sys/systm.h>
41#include <sys/kernel.h> 41#include <sys/kernel.h>
42#include <sys/device.h> 42#include <sys/device.h>
43#include <sys/conf.h> 43#include <sys/conf.h>
44#include <sys/tty.h> 44#include <sys/tty.h>
45 45
46#include <dev/usb/usb.h> 46#include <dev/usb/usb.h>
@@ -116,26 +116,45 @@ static const struct ucom_methods uftdi_m @@ -116,26 +116,45 @@ static const struct ucom_methods uftdi_m
116 .ucom_set = uftdi_set, 116 .ucom_set = uftdi_set,
117 .ucom_param = uftdi_param, 117 .ucom_param = uftdi_param,
118 .ucom_open = uftdi_open, 118 .ucom_open = uftdi_open,
119 .ucom_read = uftdi_read, 119 .ucom_read = uftdi_read,
120 .ucom_write = uftdi_write, 120 .ucom_write = uftdi_write,
121}; 121};
122 122
123/* 123/*
124 * The devices default to UFTDI_TYPE_8U232AM. 124 * The devices default to UFTDI_TYPE_8U232AM.
125 * Remember to update uftdi_attach() if it should be UFTDI_TYPE_SIO instead 125 * Remember to update uftdi_attach() if it should be UFTDI_TYPE_SIO instead
126 */ 126 */
127static const struct usb_devno uftdi_devs[] = { 127static const struct usb_devno uftdi_devs[] = {
128 { USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 }, 128 { USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
 129 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
 130 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
 131 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
 132 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
 133 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
 134 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
 135 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
 136 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
 137 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
 138 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
 139 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
 140 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
 141 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
 142 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
 143 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
 144 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
 145 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
 146 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
 147 { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
129 { USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST }, 148 { USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
130 { USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA }, 149 { USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
131 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X }, 150 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },
132 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232H }, 151 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232H },
133 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232RL }, 152 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232RL },
134 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C }, 153 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C },
135 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_4232H }, 154 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_4232H },
136 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX }, 155 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX },
137 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM }, 156 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM },
138 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_KW }, 157 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_KW },
139 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_YS }, 158 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_YS },
140 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y6 }, 159 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y6 },
141 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y8 }, 160 { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MHAM_Y8 },