diff options
author | wpaul <wpaul@FreeBSD.org> | 1999-12-28 02:01:18 +0000 |
---|---|---|
committer | wpaul <wpaul@FreeBSD.org> | 1999-12-28 02:01:18 +0000 |
commit | b39a79861ddfb250e941d89c255bcb8cda9481dc (patch) | |
tree | aef1cc68bd5dbcc4e16d18beae0a106b6535f3da /release | |
parent | 293c4f50f0f5561061a3452727209e02d889e8f9 (diff) | |
download | FreeBSD-src-b39a79861ddfb250e941d89c255bcb8cda9481dc.zip FreeBSD-src-b39a79861ddfb250e941d89c255bcb8cda9481dc.tar.gz |
This commit adds device driver support for the ADMtek AN986 Pegasus
USB ethernet chip. Adapters that use this chip include the LinkSys
USB100TX. There are a few others, but I'm not certain of their
availability in the U.S. I used an ADMtek eval board for development.
Note that while the ADMtek chip is a 100Mbps device, you can't really
get 100Mbps speeds over USB. Regardless, this driver uses miibus to
allow speed and duplex mode selection as well as autonegotiation.
Building and kldloading the driver as a module is also supported.
Note that in order to make this driver work, I had to make what some
may consider an ugly hack to sys/dev/usb/usbdi.c. The usbd_transfer()
function will use tsleep() for synchronous transfers that don't complete
right away. This is a problem since there are times when we need to
do sync transfers from an interrupt context (i.e. when reading registers
from the MAC via the control endpoint), where tsleep() us a no-no.
My hack allows the driver to have the code poll for transfer completion
subject to the xfer->timeout timeout rather that calling tsleep().
This hack is controlled by a quirk entry and is only enabled for the
ADMtek device.
Now, I'm sure there are a few of you out there ready to jump on me
and suggest some other approach that doesn't involve a busy wait. The
only solution that might work is to handle the interrupts in a kernel
thread, where you may have something resembling a process context that
makes it okay to tsleep(). This is lovely, except we don't have any
mechanism like that now, and I'm not about to implement such a thing
myself since it's beyond the scope of driver development. (Translation:
I'll be damned if I know how to do it.) If FreeBSD ever aquires such
a mechanism, I'll be glad to revisit the driver to take advantage of
it. In the meantime, I settled for what I perceived to be the solution
that involved the least amount of code changes. In general, the hit
is pretty light.
Also note that my only USB test box has a UHCI controller: I haven't
I don't have a machine with an OHCI controller available.
Highlights:
- Updated usb_quirks.* to add UQ_NO_TSLEEP quirk for ADMtek part.
- Updated usbdevs and regenerated generated files
- Updated HARDWARE.TXT and RELNOTES.TXT files
- Updated sysinstall/device.c and userconfig.c
- Updated kernel configs -- device aue0 is commented out by default
- Updated /sys/conf/files
- Added new kld module directory
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/devices.c | 1 | ||||
-rw-r--r-- | release/texts/alpha/HARDWARE.TXT | 4 | ||||
-rw-r--r-- | release/texts/alpha/RELNOTES.TXT | 18 | ||||
-rw-r--r-- | release/texts/i386/HARDWARE.TXT | 4 | ||||
-rw-r--r-- | release/texts/i386/RELNOTES.TXT | 18 |
5 files changed, 39 insertions, 6 deletions
diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index e4dcf92..dbe28e9 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -85,6 +85,7 @@ static struct _devname { { DEVICE_TYPE_DISK, "ramrd%d", "AMI MegaRAID drive", 133, 65538, 8, 4, 'c' }, { DEVICE_TYPE_FLOPPY, "fd%d", "floppy drive unit A", 2, 0, 64, 4, 'b' }, { DEVICE_TYPE_FLOPPY, "worm%d", "SCSI optical disk / CDR", 23, 0, 1, 4, 'b' }, + { DEVICE_TYPE_NETWORK, "aue", "ADMtek USB ethernet adapter" }, { DEVICE_TYPE_NETWORK, "fpa", "DEC DEFPA PCI FDDI card" }, { DEVICE_TYPE_NETWORK, "sr", "SDL T1/E1 sync serial PCI card" }, { DEVICE_TYPE_NETWORK, "cc3i", "SDL HSSI sync serial PCI card" }, diff --git a/release/texts/alpha/HARDWARE.TXT b/release/texts/alpha/HARDWARE.TXT index e6a85a4..1732c67 100644 --- a/release/texts/alpha/HARDWARE.TXT +++ b/release/texts/alpha/HARDWARE.TXT @@ -366,6 +366,10 @@ Texas Instruments ThunderLAN PCI NICs, including the following: ADMtek AL981-based PCI fast ethernet NICs ADMtek AN985-based PCI fast ethernet NICs +ADMtek Inc. AN986-based USB ethernet NICs including the following: + LinkSys USB100TX + Billionton USB100 + Melco Inc. LU-ATX ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT index 24929fd..81dbf1d 100644 --- a/release/texts/alpha/RELNOTES.TXT +++ b/release/texts/alpha/RELNOTES.TXT @@ -77,18 +77,19 @@ Driver support has been added for PCI fast ethernet cards based on the ADMtek Inc. AL981 Comet chipset. [MERGED] Driver support has been added for PCI fast ethernet cards based -on the ADMtek Inc. AN985 Centaur chipset. +on the ADMtek Inc. AN985 Centaur chipset. [MERGED] Support has been added for the Rise mP6 processor. [MERGED] Driver support has been added for SysKonnect SK-984x PCI gigabit -ethernet adapters. +ethernet adapters. [MERGED] Driver support has been added for Adaptec Duralink PCI ethernet adapters -based on the Adaptec AIC-6915 fast ethernet controller. +based on the Adaptec AIC-6915 fast ethernet controller. [MERGED] Driver support has been added for PCI fast ethernet adapters based on the Sundance Technologies ST201 controller, including the D-Link DFE-550TX. +[MERGED] Driver support has been added for the 3Com 3c905C-TX. [MERGED] @@ -104,6 +105,7 @@ syslog(3) to log all messages to /var/log/security. Driver support has been added for PCI fast ethernet adapters based on the Silicon Integrated Systems SiS 900 and SiS 7016 ethernet controllers. +[MERGED] Driver support has been added for PCI fast ethernet adapters based on the Davicom DM9100 and DM9102 ethernet controllers, including the Jaton @@ -127,6 +129,12 @@ with a single driver (`dc') in order to reduce code duplication. The new driver handles all chipsets supported by the older driver, and it offers improved support for 10/100 cards based on the DEC/Intel 21143. +Driver support has been added for the 3Com 3c450-TX HomeConnect +PCI ethernet NIC. [MERGED] + +Driver support has been added for USB ethernet adapters based on +the ADMtek AN986 Pegasus chip, including the LinkSys USB100TX. + 1.2. SECURITY FIXES ------------------- @@ -353,6 +361,10 @@ Texas Instruments ThunderLAN PCI NICs, including the following: ADMtek Inc. AL981-based PCI fast ethernet NICs ADMtek Inc. AN985-based PCI fast ethernet NICs +ADMtek Inc. AN986-based USB ethernet NICs including the following: + LinkSys USB100TX + Billionton USB100 + Melco Inc. LU-ATX ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 diff --git a/release/texts/i386/HARDWARE.TXT b/release/texts/i386/HARDWARE.TXT index bf59e2c..6b691caa 100644 --- a/release/texts/i386/HARDWARE.TXT +++ b/release/texts/i386/HARDWARE.TXT @@ -490,6 +490,10 @@ Texas Instruments ThunderLAN PCI NICs, including the following: ADMtek AL981-based PCI fast ethernet NICs ADMtek AN985-based PCI fast ethernet NICs +ADMtek Inc. AN986-based USB ethernet NICs including the following: + LinkSys USB100TX + Billionton USB100 + Melco Inc. LU-ATX ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT index 5fb7139..08117cd 100644 --- a/release/texts/i386/RELNOTES.TXT +++ b/release/texts/i386/RELNOTES.TXT @@ -79,18 +79,19 @@ Driver support has been added for PCI fast ethernet cards based on the ADMtek Inc. AL981 Comet chipset. [MERGED] Driver support has been added for PCI fast ethernet cards based -on the ADMtek Inc. AL985 Centaur chipset. +on the ADMtek Inc. AL985 Centaur chipset. [MERGED] Support has been added for the Rise mP6 processor. [MERGED] Driver support has been added for SysKonnect SK-984x PCI gigabit -ethernet adapters. +ethernet adapters. [MERGED] Driver support has been added for Adaptec Duralink PCI ethernet adapters -based on the Adaptec AIC-6915 fast ethernet controller. +based on the Adaptec AIC-6915 fast ethernet controller. [MERGED] Driver support has been added for PCI fast ethernet adapters based on the Sundance Technologies ST201 controller, including the D-Link DFE-550TX. +[MERGED] Driver support has been added for the 3Com 3c905C-TX. [MERGED] @@ -106,6 +107,7 @@ syslog(3) to log all messages to /var/log/security. Driver support has been added for PCI fast ethernet adapters based on the Silicon Integrated Systems SiS 900 and SiS 7016 ethernet controllers. +[MERGED] Driver support has been added for PCI fast ethernet adapters based on the Davicom DM9100 and DM9102 ethernet controllers, including the Jaton @@ -129,6 +131,12 @@ with a single driver (`dc') in order to reduce code duplication. The new driver handles all chipsets supported by the older drivers, and it offers improved support for 10/100 cards based on the DEC/Intel 21143. +Driver support has been added for the 3Com 3c450-TX HomeConnect +PCI ethernet NIC. [MERGED] + +Driver support has been added for USB ethernet adapters based on +the ADMtek AN986 Pegasus chip, including the LinkSys USB100TX. + 1.2. SECURITY FIXES ------------------- @@ -359,6 +367,10 @@ Texas Instruments ThunderLAN PCI NICs, including the following: ADMtek Inc. AL981-based PCI fast ethernet NICs ADMtek Inc. AN985-based PCI fast ethernet NICs +ADMtek Inc. AN986-based USB ethernet NICs including the following: + LinkSys USB100TX + Billionton USB100 + Melco Inc. LU-ATX ASIX Electronics AX88140A PCI NICs, including the following: Alfa Inc. GFC2204 |