USB vendore designations..

Barry Bouwsma freebsd-misuser at remove-NOSPAM-to-reply.NOSPAM.dyndns.dk
Wed Dec 29 23:19:56 PST 2004


[I can't sent Matt a copy of this directly, so...]

On Wed, 29 Dec 2004 14:02:08 -0700 (MST), Warner Losh wrote:

> > https://NOSPAM.dyndns.dk/hacks/usbdevs/
> > (sort by date for latest updates)

> I think that it is going to take sepveral steps to get from here to
> there.  Since I have CVS access to both FreeBSD and NetBSD, I can
> directly make changes there.  Since I prefer smaller, more easily
> tested patches to one big jumbo patch, I'd like to propose that we
> harmonize strings first, as much as possible, before going after the
> name changes.  I'd also like to do these in smaller batches so that

Okay, here's the status of things, as far as I know:

Matt and Julian have merged the D/FBSD differences into -current, so
that there's nothing missing between them.

Matt, brave soul that he is, merged my untested NetBSD diffs into
DFly.   Another commit fixed the problems that introduced.  Again,
my apologies for not having tested things thoroughly on my slow
machine.

My NetBSD merge-from-D/FBSD is split into a vendors-patch and a
devices-patch.  There are still problems, which I've corrected in
the BUILT-on-netbsd file.  I needed to make no source changes on
NetBSD yet, as I stuck with that naming (even when in conflict with
the USB site info), to make my life easier.  I'll return to that
later.  i386 GENERIC and world is what I built -- not sure if there's
a LINT-like target to catch anything else.

Then I used that as a basis for the -in-progress-for-freebsd file,
but that needs source code changes.  4.x LINT built; world in the
depend stage at the moment (75MHz, hey)  Source changes not yet
cleaned up and made available.  I'll attack -current next.  Next year.


I could regenerate the vendors/devices diffs for addition to NetBSD,
if you want to commit that to NetBSD, after review, or you could just
diff the BUILT-on-netbsd file and cut the diff in half.  I believe
this is safe to commit, after I fixed my typos and other bozoisms.
I may have added a few comments in this.

As NetBSD is somewhat more state-of-the-art here, the majority of
catching-up needs to happen in D/FBSD.  And OpenBSD.


> I'd also like to merge more predictably.  Eg, I'd like to merge the
> stuff that isn't in FreeBSD into NetBSD and vice versa and then go

The first is easy; the second takes more effort.  Feel free to
take my work-in-progress and start from that.  As you see, it's
taken two weeks for me to get where I am today, that normal
people need maybe two hours.


> after the conflicts.  Once that's done, do the same for OpenBSD's and
> DFBSD's usbdevs.  This likely will take a couple of iterations, plus

DFly and FreeBSD were roughly identical, so that part's already
done with no major breakage.  OpenBSD has a bit to offer, although
I haven't posted to the OpenBSD list (they bite, don't they?), and
the major changes from that are further shortening strings.


Another thing to note about my FreeBSD work-in-progress -- as I
was bringing my 4.x miidevs file up-to-date against -current and
then NetBSD, I noted that NetBSD had adopted an `xx' prefix for
miidevs alternate IDs, so I decided to do similar for usbdevs,
in the case of the byte-swapped HP id, HP2 => zyHP (`zy' chosen
to indicate inadvertent byte-swapping).  `xx' for alternate IDs,
which probably belong to some other manufacturer that get used
in those products.


> > to miidevs, I tried merging in NetBSD's additions as well.
> > Can I assume it's a laudable goal to try to keep text *devs
> > databases consistent between the BSDen?

> Generally, yes.  specifically for miidevs, pccarddevs and usbdevs.
> All the other devs aren't common between all the BSDs.

Great.  The NetBSD origin of the file is what encouraged me to
do this.  The differences are rather unpleasant though, and will
require me to try and wrap my head around what's going on, so
I'll stick with USB code for now.  My head hurts enough just
looking at the miidevs file without understanding it.

If someone with MII-fu wants to look at the differences, I've
put the FreeBSD-specific result of my merge up at
https://NOSPAM.dyndns.dk/hacks/miidevs/miidevs

The usual disclaimer, that I have no clue.  I'll try to obtain
clue later.  'Twon't be easy.


thanks
barry bouwsma



More information about the freebsd-usb mailing list