Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Rename RT2500USB driver to ural(4) as it was originally ...



details:   https://anonhg.NetBSD.org/src/rev/af174b2aefe4
branches:  trunk
changeset: 781363:af174b2aefe4
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Sep 01 18:17:49 2012 +0000

description:
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.

diffstat:

 sys/arch/amd64/conf/GENERIC            |  6 +++---
 sys/arch/amd64/conf/XEN3_DOM0          |  4 ++--
 sys/arch/evbarm/conf/HDL_G             |  4 ++--
 sys/arch/evbarm/conf/HPT5325           |  4 ++--
 sys/arch/evbarm/conf/MMNET_GENERIC     |  6 +++---
 sys/arch/evbarm/conf/MPCSA_GENERIC     |  6 +++---
 sys/arch/evbarm/conf/NSLU2             |  4 ++--
 sys/arch/evbarm/conf/OPENBLOCKS_A6     |  4 ++--
 sys/arch/evbarm/conf/SHEEVAPLUG        |  4 ++--
 sys/arch/evbppc/conf/OPENBLOCKS266_OPT |  4 ++--
 sys/arch/hp700/conf/GENERIC            |  6 +++---
 sys/arch/hpcarm/conf/WZERO3            |  6 +++---
 sys/arch/i386/conf/ALL                 |  6 +++---
 sys/arch/i386/conf/GENERIC             |  6 +++---
 sys/arch/i386/conf/XEN3_DOM0           |  4 ++--
 sys/arch/iyonix/conf/GENERIC           |  6 +++---
 sys/arch/landisk/conf/GENERIC          |  6 +++---
 sys/arch/macppc/conf/GENERIC           |  6 +++---
 sys/arch/ofppc/conf/GENERIC            |  6 +++---
 sys/arch/sparc64/conf/GENERIC          |  6 +++---
 sys/dev/usb/files.usb                  |  5 +++--
 sys/dev/usb/usbdevices.config          |  4 ++--
 22 files changed, 57 insertions(+), 56 deletions(-)

diffs (truncated from 505 to 300 lines):

diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 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 @@
 # 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
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 # 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
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbarm/conf/HDL_G
--- a/sys/arch/evbarm/conf/HDL_G        Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbarm/conf/HDL_G        Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 # 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 ?
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbarm/conf/HPT5325
--- a/sys/arch/evbarm/conf/HPT5325      Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbarm/conf/HPT5325      Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 # 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
 
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbarm/conf/MMNET_GENERIC
--- a/sys/arch/evbarm/conf/MMNET_GENERIC        Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbarm/conf/MMNET_GENERIC        Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 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 @@
 
 # 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
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbarm/conf/MPCSA_GENERIC
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC        Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC        Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 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 @@
 
 # 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
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbarm/conf/NSLU2
--- a/sys/arch/evbarm/conf/NSLU2        Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbarm/conf/NSLU2        Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 # 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 ?
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbarm/conf/OPENBLOCKS_A6
--- a/sys/arch/evbarm/conf/OPENBLOCKS_A6        Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbarm/conf/OPENBLOCKS_A6        Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 # 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
 
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbarm/conf/SHEEVAPLUG
--- a/sys/arch/evbarm/conf/SHEEVAPLUG   Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbarm/conf/SHEEVAPLUG   Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 # 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
 
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/evbppc/conf/OPENBLOCKS266_OPT
--- a/sys/arch/evbppc/conf/OPENBLOCKS266_OPT    Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266_OPT    Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 # 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
 
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/hp700/conf/GENERIC
--- a/sys/arch/hp700/conf/GENERIC       Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/hp700/conf/GENERIC       Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 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 @@
 
 # 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
 
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/hpcarm/conf/WZERO3
--- a/sys/arch/hpcarm/conf/WZERO3       Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/hpcarm/conf/WZERO3       Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 #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 @@
 
 # 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
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/i386/conf/ALL    Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 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 @@
 # 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
diff -r 93b0b22da35a -r af174b2aefe4 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Sep 01 17:36:07 2012 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Sep 01 18:17:49 2012 +0000
@@ -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 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary



Home | Main Index | Thread Index | Old Index