Split wi(4) into bus-dependent and bus-independent bits similar to

an(4) -- no real code changes at this point.
Rename if_wavelan_ieee.h to if_wi_ieee.h while I'm at it and
create an if_wivar.h similar to NetBSD.
PCI adaptors exist that are not true PCMCIA controllers so
wi(4) @ PCI is possible (though the code is not working yet ;-).

1 files changed, 74 insertions, 0 deletions

diff --git a/sys/dev/ic/if_wivar.h b/sys/dev/ic/if_wivar.h
new file mode 100644
index 00000000000..fbd36ef22c1
--- /dev/null
+++ b/sys/dev/ic/if_wivar.h
@@ -0,0 +1,74 @@
+/*	$OpenBSD: if_wivar.h,v 1.1 2001/05/15 02:40:36 millert Exp $	*/
+
+/*
+ * Copyright (c) 1997, 1998, 1999
+ *	Bill Paul <wpaul@ctr.columbia.edu>.  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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``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 Bill Paul OR THE VOICES IN HIS HEAD
+ * 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.
+ *
+ *	From: if_wireg.h,v 1.5 1999/07/20 20:03:42 wpaul Exp $
+ */
+
+struct wi_softc	{
+#ifndef __FreeBSD__
+	struct device		sc_dev;
+#endif	/* !__FreeBSD__ */
+	struct arpcom		arpcom;
+	struct ifmedia		ifmedia;
+	bus_space_handle_t	wi_bhandle;
+	bus_space_tag_t		wi_btag;
+	int			wi_tx_data_id;
+	int			wi_tx_mgmt_id;
+	int			wi_gone;
+	int			wi_if_flags;
+	u_int16_t		wi_ptype;
+	u_int16_t		wi_portnum;
+	u_int16_t		wi_max_data_len;
+	u_int16_t		wi_rts_thresh;
+	u_int16_t		wi_ap_density;
+	u_int16_t		wi_tx_rate;
+	u_int16_t		wi_create_ibss;
+	u_int16_t		wi_channel;
+	u_int16_t		wi_pm_enabled;
+	u_int16_t		wi_max_sleep;
+	char			wi_node_name[32];
+	char			wi_net_name[32];
+	char			wi_ibss_name[32];
+	u_int8_t		wi_txbuf[1596];
+	int			wi_has_wep;
+	int			wi_use_wep;
+	int			wi_tx_key;
+	struct wi_ltv_keys	wi_keys;
+	struct wi_counters	wi_stats;
+	void			*sc_ih;
+	struct timeout		sc_timo;
+	int			sc_prism2;
+};
+
+#define WI_PRT_FMT "%s"
+#define WI_PRT_ARG(sc)	(sc)->sc_dev.dv_xname