Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename RT2500USB driver to ural(4) as it was originally in OpenBSD, 

as ural(4) and ral(4) do not actually share any code.

Enable ural(4) in hpcarm WZERO3 kernel too, as it will now build.

Fixes PR#43520.
This commit is contained in:
jakllsch 2012-09-01 18:17:49 +00:00
parent caf01f5d42
commit ec5ba90796
22 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/amd64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.362 2012/09/01 15:25:33 jakllsch Exp $
# $NetBSD: GENERIC,v 1.363 2012/09/01 18:17:49 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.362 $"
#ident "GENERIC-$Revision: 1.363 $"
maxusers 64 # estimated number of users
@ -964,7 +964,7 @@ uscanner* at uhub? port ?
# USB 802.11 adapters
atu* at uhub? port ? # Atmel at76c50x 802.11b
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g

4
sys/arch/amd64/conf/XEN3_DOM0
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.85 2012/06/22 22:38:39 khorben Exp $
# $NetBSD: XEN3_DOM0,v 1.86 2012/09/01 18:17:49 jakllsch Exp $
include "arch/amd64/conf/std.xen"
@ -621,7 +621,7 @@ urndis* at uhub? port ? # Microsoft RNDIS specification
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter

4
sys/arch/evbarm/conf/HDL_G
View File

@ -1,4 +1,4 @@
# $NetBSD: HDL_G,v 1.29 2012/09/01 14:50:11 matt Exp $
# $NetBSD: HDL_G,v 1.30 2012/09/01 18:17:49 jakllsch Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@ -326,7 +326,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11b adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter
upl* at uhub? port ?

4
sys/arch/evbarm/conf/HPT5325
View File

@ -1,4 +1,4 @@
# $NetBSD: HPT5325,v 1.4 2012/08/29 08:29:58 skrll Exp $
# $NetBSD: HPT5325,v 1.5 2012/09/01 18:17:49 jakllsch Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@ -321,7 +321,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211

6
sys/arch/evbarm/conf/MMNET_GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: MMNET_GENERIC,v 1.6 2012/06/05 08:44:09 abs Exp $
# $NetBSD: MMNET_GENERIC,v 1.7 2012/09/01 18:17:49 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.6 $"
#ident "GENERIC-$Revision: 1.7 $"
maxusers 32 # estimated number of users
@ -456,7 +456,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter

6
sys/arch/evbarm/conf/MPCSA_GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: MPCSA_GENERIC,v 1.29 2012/06/05 08:44:09 abs Exp $
# $NetBSD: MPCSA_GENERIC,v 1.30 2012/09/01 18:17:49 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.29 $"
#ident "GENERIC-$Revision: 1.30 $"
maxusers 32 # estimated number of users
@ -514,7 +514,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter

4
sys/arch/evbarm/conf/NSLU2
View File

@ -1,4 +1,4 @@
# $NetBSD: NSLU2,v 1.25 2012/09/01 14:50:11 matt Exp $
# $NetBSD: NSLU2,v 1.26 2012/09/01 18:17:50 jakllsch Exp $
#
# Linksys NSLU2 "Slug" NAS Device
#
@ -217,7 +217,7 @@ ukphy* at mii? phy ? # Generic/Unknown PHY
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
# USB Generic driver
ugen* at uhub? port ? configuration ? interface ?

4
sys/arch/evbarm/conf/OPENBLOCKS_A6
View File

@ -1,4 +1,4 @@
# $NetBSD: OPENBLOCKS_A6,v 1.4 2012/08/29 08:29:58 skrll Exp $
# $NetBSD: OPENBLOCKS_A6,v 1.5 2012/09/01 18:17:50 jakllsch Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@ -273,7 +273,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211

4
sys/arch/evbarm/conf/SHEEVAPLUG
View File

@ -1,4 +1,4 @@
# $NetBSD: SHEEVAPLUG,v 1.18 2012/08/29 08:29:59 skrll Exp $
# $NetBSD: SHEEVAPLUG,v 1.19 2012/09/01 18:17:50 jakllsch Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@ -317,7 +317,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211

4
sys/arch/evbppc/conf/OPENBLOCKS266_OPT
View File

@ -1,4 +1,4 @@
# $NetBSD: OPENBLOCKS266_OPT,v 1.16 2011/07/23 21:12:58 jakllsch Exp $
# $NetBSD: OPENBLOCKS266_OPT,v 1.17 2012/09/01 18:17:50 jakllsch Exp $
#
include "arch/evbppc/conf/OPENBLOCKS266"
@ -219,7 +219,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11b adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211

6
sys/arch/hp700/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.115 2012/06/05 08:44:11 abs Exp $
# $NetBSD: GENERIC,v 1.116 2012/09/01 18:17:50 jakllsch Exp $
#
# GENERIC machine description file
#
@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
#ident "GENERIC-$Revision: 1.115 $"
#ident "GENERIC-$Revision: 1.116 $"
maxusers 32 # estimated number of users
@ -635,7 +635,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
zyd* at uhub? port ? # Zydas ZD1211

6
sys/arch/hpcarm/conf/WZERO3
View File

@ -1,4 +1,4 @@
# $NetBSD: WZERO3,v 1.26 2012/08/17 19:43:25 abs Exp $
# $NetBSD: WZERO3,v 1.27 2012/09/01 18:17:50 jakllsch Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.wzero3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.26 $"
#ident "GENERIC-$Revision: 1.27 $"
# estimated number of users
maxusers 32
@ -255,7 +255,7 @@ urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
#ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
upgt* at uhub? port ? # Intersil PrismGT
zyd* at uhub? port ? # Zydas ZD1211

