From d67e34fdc1bf2fec6a6214ad7961a1af2e3a4be4 Mon Sep 17 00:00:00 2001 From: jsg Date: Tue, 26 May 2015 02:13:07 +0000 Subject: [PATCH] Sync usb devices with amd64. Prompted by djm noticing uslcom(4) was not included. --- sys/arch/armv7/conf/GENERIC | 153 +++++++++++++++++++++++------------- sys/arch/armv7/conf/RAMDISK | 50 +++++------- 2 files changed, 117 insertions(+), 86 deletions(-) diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index fee06812ee3..2b039dbb9a8 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.2 2015/05/24 08:01:46 matthieu Exp $ +# $OpenBSD: GENERIC,v 1.3 2015/05/26 02:13:07 jsg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -101,59 +101,104 @@ usb* at ehci? #flags 0x1 # USB bus support usb* at ehci? flags 0x1 -uhub* at usb? -uhub* at uhub? - -ualea* at uhub? # Araneus Alea II TRNG -umodem* at uhub? # USB Modems/Serial -ucom* at umodem? -uvisor* at uhub? # Handspring Visor -ucom* at uvisor? -uvscom* at uhub? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? -ubsa* at uhub? # Belkin serial adapter -ucom* at ubsa? -uftdi* at uhub? # FTDI FT8U100AX serial adapter -ucom* at uftdi? -uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? -umct* at uhub? # MCT USB-RS232 serial adapter -ucom* at umct? -uaudio* at uhub? # USB Audio -audio* at uaudio? -umidi* at uhub? # USB MIDI -midi* at umidi? -ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 -ukbd* at uhidev? # USB keyboard -wskbd* at ukbd? mux 1 -uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART -ucom* at uslhcom? -uhid* at uhidev? # USB generic HID support -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -atu* at uhub? # Atmel AT76c50x based 802.11b -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -cdce* at uhub? # CDC Ethernet -upl* at uhub? # Prolific PL2301/PL2302 host-to-host -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host -udav* at uhub? # Davicom DM9601 based Ethernet -url* at uhub? # Realtek RTL8150L based adapters -wi* at uhub? # WaveLAN IEEE 802.11DS -udsbr* at uhub? # D-Link DSB-R100 radio -radio* at udsbr? # USB radio -ugen* at uhub? # USB Generic driver -rum* at uhub? # Ralink RT2501USB/RT2601USB -uvideo* at uhub? # USB Video -video* at uvideo? -udl* at uhub? # DisplayLink USB displays -wsdisplay* at udl? + +# USB devices +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +ualea* at uhub? # Araneus Alea II TRNG +umodem* at uhub? # USB Modems/Serial +ucom* at umodem? +uvisor* at uhub? # Handspring Visor +ucom* at uvisor? +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uslcom* at uhub? # Silicon Laboratories CP210x serial +ucom* at uslcom? +uark* at uhub? # Arkmicro ARK3116 serial +ucom* at uark? +moscom* at uhub? # MosChip MCS7703 serial +ucom* at moscom? +umcs* at uhub? # MosChip MCS78x0 serial +ucom* at umcs? +uipaq* at uhub? # iPAQ serial adapter +ucom* at uipaq? +umsm* at uhub? # Qualcomm MSM EVDO +ucom* at umsm? +uchcom* at uhub? # WinChipHead CH341/340 serial +ucom* at uchcom? +uticom* at uhub? # TI serial +ucom* at uticom? +uaudio* at uhub? # USB Audio +audio* at uaudio? +umidi* at uhub? # USB MIDI +midi* at umidi? +ulpt* at uhub? # USB Printers +umass* at uhub? # USB Mass Storage devices +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse +wsmouse* at ums? mux 0 +uts* at uhub? # USB touchscreen +wsmouse* at uts? mux 0 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +ucycom* at uhidev? # Cypress serial +ucom* at ucycom? +uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART +ucom* at uslhcom? +uhid* at uhidev? # USB generic HID support +upd* at uhidev? # USB Power Devices sensors +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +atu* at uhub? # Atmel AT76c50x based 802.11b +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +cdce* at uhub? # CDC Ethernet +urndis* at uhub? # Remote NDIS Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' +udav* at uhub? # Davicom DM9601 based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +udsbr* at uhub? # D-Link DSB-R100 radio +radio* at udsbr? # USB radio +uberry* at uhub? # Research In Motion BlackBerry +ugen* at uhub? # USB Generic driver +uath* at uhub? # Atheros AR5005UG/AR5005UX +ural* at uhub? # Ralink RT2500USB +rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +otus* at uhub? # Atheros AR9001U +athn* at uhub? # Atheros AR9002U +zyd* at uhub? # Zydas ZD1211 +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +urtw* at uhub? # Realtek 8187 +rsu* at uhub? # Realtek RTL8188SU/RTL8191SU/RTL8192SU +urtwn* at uhub? # Realtek RTL8188CU/RTL8192CU +udcf* at uhub? # Gude Expert mouseCLOCK +uthum* at uhidev? # TEMPerHUM sensor +ugold* at uhidev? # gold TEMPer sensor +utrh* at uhidev? # USBRH sensor +utwitch* at uhidev? # YUREX BBU sensor +uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter +uoakrh* at uhidev? # Toradex OAK temp and rel humidity +uoaklux* at uhidev? # Toradex OAK LUX +uoakv* at uhidev? # Toradex OAK 10V sensor +onewire* at uow? +uvideo* at uhub? # USB Video +video* at uvideo? +udl* at uhub? # DisplayLink USB displays +wsdisplay* at udl? atphy* at mii? # Attansic F1 PHYs rgephy* at mii? # Realtek 8169S/8110S PHY diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index 5798050e233..efbbcd6d359 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.1 2015/05/20 01:44:20 jsg Exp $ +# $OpenBSD: RAMDISK,v 1.2 2015/05/26 02:13:07 jsg Exp $ machine armv7 arm @@ -100,35 +100,13 @@ usb* at ehci? #flags 0x1 # USB bus support usb* at ehci? flags 0x1 + uhub* at usb? uhub* at uhub? - -umodem* at uhub? # USB Modems/Serial -ucom* at umodem? -uvisor* at uhub? # Handspring Visor -ucom* at uvisor? -uvscom* at uhub? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? -ubsa* at uhub? # Belkin serial adapter -ucom* at ubsa? -uftdi* at uhub? # FTDI FT8U100AX serial adapter -ucom* at uftdi? -uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? -umct* at uhub? # MCT USB-RS232 serial adapter -ucom* at umct? -uaudio* at uhub? # USB Audio -audio* at uaudio? -umidi* at uhub? # USB MIDI -midi* at umidi? -ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ukbd* at uhidev? # USB keyboard +uhidev* at uhub? +ukbd* at uhidev? wskbd* at ukbd? mux 1 -uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART -ucom* at uslhcom? -uhid* at uhidev? # USB generic HID support +umass* at uhub? aue* at uhub? # ADMtek AN986 Pegasus Ethernet atu* at uhub? # Atmel AT76c50x based 802.11b axe* at uhub? # ASIX Electronics AX88172 USB Ethernet @@ -137,15 +115,23 @@ cue* at uhub? # CATC USB-EL1201A based Ethernet kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet smsc* at uhub? # SMSC LAN95xx Ethernet cdce* at uhub? # CDC Ethernet -upl* at uhub? # Prolific PL2301/PL2302 host-to-host -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host udav* at uhub? # Davicom DM9601 based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS -udsbr* at uhub? # D-Link DSB-R100 radio -radio* at udsbr? # USB radio -ugen* at uhub? # USB Generic driver +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +ural* at uhub? # Ralink RT2500 rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +zyd* at uhub? # Zydas ZD1211/ZD1211B +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +urtw* at uhub? # Realtek 8187 +urtwn* at uhub? # Realtek RTL8188CU/RTL8192CU +rsu* at uhub? # Realtek RTL8188SU/RTL8191SU/RTL8192SU +uath* at uhub? # Atheros AR5005UG/AR5005UX +otus* at uhub? # Atheros AR9001U +athn* at uhub? # Atheros AR9002U atphy* at mii? # Attansic F1 PHYs rgephy* at mii? # Realtek 8169S/8110S PHY -- 2.20.1