summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@NetBSD.org>2005-07-01 20:11:20 +0000
committerdrochner <drochner@NetBSD.org>2005-07-01 20:11:20 +0000
commit8728cee4482801a643192a3db5bce4eaff71cc82 (patch)
tree38144ee5c8ce8f0142daca75b302194a4fd9da3d
parentc1834d85c28c23f26597e7b475f20cf8757b4711 (diff)
add autoconf glue for the ralink wireless drivers, basically from
PR kern/30449, but changed so that pci/cardbus and usb devices are all called "ral" to the user, so that code can be shared eventually
-rw-r--r--sys/conf/files7
-rw-r--r--sys/dev/cardbus/files.cardbus8
-rw-r--r--sys/dev/pci/files.pci6
-rw-r--r--sys/dev/usb/files.usb6
4 files changed, 23 insertions, 4 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 2b0c5cd3380..2ace891594e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.721 2005/06/27 21:41:45 christos Exp $
+# $NetBSD: files,v 1.722 2005/07/01 20:11:20 drochner Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -520,6 +520,11 @@ file dev/ic/rtw.c rtw
file dev/ic/rtwphy.c rtw
file dev/ic/rtwphyio.c rtw
+# Ralink RT2500 802.11
+device ral: arp, ether, ifnet, wlan
+define ralcommon
+file dev/ic/ral.c ralcommon
+
# 3Com Etherlink-III Ethernet controller
#
device ep: arp, ether, ifnet, mii, mii_bitbang
diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus
index 8b2205c381a..74edd328cd7 100644
--- a/sys/dev/cardbus/files.cardbus
+++ b/sys/dev/cardbus/files.cardbus
@@ -1,4 +1,4 @@
-# $NetBSD: files.cardbus,v 1.28 2005/05/12 06:21:01 augustss Exp $
+# $NetBSD: files.cardbus,v 1.29 2005/07/01 20:11:20 drochner Exp $
#
# files.cardbus
#
@@ -47,6 +47,12 @@ attach rtw at cardbus with rtw_cardbus
file dev/cardbus/if_rtw_cardbus.c rtw_cardbus
#
+# Ralink RT2500
+#
+attach ral at cardbus with ral_cardbus: ralcommon
+file dev/cardbus/if_ral_cardbus.c ral_cardbus
+
+#
# DECchip 21143 and clones.
#
attach tlp at cardbus with tlp_cardbus
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 073b1be61b7..e8c371874c0 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.234 2005/06/25 22:08:54 dyoung Exp $
+# $NetBSD: files.pci,v 1.235 2005/07/01 20:11:20 drochner Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -675,6 +675,10 @@ file dev/pci/if_atw_pci.c atw_pci
attach rtw at pci with rtw_pci
file dev/pci/if_rtw_pci.c rtw_pci
+# Ralink RT2500 PCI/Mini-PCI
+attach ral at pci with ral_pci: ralcommon
+file dev/pci/if_ral_pci.c ral_pci
+
# Intersil Prism2.5 Mini-PCI
attach wi at pci with wi_pci
file dev/pci/if_wi_pci.c wi_pci
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 37a390aa0cc..3c6cbb840f7 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.61 2005/06/13 16:41:44 cube Exp $
+# $NetBSD: files.usb,v 1.62 2005/07/01 20:11:20 drochner Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -248,3 +248,7 @@ file dev/usb/usscanner.c usscanner
device atu: ether, ifnet, arp, wlan
attach atu at uhub
file dev/usb/if_atu.c atu
+
+# Ralink Technology RT2500USB
+attach ral at uhub with ural
+file dev/usb/if_ural.c ural