6
sys/arch/i386/conf/ALL
View File

@ -1,4 +1,4 @@
# $NetBSD: ALL,v 1.342 2012/08/04 04:39:40 riastradh Exp $
# $NetBSD: ALL,v 1.343 2012/09/01 18:17:50 jakllsch Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "ALL-$Revision: 1.342 $"
#ident "ALL-$Revision: 1.343 $"
maxusers 64 # estimated number of users
@ -1274,7 +1274,7 @@ urndis* at uhub? port ? # Microsoft RNDIS specification
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
upgt* at uhub? port ? # Intersil PrismGT
zyd* at uhub? port ? # Zydas ZD1211

6
sys/arch/i386/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.1078 2012/08/10 11:32:32 sborrill Exp $
# $NetBSD: GENERIC,v 1.1079 2012/09/01 18:17:50 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.1078 $"
#ident "GENERIC-$Revision: 1.1079 $"
maxusers 64 # estimated number of users
@ -1230,7 +1230,7 @@ urndis* at uhub? port ? # Microsoft RNDIS specification
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
upgt* at uhub? port ? # Intersil PrismGT

4
sys/arch/i386/conf/XEN3_DOM0
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.67 2012/06/05 08:44:13 abs Exp $
# $NetBSD: XEN3_DOM0,v 1.68 2012/09/01 18:17:50 jakllsch Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@ -599,7 +599,7 @@ urndis* at uhub? port ? # Microsoft RNDIS specification
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
# Prolific PL2301/PL2302 host-to-host adapter

6
sys/arch/iyonix/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.71 2012/08/17 20:11:40 abs Exp $
# $NetBSD: GENERIC,v 1.72 2012/09/01 18:17:50 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.71 $"
#ident "GENERIC-$Revision: 1.72 $"
maxusers 32 # estimated number of users
@ -596,7 +596,7 @@ uaudio* at uhub? port ? configuration ?
# USB 802.11 adapters
#atu* at uhub? port ? # Atmel AT76C50XX based adapters
#ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
#ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
#rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211

6
sys/arch/landisk/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.31 2012/03/10 21:51:53 joerg Exp $
# $NetBSD: GENERIC,v 1.32 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.31 $"
#ident "GENERIC-$Revision: 1.32 $"
maxusers 16 # estimated number of users
@ -338,7 +338,7 @@ cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
udav* at uhub? port ? # Davicom DM9601 based adapters
ral* at uhub? port ? #
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11b adapters

6
sys/arch/macppc/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.302 2012/08/17 20:11:40 abs Exp $
# $NetBSD: GENERIC,v 1.303 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.302 $"
#ident "GENERIC-$Revision: 1.303 $"
maxusers 32
@ -530,7 +530,7 @@ ugen* at uhub? port ? configuration ? interface ? # USB Generic driver
# USB 802.11 adapters
atu* at uhub? port ? # Atmel at76c50x 802.11b
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211

6
sys/arch/ofppc/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.142 2012/08/17 20:11:41 abs Exp $
# $NetBSD: GENERIC,v 1.143 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.142 $"
#ident "GENERIC-$Revision: 1.143 $"
maxusers 32
@ -387,7 +387,7 @@ ugen* at uhub? port ? configuration ? interface ? # USB Generic driver
# USB 802.11 adapters
#atu* at uhub? port ? # Atmel at76c50x 802.11b
#ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
#ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211
# PCI IEEE1394 controllers

6
sys/arch/sparc64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.151 2012/06/05 08:44:16 abs Exp $
# $NetBSD: GENERIC,v 1.152 2012/09/01 18:17:51 jakllsch Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.151 $"
#ident "GENERIC-$Revision: 1.152 $"
maxusers 64
@ -630,7 +630,7 @@ url* at uhub? port ? # Realtek RTL8150L based adapters
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
#zyd* at uhub? port ? # Zydas ZD1211
# Prolific PL2301/PL2302 host-to-host adapter

5
sys/dev/usb/files.usb
View File

@ -1,4 +1,4 @@
# $NetBSD: files.usb,v 1.124 2012/08/04 04:34:54 riastradh Exp $
# $NetBSD: files.usb,v 1.125 2012/09/01 18:17:51 jakllsch Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@ -379,7 +379,8 @@ attach upgt at usbdevif
file dev/usb/if_upgt.c upgt
# Ralink Technology RT2500USB
attach ral at usbdevif with ural
device ural: arp, ether, ifnet, wlan, firmload
attach ural at usbdevif
file dev/usb/if_ural.c ural
device rum: ether, ifnet, arp, wlan, firmload

4
sys/dev/usb/usbdevices.config
View File

@ -1,4 +1,4 @@
# $NetBSD: usbdevices.config,v 1.15 2012/09/01 17:36:07 jakllsch Exp $
# $NetBSD: usbdevices.config,v 1.16 2012/09/01 18:17:51 jakllsch Exp $
#
# This file contains all USB related configuration.
# It is suitable for inclusion in a kernel config(5) file.
@ -113,7 +113,7 @@ urndis* at uhub? port ? # Microsoft RNDIS specification
# USB 802.11 adapters
atu* at uhub? port ? # Atmel AT76C50XX based adapters
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
upgt* at uhub? port ? # Intersil PrismGT