diff options
| author |   pvalchev <pvalchev@openbsd.org> | 2004-04-18 02:28:04 +0000 |
|---|---|---|
| committer | pvalchev <pvalchev@openbsd.org> | 2004-04-18 02:28:04 +0000 |
| commit | 73225a944a017d6f04574eceeab2ed461b899dee (patch) | |
| tree | 2b47ef6ffc365a628d88e417674e861e32d1a060 | |
| parent | unify the whole USB section with the already-improved i386 GENERIC (diff) | |
| download | wireguard-openbsd-73225a944a017d6f04574eceeab2ed461b899dee.tar.xz wireguard-openbsd-73225a944a017d6f04574eceeab2ed461b899dee.zip | |
unify USB section with i386 GENERIC, but leave "midi at umidi" commented out
while an issue is being resolved
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 9ed139c28f7..d8e12f115e6 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2004/03/12 22:36:54 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.12 2004/04/18 02:28:04 pvalchev Exp $ # # GENERIC -- everything that's currently supported # @@ -87,6 +87,7 @@ ohci* at pci? # Open Host Controller usb* at uhci? usb* at ohci? +# USB devices uhub* at usb? # USB Hubs uhub* at uhub? port ? configuration ? # USB Hubs umodem* at uhub? port ? configuration ? # USB Modems/Serial @@ -104,28 +105,32 @@ ucom* at uplcom? portno ? umct* at uhub? port ? # MCT USB-RS232 serial adapter ucom* at umct? portno ? uaudio* at uhub? port ? configuration ? # USB Audio -umidi* at uhub? port ? configuration ? +audio* at uaudio? +umidi* at uhub? port ? configuration ? # USB MIDI +#midi* at umidi? ulpt* at uhub? port ? configuration ? # USB Printers umass* at uhub? port ? configuration ? # USB Mass Storage devices scsibus* at umass? -uhidev* at uhub? port ? configuration ? interface ? -ums* at uhidev? reportid ? +uhidev* at uhub? port ? configuration ? interface ? # Human Interface Devices +ums* at uhidev? reportid ? # USB mouse wsmouse* at ums? mux 0 -ukbd* at uhidev? reportid ? +ukbd* at uhidev? reportid ? # USB keyboard wskbd* at ukbd? console ? mux 1 -uhid* at uhidev? reportid ? +uhid* at uhidev? reportid ? # USB generic HID support aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? port ? # ASIX Electronics AX88172 USB Ethernet cue* at uhub? port ? # CATC USB-EL1201A based Ethernet kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet upl* at uhub? port ? # Prolific PL2301/PL2302 host-to-host `network' url* at uhub? port ? # Realtek RTL8150L based adapters -#urio* at uhub? port ? # Diamond Multimedia Rio 500 +wi* at uhub? port ? # WaveLAN IEEE 802.11DS +urio* at uhub? port ? # Diamond Multimedia Rio 500 uscanner* at uhub? port ? # USB Scanners usscanner* at uhub? port ? # USB SCSI scanners, e.g., HP5300 scsibus* at usscanner? uyap* at uhub? port ? # Y@P firmware loader udsbr* at uhub? port ? # D-Link DSB-R100 radio -radio* at udsbr? +radio* at udsbr? # USB radio ugen* at uhub? port ? configuration ? # USB Generic driver # FireWire Controllers @@ -342,7 +347,6 @@ stge* at pci? dev ? function ? # Sundance TC9021 GigE # Wireless network cards wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS #wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS -#wi* at uhub? port ? # WaveLAN IEEE 802.11DS #awi* at pcmcia? function ? # Bay Networks IEEE 802.11FH #an* at pci? dev ? function ? # Aironet IEEE 802.11DS #an* at pcmcia? function ? # Aironet IEEE 802.11DS |