More usbdevs additions/changes, from NetBSD

[Barry Bouwsma <freebsd-misuser@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>]

[posted separately to DragonFly and FreeBSD, but this hack
 is applicable to both, in theory -- the DFly list is for
 subscribers so that simple cross-posting isn't convenient]
[keep followups on the lists, please, for now]


Servus,

Here's another patch to usbdevs, applicable to both FreeBSD and
DragonFlyBSD, to bring them both pretty much up-to-date with the
NetBSD usbdevs file as of a week or so ago.

This diff requires my previously-posted patch to bring FreeBSD and
DragonFly into sync with each other.  (I haven't yet downloaded the
latest HEAD usbdevs since I started this merge project, but I'll
take Matt's word that DFly is up-to-date so that this patch should
Just Work, barring additions since my previous patch.  I hope.)

This patch corrects a few whitespace diffs, and does a hefty amount
of name cleaning (dropping Inc, Electronics, and so on).  Most
importantly, plenty of new vendors and products present in NetBSD
are added.

There are still going to be a few differences between NetBSD and
not-NetBSD after this patch.  But they'll be few, and easy-to-find.
Things like SUN vs. SUN2, and a few vendor names that are completely
different, that I'm leaving as-is for now for later review.  Or, I'm
trying to leave as-is, but it wouldn't hurt to verify this is really
the case by reviewing the meat of my diffs.


I'm hoping that the new added vendors/products don't introduce any
incompatibilities due to the above-mentioned conflicts.  *Please*
apply and LINT-test this patch on a reasonably-fast machine before
making any commits, and let me know of any conflicts -- or check out
the latest NetBSD usbdevs and see what differences remain and how
they should be fixed, if you want to do my work for me.

This patch is *untested* and is based on manually cleaning up the
remaining diffs of NetBSD.


Find the meat of the diffs at
https://nospam.dyndns.dk/hacks/usbdevs/usbdevs-patch-for-d.f.bsd-based-on-netbsd



That will give you the actual significant changes.  There are a few
minor diffs to bring about complete harmony, which can be reviewed
and applied by hand, that follow.  These add my notes about what
versions of the various BSDen have been used to generate the resulting
mega-merged file I'm working with, and show differences with the
NetBSD comment about the file.  The first will need to be reviewed
and the appropriate lines added by hand if desired; the second should
work as-is if my cut-and-paste hasn't botched tab/space integrity.


@@ -1,7 +1,11 @@
-$FreeBSD$
+$NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $
+
+/* Includes additions from DragonFlyBSD usbdevs 1.11 */
+/* Includes additions from FreeBSD usbdevs 1.210 */
+/* Includes additions from NetBSD usbdevs 1.388 */

 /*
- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation


@@ -40,16 +44,12 @@
 /*
  * List of known USB vendors
  *
- * Adding an ID and its string description for a device to the usbdevs
- * file, enables the USB stack to print a useful description of the
- * device that was connected.
- *
- * Please note that these IDs do not do anything. Adding an ID here
- * only makes a symbolic name available to the source code and does
- * not change any functionality, nor does it make your device
- * available to a specific driver.  It will however make the
- * descriptive string available if a device does not provide the
- * string itself.
+ * Please note that these IDs do not do anything. Adding an ID here and
+ * regenerating the usbdevs.h and usbdevs_data.h only makes a symbolic name
+ * available to the source code and does not change any functionality, nor
+ * does it make your device available to a specific driver.
+ * It will however make the descriptive string available if a device does not
+ * provide the string itself.
  *
  * After adding a vendor ID VNDR and a product ID PRDCT you will have the
  * following extra defines:




Because this is a substantial diff and there remain a few differences
between the symbolic names used by a particular ID, I cannot strongly
enough urge more eyeballs to review these changes.  Also, I'm sure
that nobody else who might be interested in these patches has my 75MHz
machine, which is why I'm posting these without the week's delay just to
verify that they compile, so please be forgiving and spare a few cycles
on your over-muscled machines to do that for me.

And of course, if you prefer the original descriptions in D/FBSD over
those in NetBSD, say,
-product SITECOM LN029          0x182d  USB 2.0 Ethernet Adapter
+product SITECOM LN029          0x182d  LN029
then feel free to say so, or to request such things be changed in
NetBSD as well.

Also, there are a couple notes I've made for myself which can be found
by a search for `XXX ???', if you don't like X-rated source.


A little bit later, I'll summarize the remaining differences between
NetBSD and D/FBSD-with-these-hacks.  I still see a handful of whitespace
corrections, as well as a few I-see-no-differences-here things that I
want to clear up, as well as doing a few source-greps for usage of any
symbolic-name changes.

Then I'll merge changes from OpenBSD as well as changes I've added for
products in my possession, verify ordering, verify tab/spaces, bring in
the latest additions from *BSD, ...


thanks
barry bouwsma