On Sun, Feb 21, 2016 at 12:41:06PM -0700, Theo de Raadt wrote:
> It makes no sense to renumber the FT232_1 entry. That is just creating
> churn.
>
> As to the 0x0000 entry, I'm wondering whether it should be named something
> like the following, as a historical reminder:
>
> +product FTDI FT232_JERKS 0x0000 Serial
> [...]
Nice idea. I've added the "bricked" device as FT232_JERKS, with a
slightly longer description that hints at the reasoning behind the name:
Index: dev/usb/uftdi.c
===================================================================
RCS file: /mnt/media/cvs/src/sys/dev/usb/uftdi.c,v
retrieving revision 1.74
diff -u -p -r1.74 uftdi.c
--- dev/usb/uftdi.c 18 Jun 2015 09:47:16 -0000 1.74
+++ dev/usb/uftdi.c 21 Feb 2016 22:10:28 -0000
@@ -236,6 +236,7 @@ static const struct usb_devno uftdi_devs
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_4 },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_5 },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_6 },
+ { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_JERKS },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT4232H },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FTX },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GAMMASCOUT },
Index: dev/usb/usbdevs
===================================================================
RCS file: /mnt/media/cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.662
diff -u -p -r1.662 usbdevs
--- dev/usb/usbdevs 8 Jan 2016 09:31:32 -0000 1.662
+++ dev/usb/usbdevs 21 Feb 2016 22:12:57 -0000
@@ -1761,6 +1761,7 @@ product FOXCONN PIRELLI_DP_L10 0xe003 Pi
product FREECOM DVD 0xfc01 Connector for DVD drive
/* Future Technology Devices products */
+product FTDI FT232_JERKS 0x0000 Serial (\"bricked\" by Windows driver)
product FTDI FT232_1 0x0232 Serial
product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial
product FTDI SERIAL_8U232AM4 0x6004 8U232AM Serial
Index: dev/usb/usbdevs.h
===================================================================
RCS file: /mnt/media/cvs/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.674
diff -u -p -r1.674 usbdevs.h
--- dev/usb/usbdevs.h 8 Jan 2016 09:31:57 -0000 1.674
+++ dev/usb/usbdevs.h 21 Feb 2016 22:13:04 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs.h,v 1.674 2016/01/08 09:31:57 mpi Exp $ */
+/* $OpenBSD$ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -1768,6 +1768,7 @@
#define USB_PRODUCT_FREECOM_DVD 0xfc01 /* Connector for DVD
drive */
/* Future Technology Devices products */
+#define USB_PRODUCT_FTDI_FT232_JERKS 0x0000 /* Serial
(\"bricked\" by Windows driver) */
#define USB_PRODUCT_FTDI_FT232_1 0x0232 /* Serial */
#define USB_PRODUCT_FTDI_SERIAL_8U232AM 0x6001 /* 8U232AM
Serial */
#define USB_PRODUCT_FTDI_SERIAL_8U232AM4 0x6004 /*
8U232AM Serial */
Index: dev/usb/usbdevs_data.h
===================================================================
RCS file: /mnt/media/cvs/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.668
diff -u -p -r1.668 usbdevs_data.h
--- dev/usb/usbdevs_data.h 8 Jan 2016 09:31:57 -0000 1.668
+++ dev/usb/usbdevs_data.h 21 Feb 2016 22:13:04 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs_data.h,v 1.668 2016/01/08 09:31:57 mpi Exp $ */
+/* $OpenBSD$ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -3168,6 +3168,10 @@ const struct usb_known_product usb_known
{
USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
"Connector for DVD drive",
+ },
+ {
+ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_JERKS,
+ "Serial (\"bricked\" by Windows driver)",
},
{
USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_1,
