to make mpi's life a tad easier and also lose some weight,
i'd like to move rat(4) to the attic. mpi, kettenis, jsg
and henning agree. i'll commit the diff if noone objects.
henning has also suggested to remove the pre-wifi era cnw(4).
if there's interest i can cook a diff for that as well, but
it doesn't seem to get in the way at the moment.
Index: arch/amd64/conf/GENERIC
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.343
diff -u -p -r1.343 GENERIC
--- arch/amd64/conf/GENERIC 12 Aug 2013 04:11:52 -0000 1.343
+++ arch/amd64/conf/GENERIC 13 Aug 2013 13:10:57 -0000
@@ -472,7 +472,6 @@ wi* at pcmcia? # WaveLAN IEEE 802.11DS
an* at pci? # Aironet IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
cnw* at pcmcia? # Xircom Netwave
-ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
iwn* at pci? # Intel WiFi Link 4965/5000/1000/6000
Index: arch/amd64/conf/RAMDISK
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/amd64/conf/RAMDISK,v
retrieving revision 1.55
diff -u -p -r1.55 RAMDISK
--- arch/amd64/conf/RAMDISK 15 Mar 2012 20:06:02 -0000 1.55
+++ arch/amd64/conf/RAMDISK 13 Aug 2013 13:10:57 -0000
@@ -217,7 +217,6 @@ nfe* at pci? # NVIDIA nForce Ethernet
#wi* at pcmcia? # WaveLAN IEEE 802.11DS
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
# Media Independent Interface (mii) drivers
#exphy* at mii? # 3Com internal PHYs
Index: arch/amd64/conf/RAMDISK_CD
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/amd64/conf/RAMDISK_CD,v
retrieving revision 1.125
diff -u -p -r1.125 RAMDISK_CD
--- arch/amd64/conf/RAMDISK_CD 5 Apr 2013 05:45:09 -0000 1.125
+++ arch/amd64/conf/RAMDISK_CD 13 Aug 2013 13:10:57 -0000
@@ -291,7 +291,6 @@ wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
Index: arch/i386/conf/GENERIC
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/i386/conf/GENERIC,v
retrieving revision 1.748
diff -u -p -r1.748 GENERIC
--- arch/i386/conf/GENERIC 12 Aug 2013 04:11:52 -0000 1.748
+++ arch/i386/conf/GENERIC 13 Aug 2013 13:10:57 -0000
@@ -612,7 +612,6 @@ an* at pci? # Aironet IEEE 802.11DS
an* at isapnp? # Aironet IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
Index: arch/i386/conf/RAMDISK
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/i386/conf/RAMDISK,v
retrieving revision 1.180
diff -u -p -r1.180 RAMDISK
--- arch/i386/conf/RAMDISK 14 Jun 2013 01:00:24 -0000 1.180
+++ arch/i386/conf/RAMDISK 13 Aug 2013 13:10:57 -0000
@@ -238,7 +238,6 @@ wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs
Index: arch/i386/conf/RAMDISKB
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/i386/conf/RAMDISKB,v
retrieving revision 1.121
diff -u -p -r1.121 RAMDISKB
--- arch/i386/conf/RAMDISKB 15 Mar 2012 20:06:03 -0000 1.121
+++ arch/i386/conf/RAMDISKB 13 Aug 2013 13:10:57 -0000
@@ -247,7 +247,6 @@ nfe* at pci? # NVIDIA nForce
Ethernet
#wi* at pcmcia? # WaveLAN IEEE 802.11DS
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
# Media Independent Interface (mii) drivers
#exphy* at mii? # 3Com internal PHYs
Index: arch/i386/conf/RAMDISKC
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/i386/conf/RAMDISKC,v
retrieving revision 1.103
diff -u -p -r1.103 RAMDISKC
--- arch/i386/conf/RAMDISKC 9 Jun 2013 18:06:33 -0000 1.103
+++ arch/i386/conf/RAMDISKC 13 Aug 2013 13:10:57 -0000
@@ -281,7 +281,6 @@ ath* at cardbus? # Atheros AR5k
(802.1
#iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
#ral* at pci? # Ralink RT2500/RT2501/RT2600
#ral* at cardbus? # Ralink RT2500/RT2501/RT2600
#rtw* at pci? # Realtek 8180
Index: arch/i386/conf/RAMDISK_CD
===================================================================
RCS file: /cvs/openbsd/src/sys/arch/i386/conf/RAMDISK_CD,v
retrieving revision 1.198
diff -u -p -r1.198 RAMDISK_CD
--- arch/i386/conf/RAMDISK_CD 5 Apr 2013 13:28:59 -0000 1.198
+++ arch/i386/conf/RAMDISK_CD 13 Aug 2013 13:10:57 -0000
@@ -360,7 +360,6 @@ wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
Index: dev/pcmcia/files.pcmcia
===================================================================
RCS file: /cvs/openbsd/src/sys/dev/pcmcia/files.pcmcia,v
retrieving revision 1.44
diff -u -p -r1.44 files.pcmcia
--- dev/pcmcia/files.pcmcia 23 May 2008 14:04:19 -0000 1.44
+++ dev/pcmcia/files.pcmcia 13 Aug 2013 13:10:57 -0000
@@ -73,11 +73,6 @@ file dev/pcmcia/if_wi_pcmcia.c wi_pcmci
attach malo at pcmcia with malo_pcmcia
file dev/pcmcia/if_malo.c malo_pcmcia
-# Raytheon(Raylink)/WebGear IEEE 802.11 FH WLAN
-device ray: ether, ifnet, ifmedia
-attach ray at pcmcia
-file dev/pcmcia/if_ray.c ray
-
# Aironet 4500/4800 802.11 DS WLAN
attach an at pcmcia with an_pcmcia
file dev/pcmcia/if_an_pcmcia.c an_pcmcia
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/src/share/man/man4/Makefile,v
retrieving revision 1.550
diff -u -p -r1.550 Makefile
--- Makefile 6 Jun 2013 15:30:51 -0000 1.550
+++ Makefile 13 Aug 2013 13:09:54 -0000
@@ -45,7 +45,7 @@ MAN= aac.4 ac97.4 acphy.4 \
pcfiic.4 pciide.4 pckbc.4 pckbd.4 pcmcia.4 pcn.4 pcppi.4 pcscp.4 \
pf.4 pflog.4 pflow.4 pfsync.4 pgt.4 piixpm.4 pim.4 pipex.4 \
pms.4 ppb.4 ppp.4 pppoe.4 pppx.4 pty.4 puc.4 pwdog.4 qsphy.4 radio.4 \
- ral.4 random.4 ray.4 rd.4 rdac.4 re.4 rdcphy.4 rgephy.4 ricohrtc.4 \
+ ral.4 random.4 rd.4 rdac.4 re.4 rdcphy.4 rgephy.4 ricohrtc.4 \
rl.4 rlphy.4 route.4 rsu.4 rt.4 rtsx.4 rum.4 run.4 \
rtfps.4 rtii.4 rtw.4 safe.4 safte.4 san.4 sbt.4 sbus.4 schsio.4 \
scsi.4 sd.4 \
Index: ray.4
===================================================================
RCS file: ray.4
diff -N ray.4
--- ray.4 16 Jul 2013 16:05:49 -0000 1.26
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,151 +0,0 @@
-.\" $OpenBSD: ray.4,v 1.26 2013/07/16 16:05:49 schwarze Exp $
-.\" $NetBSD: ray.4,v 1.5 2000/02/28 13:54:55 enami Exp $
-.\"
-.\" Copyright (c) 2000 Christian E. Hopps
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\" derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: July 16 2013 $
-.Dt RAY 4
-.Os
-.Sh NAME
-.Nm ray
-.Nd Raytheon Raylink/WebGear Aviator IEEE 802.11FH wireless network device
-.Sh SYNOPSIS
-.Cd "ray* at pcmcia?"
-.Cd "option RAY_PID_COUNTRY_CODE_DEFAULT=RAY_PID_COUNTRY_CODE_USA"
-.Sh DESCRIPTION
-The
-.Nm
-device driver supports the Raytheon Raylink and Aviator 2.4/PRO
-802.11 Frequency Hopping 2Mbps wireless PCMCIA cards.
-.Pp
-The device uses IEEE 802.11 standard Frequency Hopping Spread Spectrum
-signaling and operates in the ranges of 2.400 to 2.4835 Gigahertz.
-This frequency range is further restricted by country according to
-that country's regulations.
-Currently the
-.Nm
-driver defaults to using the ranges appropriate for the USA.
-To change this setting, define the kernel option
-.Dv RAY_PID_COUNTRY_CODE_DEFAULT
-to one of the following values:
-.Bd -literal -offset indent
-RAY_PID_COUNTRY_CODE_USA
-RAY_PID_COUNTRY_CODE_EUROPE
-RAY_PID_COUNTRY_CODE_JAPAN
-RAY_PID_COUNTRY_CODE_KOREA
-RAY_PID_COUNTRY_CODE_SPAIN
-RAY_PID_COUNTRY_CODE_FRANCE
-RAY_PID_COUNTRY_CODE_ISRAEL
-RAY_PID_COUNTRY_CODE_AUSTRALIA
-.Ed
-.Pp
-These are the modes the
-.Nm
-driver can operate in:
-.Bl -tag -width "IBSS-masterXX"
-.It BSS mode
-Also known as
-.Em infrastructure
-mode, this is used when associating with an access point, through
-which all traffic passes.
-This mode is the default.
-.It IBSS mode
-Also known as
-.Em IEEE ad-hoc
-mode or
-.Em peer-to-peer
-mode.
-This is the standardized method of operating without an access point.
-Stations associate with a service set.
-However, actual connections between stations are peer-to-peer.
-.El
-.Pp
-The
-.Nm
-driver can be configured at runtime with
-.Xr ifconfig 8
-or on boot with
-.Xr hostname.if 5 .
-.Sh HARDWARE
-Cards supported by the
-.Nm
-driver include:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It Raytheon Raylink WLAN
-.It WebGear Aviator 2.4
-.It WebGear Aviator PRO
-.El
-.Sh EXAMPLES
-The following example scans for available networks:
-.Pp
-.Dl # ifconfig ray0 scan
-.Pp
-The following
-.Xr hostname.if 5
-example configures ray0 to join network
-.Dq mynwid ,
-obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-nwid mynwid
-dhcp
-.Ed
-.Sh DIAGNOSTICS
-.Bl -diag
-.It "ray0: card failed self test: status x"
-Indicates the card has failed its initial startup tests.
-.El
-.Sh SEE ALSO
-.Xr arp 4 ,
-.Xr ifmedia 4 ,
-.Xr intro 4 ,
-.Xr netintro 4 ,
-.Xr pcmcia 4 ,
-.Xr hostname.if 5 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Nx 1.5 .
-.Ox
-support was added in
-.Ox 2.7 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An Christian E. Hopps Aq Mt cho...@netbsd.org
-and ported to
-.Ox
-by
-.An Michael Shalayeff Aq Mt mic...@openbsd.org .
-.Sh BUGS
-Currently the infrastructure mode is untested, and authentication
-using WEP is unimplemented.
-.Pp
-Firmware version 4 does not interop with version 5 or higher.
