[Midnightbsd-cvs] src [11751] trunk/sys/contrib/dev/ath: remove unneeded files

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jul 11 09:43:55 EDT 2018


Revision: 11751
          http://svnweb.midnightbsd.org/src/?rev=11751
Author:   laffer1
Date:     2018-07-11 09:43:55 -0400 (Wed, 11 Jul 2018)
Log Message:
-----------
remove unneeded files

Removed Paths:
-------------
    trunk/sys/contrib/dev/ath/COPYRIGHT
    trunk/sys/contrib/dev/ath/README
    trunk/sys/contrib/dev/ath/ah.h
    trunk/sys/contrib/dev/ath/ah_desc.h
    trunk/sys/contrib/dev/ath/ah_devid.h
    trunk/sys/contrib/dev/ath/ah_soc.h
    trunk/sys/contrib/dev/ath/public/
    trunk/sys/contrib/dev/ath/version.h

Deleted: trunk/sys/contrib/dev/ath/COPYRIGHT
===================================================================
--- trunk/sys/contrib/dev/ath/COPYRIGHT	2018-07-11 13:43:03 UTC (rev 11750)
+++ trunk/sys/contrib/dev/ath/COPYRIGHT	2018-07-11 13:43:55 UTC (rev 11751)
@@ -1,42 +0,0 @@
-All files contained in this distribution are covered by the following
-copyright unless explicitly identified otherwise.  Note that this
-copyright does _NOT_ contain a "or GPL" clause and does _NOT_ permit
-redistribution with changes.
-
-/*-
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros
- * Communications, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. The materials contained herein are unmodified and are used
- *    unmodified.
- * 2. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following NO
- *    ''WARRANTY'' disclaimer below (''Disclaimer''), without
- *    modification.
- * 3. Redistributions in binary form must reproduce at minimum a
- *    disclaimer similar to the Disclaimer below and any redistribution
- *    must be conditioned upon including a substantially similar
- *    Disclaimer requirement for further binary redistribution.
- * 4. Neither the names of the above-listed copyright holders nor the
- *    names of any contributors may be used to endorse or promote
- *    product derived from this software without specific prior written
- *    permission.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT,
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
- * FOR 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 DAMAGES.
- *
- * $Id: COPYRIGHT,v 1.2 2008-09-19 02:07:52 laffer1 Exp $
- */

Deleted: trunk/sys/contrib/dev/ath/README
===================================================================
--- trunk/sys/contrib/dev/ath/README	2018-07-11 13:43:03 UTC (rev 11750)
+++ trunk/sys/contrib/dev/ath/README	2018-07-11 13:43:55 UTC (rev 11751)
@@ -1,73 +0,0 @@
-$Id: README,v 1.2 2008-09-19 02:07:52 laffer1 Exp $
-
-
-Atheros Hardware Access Layer (HAL)
-===================================
-
-* Copyright (c) 2002-2006 Sam Leffler.
-* Copyright (c) 2002-2006 Atheros Communications, Inc.
-* All rights reserved.
-
-Read the file COPYRIGHT for the complete copyright.
-
-This code manages much of the chip-specific operation of the Atheros
-driver.  The HAL is provided in a binary-only form in order to
-comply with local regulatory agency rules.  In the United States
-the FCC requires that a radio transmitter only be operated at power
-levels and on frequency channels for which it is approved.  The FCC
-requires that a software-defined radio cannot be configured by a
-user to operate outside the approved power levels and frequency
-channels.  This makes it difficult to open-source code that enforces
-limits on the power levels, frequency channels and other parameters
-of the radio transmitter.  See
-
-http://ftp.fcc.gov/Bureaus/Engineering_Technology/Orders/2001/fcc01264.pdf
-
-for the specific FCC regulation.  Because the module is provided
-in a binary-only form it is marked "Proprietary" on Linux; this
-means when you load it you will see messages that your system is
-now "tainted".
-
-If you wish to use this driver on a platform for which an ath_hal
-module is not already provided please contact the author.  Note that
-this is only necessary for new _architectures_; the HAL is not tied to
-any specific version of your operating system.
-
-
-Atheros Hardware
-================
-There are many generations of Atheros 802.11 wireless devices that
-are typically referred to by their programming model:
-
-5210	supports 11a only
-5211	supports both 11a and 11b
-5212	supports 11a, 11b, and 11g
-
-These parts have been incorporated in a variety of retail products
-including cardbus cards and mini-pci cards.  In addition many laptop
-vendors use Atheros mini-pci cards for their builtin wireless
-support.
-
-The Atheors PCI vendor id is 0x168c.  The file ah_devid.h lists most
-known PCI device id's but is not exhaustive.  Some vendors program
-their own vendor and/or device id's to aid in BIOS-locking mini-pci
-cards in laptops.
-
-Atheros SoC Hardware
-====================
-In addition to the cardbus/pci devices Atheros makes System on Chip
-(SoC) parts that integrate a MIPS cpu core and one or more MAC and
-radio parts.  Binary support for these parts is necessarily built
-for the embedded MIPS processor where the code is to be run.
-
-Caveats
-=======
-The binary hal builds provided here include no floating point and
-are operating system-independent.  However due to toolchain
-peculiarities the .o files may be wrongly rejected by development
-tools.  If that happens it may be possible to patch the file header
-so that the native toolchain will accept the files.  In particular
-this has been observed for various Linux MIPS installations for the
-SoC parts.  If you have issues consult the associated .inc file in
-the public directory; it explains exactly how the binary file was
-created (e.g. toolchain and compilation options).

Deleted: trunk/sys/contrib/dev/ath/ah.h
===================================================================
--- trunk/sys/contrib/dev/ath/ah.h	2018-07-11 13:43:03 UTC (rev 11750)
+++ trunk/sys/contrib/dev/ath/ah.h	2018-07-11 13:43:55 UTC (rev 11751)
@@ -1,880 +0,0 @@
-/* $MidnightBSD$ */
-/*-
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros
- * Communications, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. The materials contained herein are unmodified and are used
- *    unmodified.
- * 2. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following NO
- *    ''WARRANTY'' disclaimer below (''Disclaimer''), without
- *    modification.
- * 3. Redistributions in binary form must reproduce at minimum a
- *    disclaimer similar to the Disclaimer below and any redistribution
- *    must be conditioned upon including a substantially similar
- *    Disclaimer requirement for further binary redistribution.
- * 4. Neither the names of the above-listed copyright holders nor the
- *    names of any contributors may be used to endorse or promote
- *    product derived from this software without specific prior written
- *    permission.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT,
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
- * FOR 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 DAMAGES.
- *
- * $Id: ah.h,v 1.2 2008-09-19 02:07:52 laffer1 Exp $
- */
-
-#ifndef _ATH_AH_H_
-#define _ATH_AH_H_
-/*
- * Atheros Hardware Access Layer
- *
- * Clients of the HAL call ath_hal_attach to obtain a reference to an ath_hal
- * structure for use with the device.  Hardware-related operations that
- * follow must call back into the HAL through interface, supplying the
- * reference as the first parameter.
- */
-
-/*
- * Bus i/o type definitions.  We define a platform-independent
- * set of types that are mapped to platform-dependent data for
- * register read/write operations.  We use types that are large
- * enough to hold a pointer; smaller data should fit and only
- * require type coercion to work.  Larger data can be stored
- * elsewhere and a reference passed for the bus tag and/or handle.
- */
-typedef void* HAL_SOFTC;		/* pointer to driver/OS state */
-typedef void* HAL_BUS_TAG;		/* opaque bus i/o id tag */
-typedef void* HAL_BUS_HANDLE;		/* opaque bus i/o handle */
-
-#include "ah_osdep.h"
-
-/*
- * __ahdecl is analogous to _cdecl; it defines the calling
- * convention used within the HAL.  For most systems this
- * can just default to be empty and the compiler will (should)
- * use _cdecl.  For systems where _cdecl is not compatible this
- * must be defined.  See linux/ah_osdep.h for an example.
- */
-#ifndef __ahdecl
-#define __ahdecl
-#endif
-
-/*
- * Status codes that may be returned by the HAL.  Note that
- * interfaces that return a status code set it only when an
- * error occurs--i.e. you cannot check it for success.
- */
-typedef enum {
-	HAL_OK		= 0,	/* No error */
-	HAL_ENXIO	= 1,	/* No hardware present */
-	HAL_ENOMEM	= 2,	/* Memory allocation failed */
-	HAL_EIO		= 3,	/* Hardware didn't respond as expected */
-	HAL_EEMAGIC	= 4,	/* EEPROM magic number invalid */
-	HAL_EEVERSION	= 5,	/* EEPROM version invalid */
-	HAL_EELOCKED	= 6,	/* EEPROM unreadable */
-	HAL_EEBADSUM	= 7,	/* EEPROM checksum invalid */
-	HAL_EEREAD	= 8,	/* EEPROM read problem */
-	HAL_EEBADMAC	= 9,	/* EEPROM mac address invalid */
-	HAL_EESIZE	= 10,	/* EEPROM size not supported */
-	HAL_EEWRITE	= 11,	/* Attempt to change write-locked EEPROM */
-	HAL_EINVAL	= 12,	/* Invalid parameter to function */
-	HAL_ENOTSUPP	= 13,	/* Hardware revision not supported */
-	HAL_ESELFTEST	= 14,	/* Hardware self-test failed */
-	HAL_EINPROGRESS	= 15,	/* Operation incomplete */
-} HAL_STATUS;
-
-typedef enum {
-	AH_FALSE = 0,		/* NB: lots of code assumes false is zero */
-	AH_TRUE  = 1,
-} HAL_BOOL;
-
-typedef enum {
-	HAL_CAP_REG_DMN		= 0,	/* current regulatory domain */
-	HAL_CAP_CIPHER		= 1,	/* hardware supports cipher */
-	HAL_CAP_TKIP_MIC	= 2,	/* handle TKIP MIC in hardware */
-	HAL_CAP_TKIP_SPLIT	= 3,	/* hardware TKIP uses split keys */
-	HAL_CAP_PHYCOUNTERS	= 4,	/* hardware PHY error counters */
-	HAL_CAP_DIVERSITY	= 5,	/* hardware supports fast diversity */
-	HAL_CAP_KEYCACHE_SIZE	= 6,	/* number of entries in key cache */
-	HAL_CAP_NUM_TXQUEUES	= 7,	/* number of hardware xmit queues */
-	HAL_CAP_VEOL		= 9,	/* hardware supports virtual EOL */
-	HAL_CAP_PSPOLL		= 10,	/* hardware has working PS-Poll support */
-	HAL_CAP_DIAG		= 11,	/* hardware diagnostic support */
-	HAL_CAP_COMPRESSION	= 12,	/* hardware supports compression */
-	HAL_CAP_BURST		= 13,	/* hardware supports packet bursting */
-	HAL_CAP_FASTFRAME	= 14,	/* hardware supoprts fast frames */
-	HAL_CAP_TXPOW		= 15,	/* global tx power limit  */
-	HAL_CAP_TPC		= 16,	/* per-packet tx power control  */
-	HAL_CAP_PHYDIAG		= 17,	/* hardware phy error diagnostic */
-	HAL_CAP_BSSIDMASK	= 18,	/* hardware supports bssid mask */
-	HAL_CAP_MCAST_KEYSRCH	= 19,	/* hardware has multicast key search */
-	HAL_CAP_TSF_ADJUST	= 20,	/* hardware has beacon tsf adjust */
-	HAL_CAP_XR		= 21,	/* hardware has XR support  */
-	HAL_CAP_WME_TKIPMIC 	= 22,   /* hardware can support TKIP MIC when WMM is turned on */
-	HAL_CAP_CHAN_HALFRATE 	= 23,	/* hardware can support half rate channels */
-	HAL_CAP_CHAN_QUARTERRATE = 24,	/* hardware can support quarter rate channels */
-	HAL_CAP_RFSILENT	= 25,	/* hardware has rfsilent support  */
-	HAL_CAP_TPC_ACK		= 26,	/* ack txpower with per-packet tpc */
-	HAL_CAP_TPC_CTS		= 27,	/* cts txpower with per-packet tpc */
-	HAL_CAP_11D		= 28,   /* 11d beacon support for changing cc */
-	HAL_CAP_INTMIT		= 29,	/* interference mitigation */
-	HAL_CAP_RXORN_FATAL	= 30,	/* HAL_INT_RXORN treated as fatal */
-	HAL_CAP_RXTSTAMP_PREC	= 34,	/* rx desc tstamp precision (bits) */
-} HAL_CAPABILITY_TYPE;
-
-/* 
- * "States" for setting the LED.  These correspond to
- * the possible 802.11 operational states and there may
- * be a many-to-one mapping between these states and the
- * actual hardware state for the LED's (i.e. the hardware
- * may have fewer states).
- */
-typedef enum {
-	HAL_LED_INIT	= 0,
-	HAL_LED_SCAN	= 1,
-	HAL_LED_AUTH	= 2,
-	HAL_LED_ASSOC	= 3,
-	HAL_LED_RUN	= 4
-} HAL_LED_STATE;
-
-/*
- * Transmit queue types/numbers.  These are used to tag
- * each transmit queue in the hardware and to identify a set
- * of transmit queues for operations such as start/stop dma.
- */
-typedef enum {
-	HAL_TX_QUEUE_INACTIVE	= 0,		/* queue is inactive/unused */
-	HAL_TX_QUEUE_DATA	= 1,		/* data xmit q's */
-	HAL_TX_QUEUE_BEACON	= 2,		/* beacon xmit q */
-	HAL_TX_QUEUE_CAB	= 3,		/* "crap after beacon" xmit q */
-	HAL_TX_QUEUE_UAPSD	= 4,		/* u-apsd power save xmit q */
-} HAL_TX_QUEUE;
-
-#define	HAL_NUM_TX_QUEUES	10		/* max possible # of queues */
-
-/*
- * Transmit queue subtype.  These map directly to
- * WME Access Categories (except for UPSD).  Refer
- * to Table 5 of the WME spec.
- */
-typedef enum {
-	HAL_WME_AC_BK	= 0,			/* background access category */
-	HAL_WME_AC_BE	= 1, 			/* best effort access category*/
-	HAL_WME_AC_VI	= 2,			/* video access category */
-	HAL_WME_AC_VO	= 3,			/* voice access category */
-	HAL_WME_UPSD	= 4,			/* uplink power save */
-	HAL_XR_DATA	= 5,			/* uplink power save */
-} HAL_TX_QUEUE_SUBTYPE;
-
-/*
- * Transmit queue flags that control various
- * operational parameters.
- */
-typedef enum {
-	/*
-	 * Per queue interrupt enables.  When set the associated
-	 * interrupt may be delivered for packets sent through
-	 * the queue.  Without these enabled no interrupts will
-	 * be delivered for transmits through the queue.
-	 */
-	HAL_TXQ_TXOKINT_ENABLE	   = 0x0001,	/* enable TXOK interrupt */
-	HAL_TXQ_TXERRINT_ENABLE	   = 0x0001,	/* enable TXERR interrupt */
-	HAL_TXQ_TXDESCINT_ENABLE   = 0x0002,	/* enable TXDESC interrupt */
-	HAL_TXQ_TXEOLINT_ENABLE	   = 0x0004,	/* enable TXEOL interrupt */
-	HAL_TXQ_TXURNINT_ENABLE	   = 0x0008,	/* enable TXURN interrupt */
-	/*
-	 * Enable hardware compression for packets sent through
-	 * the queue.  The compression buffer must be setup and
-	 * packets must have a key entry marked in the tx descriptor.
-	 */
-	HAL_TXQ_COMPRESSION_ENABLE  = 0x0010,	/* enable h/w compression */
-	/*
-	 * Disable queue when veol is hit or ready time expires.
-	 * By default the queue is disabled only on reaching the
-	 * physical end of queue (i.e. a null link ptr in the
-	 * descriptor chain).
-	 */
-	HAL_TXQ_RDYTIME_EXP_POLICY_ENABLE = 0x0020,
-	/*
-	 * Schedule frames on delivery of a DBA (DMA Beacon Alert)
-	 * event.  Frames will be transmitted only when this timer
-	 * fires, e.g to transmit a beacon in ap or adhoc modes.
-	 */
-	HAL_TXQ_DBA_GATED	    = 0x0040,	/* schedule based on DBA */
-	/*
-	 * Each transmit queue has a counter that is incremented
-	 * each time the queue is enabled and decremented when
-	 * the list of frames to transmit is traversed (or when
-	 * the ready time for the queue expires).  This counter
-	 * must be non-zero for frames to be scheduled for
-	 * transmission.  The following controls disable bumping
-	 * this counter under certain conditions.  Typically this
-	 * is used to gate frames based on the contents of another
-	 * queue (e.g. CAB traffic may only follow a beacon frame).
-	 * These are meaningful only when frames are scheduled
-	 * with a non-ASAP policy (e.g. DBA-gated).
-	 */
-	HAL_TXQ_CBR_DIS_QEMPTY	    = 0x0080,	/* disable on this q empty */
-	HAL_TXQ_CBR_DIS_BEMPTY	    = 0x0100,	/* disable on beacon q empty */
-
-	/*
-	 * Fragment burst backoff policy.  Normally the no backoff
-	 * is done after a successful transmission, the next fragment
-	 * is sent at SIFS.  If this flag is set backoff is done
-	 * after each fragment, regardless whether it was ack'd or
-	 * not, after the backoff count reaches zero a normal channel
-	 * access procedure is done before the next transmit (i.e.
-	 * wait AIFS instead of SIFS).
-	 */
-	HAL_TXQ_FRAG_BURST_BACKOFF_ENABLE = 0x00800000,
-	/*
-	 * Disable post-tx backoff following each frame.
-	 */
-	HAL_TXQ_BACKOFF_DISABLE	    = 0x00010000, /* disable post backoff  */
-	/*
-	 * DCU arbiter lockout control.  This controls how
-	 * lower priority tx queues are handled with respect to
-	 * to a specific queue when multiple queues have frames
-	 * to send.  No lockout means lower priority queues arbitrate
-	 * concurrently with this queue.  Intra-frame lockout
-	 * means lower priority queues are locked out until the
-	 * current frame transmits (e.g. including backoffs and bursting).
-	 * Global lockout means nothing lower can arbitrary so
-	 * long as there is traffic activity on this queue (frames,
-	 * backoff, etc).
-	 */
-	HAL_TXQ_ARB_LOCKOUT_INTRA   = 0x00020000, /* intra-frame lockout */
-	HAL_TXQ_ARB_LOCKOUT_GLOBAL  = 0x00040000, /* full lockout s */
-
-	HAL_TXQ_IGNORE_VIRTCOL	    = 0x00080000, /* ignore virt collisions */
-	HAL_TXQ_SEQNUM_INC_DIS	    = 0x00100000, /* disable seqnum increment */
-} HAL_TX_QUEUE_FLAGS;
-
-typedef struct {
-	u_int32_t	tqi_ver;		/* hal TXQ version */
-	HAL_TX_QUEUE_SUBTYPE tqi_subtype;	/* subtype if applicable */
-	HAL_TX_QUEUE_FLAGS tqi_qflags;		/* flags (see above) */
-	u_int32_t	tqi_priority;		/* (not used) */
-	u_int32_t	tqi_aifs;		/* aifs */
-	u_int32_t	tqi_cwmin;		/* cwMin */
-	u_int32_t	tqi_cwmax;		/* cwMax */
-	u_int16_t	tqi_shretry;		/* rts retry limit */
-	u_int16_t	tqi_lgretry;		/* long retry limit (not used)*/
-	u_int32_t	tqi_cbrPeriod;		/* CBR period (us) */
-	u_int32_t	tqi_cbrOverflowLimit;	/* threshold for CBROVF int */
-	u_int32_t	tqi_burstTime;		/* max burst duration (us) */
-	u_int32_t	tqi_readyTime;		/* frame schedule time (us) */
-	u_int32_t	tqi_compBuf;		/* comp buffer phys addr */
-} HAL_TXQ_INFO;
-
-#define HAL_TQI_NONVAL 0xffff
-
-/* token to use for aifs, cwmin, cwmax */
-#define	HAL_TXQ_USEDEFAULT	((u_int32_t) -1)
-
-/* compression definitions */
-#define HAL_COMP_BUF_MAX_SIZE           9216            /* 9K */
-#define HAL_COMP_BUF_ALIGN_SIZE         512
-
-/*
- * Transmit packet types.  This belongs in ah_desc.h, but
- * is here so we can give a proper type to various parameters
- * (and not require everyone include the file).
- *
- * NB: These values are intentionally assigned for
- *     direct use when setting up h/w descriptors.
- */
-typedef enum {
-	HAL_PKT_TYPE_NORMAL	= 0,
-	HAL_PKT_TYPE_ATIM	= 1,
-	HAL_PKT_TYPE_PSPOLL	= 2,
-	HAL_PKT_TYPE_BEACON	= 3,
-	HAL_PKT_TYPE_PROBE_RESP	= 4,
-	HAL_PKT_TYPE_CHIRP	= 5,
-	HAL_PKT_TYPE_GRP_POLL = 6,
-} HAL_PKT_TYPE;
-
-/* Rx Filter Frame Types */
-typedef enum {
-	HAL_RX_FILTER_UCAST	= 0x00000001,	/* Allow unicast frames */
-	HAL_RX_FILTER_MCAST	= 0x00000002,	/* Allow multicast frames */
-	HAL_RX_FILTER_BCAST	= 0x00000004,	/* Allow broadcast frames */
-	HAL_RX_FILTER_CONTROL	= 0x00000008,	/* Allow control frames */
-	HAL_RX_FILTER_BEACON	= 0x00000010,	/* Allow beacon frames */
-	HAL_RX_FILTER_PROM	= 0x00000020,	/* Promiscuous mode */
-	HAL_RX_FILTER_XRPOLL	= 0x00000040,	/* Allow XR poll frmae */
-	HAL_RX_FILTER_PROBEREQ	= 0x00000080,	/* Allow probe request frames */
-	HAL_RX_FILTER_PHYERR	= 0x00000100,	/* Allow phy errors */
-	HAL_RX_FILTER_PHYRADAR	= 0x00000200,	/* Allow phy radar errors*/
-} HAL_RX_FILTER;
-
-typedef enum {
-	HAL_PM_AWAKE		= 0,
-	HAL_PM_FULL_SLEEP	= 1,
-	HAL_PM_NETWORK_SLEEP	= 2,
-	HAL_PM_UNDEFINED	= 3
-} HAL_POWER_MODE;
-
-/*
- * NOTE WELL:
- * These are mapped to take advantage of the common locations for many of
- * the bits on all of the currently supported MAC chips. This is to make
- * the ISR as efficient as possible, while still abstracting HW differences.
- * When new hardware breaks this commonality this enumerated type, as well
- * as the HAL functions using it, must be modified. All values are directly
- * mapped unless commented otherwise.
- */
-typedef enum {
-	HAL_INT_RX	= 0x00000001,	/* Non-common mapping */
-	HAL_INT_RXDESC	= 0x00000002,
-	HAL_INT_RXNOFRM	= 0x00000008,
-	HAL_INT_RXEOL	= 0x00000010,
-	HAL_INT_RXORN	= 0x00000020,
-	HAL_INT_TX	= 0x00000040,	/* Non-common mapping */
-	HAL_INT_TXDESC	= 0x00000080,
-	HAL_INT_TXURN	= 0x00000800,
-	HAL_INT_MIB	= 0x00001000,
-	HAL_INT_RXPHY	= 0x00004000,
-	HAL_INT_RXKCM	= 0x00008000,
-	HAL_INT_SWBA	= 0x00010000,
-	HAL_INT_BMISS	= 0x00040000,
-	HAL_INT_BNR	= 0x00100000,	/* Non-common mapping */
-	HAL_INT_TIM	= 0x00200000,	/* Non-common mapping */
-	HAL_INT_DTIM	= 0x00400000,	/* Non-common mapping */
-	HAL_INT_DTIMSYNC= 0x00800000,	/* Non-common mapping */
-	HAL_INT_GPIO	= 0x01000000,
-	HAL_INT_CABEND	= 0x02000000,	/* Non-common mapping */
-	HAL_INT_FATAL	= 0x40000000,	/* Non-common mapping */
-#define	HAL_INT_GLOBAL	0x80000000	/* Set/clear IER */
-	HAL_INT_BMISC	= HAL_INT_TIM
-			| HAL_INT_DTIM
-			| HAL_INT_DTIMSYNC
-			| HAL_INT_CABEND,
-
-	/* Interrupt bits that map directly to ISR/IMR bits */
-	HAL_INT_COMMON  = HAL_INT_RXNOFRM
-			| HAL_INT_RXDESC
-			| HAL_INT_RXEOL
-			| HAL_INT_RXORN
-			| HAL_INT_TXURN
-			| HAL_INT_TXDESC
-			| HAL_INT_MIB
-			| HAL_INT_RXPHY
-			| HAL_INT_RXKCM
-			| HAL_INT_SWBA
-			| HAL_INT_BMISS
-			| HAL_INT_GPIO,
-} HAL_INT;
-
-typedef enum {
-	HAL_RFGAIN_INACTIVE		= 0,
-	HAL_RFGAIN_READ_REQUESTED	= 1,
-	HAL_RFGAIN_NEED_CHANGE		= 2
-} HAL_RFGAIN;
-
-/*
- * Channels are specified by frequency.
- */
-typedef struct {
-	u_int16_t	channel;	/* setting in Mhz */
-	u_int16_t	channelFlags;	/* see below */
-	u_int8_t	privFlags;
-	int8_t		maxRegTxPower;	/* max regulatory tx power in dBm */
-	int8_t		maxTxPower;	/* max true tx power in 0.5 dBm */
-	int8_t		minTxPower;	/* min true tx power in 0.5 dBm */
-} HAL_CHANNEL;
-
-/* channelFlags */
-#define	CHANNEL_CW_INT	0x0002	/* CW interference detected on channel */
-#define	CHANNEL_TURBO	0x0010	/* Turbo Channel */
-#define	CHANNEL_CCK	0x0020	/* CCK channel */
-#define	CHANNEL_OFDM	0x0040	/* OFDM channel */
-#define	CHANNEL_2GHZ	0x0080	/* 2 GHz spectrum channel. */
-#define	CHANNEL_5GHZ	0x0100	/* 5 GHz spectrum channel */
-#define	CHANNEL_PASSIVE	0x0200	/* Only passive scan allowed in the channel */
-#define	CHANNEL_DYN	0x0400	/* dynamic CCK-OFDM channel */
-#define	CHANNEL_XR	0x0800	/* XR channel */
-#define	CHANNEL_STURBO	0x2000	/* Static turbo, no 11a-only usage */
-#define CHANNEL_HALF    0x4000 	/* Half rate channel */
-#define CHANNEL_QUARTER 0x8000 	/* Quarter rate channel */
-
-/* privFlags */
-#define CHANNEL_INTERFERENCE   	0x01 /* Software use: channel interference 
-				        used for as AR as well as RADAR 
-				        interference detection */
-#define CHANNEL_DFS		0x02 /* DFS required on channel */
-#define CHANNEL_4MS_LIMIT	0x04 /* 4msec packet limit on this channel */
-#define CHANNEL_DFS_CLEAR	0x08 /* if channel has been checked for DFS */
-
-#define	CHANNEL_A	(CHANNEL_5GHZ|CHANNEL_OFDM)
-#define	CHANNEL_B	(CHANNEL_2GHZ|CHANNEL_CCK)
-#define	CHANNEL_PUREG	(CHANNEL_2GHZ|CHANNEL_OFDM)
-#ifdef notdef
-#define	CHANNEL_G	(CHANNEL_2GHZ|CHANNEL_DYN)
-#else
-#define	CHANNEL_G	(CHANNEL_2GHZ|CHANNEL_OFDM)
-#endif
-#define	CHANNEL_T	(CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_TURBO)
-#define CHANNEL_ST	(CHANNEL_T|CHANNEL_STURBO)
-#define	CHANNEL_108G	(CHANNEL_2GHZ|CHANNEL_OFDM|CHANNEL_TURBO)
-#define	CHANNEL_108A	CHANNEL_T
-#define	CHANNEL_X	(CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_XR)
-#define	CHANNEL_ALL \
-	(CHANNEL_OFDM|CHANNEL_CCK| CHANNEL_2GHZ | CHANNEL_5GHZ | CHANNEL_TURBO)
-#define	CHANNEL_ALL_NOTURBO 	(CHANNEL_ALL &~ CHANNEL_TURBO)
-
-#define HAL_ANTENNA_MIN_MODE  0
-#define HAL_ANTENNA_FIXED_A   1
-#define HAL_ANTENNA_FIXED_B   2
-#define HAL_ANTENNA_MAX_MODE  3
-
-typedef struct {
-	u_int32_t	ackrcv_bad;
-	u_int32_t	rts_bad;
-	u_int32_t	rts_good;
-	u_int32_t	fcs_bad;
-	u_int32_t	beacons;
-} HAL_MIB_STATS;
-
-typedef u_int16_t HAL_CTRY_CODE;		/* country code */
-typedef u_int16_t HAL_REG_DOMAIN;		/* regulatory domain code */
-
-enum {
-	CTRY_DEBUG	= 0x1ff,		/* debug country code */
-	CTRY_DEFAULT	= 0			/* default country code */
-};
-
-enum {
-	HAL_MODE_11A	= 0x001,		/* 11a channels */
-	HAL_MODE_TURBO	= 0x002,		/* 11a turbo-only channels */
-	HAL_MODE_11B	= 0x004,		/* 11b channels */
-	HAL_MODE_PUREG	= 0x008,		/* 11g channels (OFDM only) */
-#ifdef notdef
-	HAL_MODE_11G	= 0x010,		/* 11g channels (OFDM/CCK) */
-#else
-	HAL_MODE_11G	= 0x008,		/* XXX historical */
-#endif
-	HAL_MODE_108G	= 0x020,		/* 11a+Turbo channels */
-	HAL_MODE_108A	= 0x040,		/* 11g+Turbo channels */
-	HAL_MODE_XR     = 0x100,		/* XR channels */
-	HAL_MODE_11A_HALF_RATE = 0x200,		/* 11A half rate channels */
-	HAL_MODE_11A_QUARTER_RATE = 0x400,	/* 11A quarter rate channels */
-	HAL_MODE_ALL	= 0xfff
-};
-
-typedef struct {
-	int		rateCount;		/* NB: for proper padding */
-	u_int8_t	rateCodeToIndex[32];	/* back mapping */
-	struct {
-		u_int8_t	valid;		/* valid for rate control use */
-		u_int8_t	phy;		/* CCK/OFDM/XR */
-		u_int16_t	rateKbps;	/* transfer rate in kbs */
-		u_int8_t	rateCode;	/* rate for h/w descriptors */
-		u_int8_t	shortPreamble;	/* mask for enabling short
-						 * preamble in CCK rate code */
-		u_int8_t	dot11Rate;	/* value for supported rates
-						 * info element of MLME */
-		u_int8_t	controlRate;	/* index of next lower basic
-						 * rate; used for dur. calcs */
-		u_int16_t	lpAckDuration;	/* long preamble ACK duration */
-		u_int16_t	spAckDuration;	/* short preamble ACK duration*/
-	} info[32];
-} HAL_RATE_TABLE;
-
-typedef struct {
-	u_int		rs_count;		/* number of valid entries */
-	u_int8_t	rs_rates[32];		/* rates */
-} HAL_RATE_SET;
-
-/*
- * Antenna switch control.  By default antenna selection
- * enables multiple (2) antenna use.  To force use of the
- * A or B antenna only specify a fixed setting.  Fixing
- * the antenna will also disable any diversity support.
- */
-typedef enum {
-	HAL_ANT_VARIABLE = 0,			/* variable by programming */
-	HAL_ANT_FIXED_A	 = 1,			/* fixed antenna A */
-	HAL_ANT_FIXED_B	 = 2,			/* fixed antenna B */
-} HAL_ANT_SETTING;
-
-typedef enum {
-	HAL_M_STA	= 1,			/* infrastructure station */
-	HAL_M_IBSS	= 0,			/* IBSS (adhoc) station */
-	HAL_M_HOSTAP	= 6,			/* Software Access Point */
-	HAL_M_MONITOR	= 8			/* Monitor mode */
-} HAL_OPMODE;
-
-typedef struct {
-	u_int8_t	kv_type;		/* one of HAL_CIPHER */
-	u_int8_t	kv_pad;
-	u_int16_t	kv_len;			/* length in bits */
-	u_int8_t	kv_val[16];		/* enough for 128-bit keys */
-	u_int8_t	kv_mic[8];		/* TKIP MIC key */
-	u_int8_t	kv_txmic[8];		/* TKIP TX MIC key (optional) */
-} HAL_KEYVAL;
-
-typedef enum {
-	HAL_CIPHER_WEP		= 0,
-	HAL_CIPHER_AES_OCB	= 1,
-	HAL_CIPHER_AES_CCM	= 2,
-	HAL_CIPHER_CKIP		= 3,
-	HAL_CIPHER_TKIP		= 4,
-	HAL_CIPHER_CLR		= 5,		/* no encryption */
-
-	HAL_CIPHER_MIC		= 127		/* TKIP-MIC, not a cipher */
-} HAL_CIPHER;
-
-enum {
-	HAL_SLOT_TIME_6	 = 6,			/* NB: for turbo mode */
-	HAL_SLOT_TIME_9	 = 9,
-	HAL_SLOT_TIME_20 = 20,
-};
-
-/*
- * Per-station beacon timer state.  Note that the specified
- * beacon interval (given in TU's) can also include flags
- * to force a TSF reset and to enable the beacon xmit logic.
- * If bs_cfpmaxduration is non-zero the hardware is setup to
- * coexist with a PCF-capable AP.
- */
-typedef struct {
-	u_int32_t	bs_nexttbtt;		/* next beacon in TU */
-	u_int32_t	bs_nextdtim;		/* next DTIM in TU */
-	u_int32_t	bs_intval;		/* beacon interval+flags */
-#define	HAL_BEACON_PERIOD	0x0000ffff	/* beacon interval period */
-#define	HAL_BEACON_ENA		0x00800000	/* beacon xmit enable */
-#define	HAL_BEACON_RESET_TSF	0x01000000	/* clear TSF */
-	u_int32_t	bs_dtimperiod;
-	u_int16_t	bs_cfpperiod;		/* CFP period in TU */
-	u_int16_t	bs_cfpmaxduration;	/* max CFP duration in TU */
-	u_int32_t	bs_cfpnext;		/* next CFP in TU */
-	u_int16_t	bs_timoffset;		/* byte offset to TIM bitmap */
-	u_int16_t	bs_bmissthreshold;	/* beacon miss threshold */
-	u_int32_t	bs_sleepduration;	/* max sleep duration */
-} HAL_BEACON_STATE;
-
-/*
- * Like HAL_BEACON_STATE but for non-station mode setup.
- * NB: see above flag definitions 
- */
-typedef struct {
-	u_int32_t	bt_intval;		/* beacon interval+flags */
-	u_int32_t	bt_nexttbtt;		/* next beacon in TU */
-	u_int32_t	bt_nextatim;		/* next ATIM in TU */
-	u_int32_t	bt_nextdba;		/* next DBA in 1/8th TU */
-	u_int32_t	bt_nextswba;		/* next SWBA in 1/8th TU */
-} HAL_BEACON_TIMERS;
-
-/*
- * Per-node statistics maintained by the driver for use in
- * optimizing signal quality and other operational aspects.
- */
-typedef struct {
-	u_int32_t	ns_avgbrssi;	/* average beacon rssi */
-	u_int32_t	ns_avgrssi;	/* average data rssi */
-	u_int32_t	ns_avgtxrssi;	/* average tx rssi */
-} HAL_NODE_STATS;
-
-#define	HAL_RSSI_EP_MULTIPLIER	(1<<7)	/* pow2 to optimize out * and / */
-
-struct ath_desc;
-struct ath_tx_status;
-struct ath_rx_status;
-
-/*
- * Hardware Access Layer (HAL) API.
- *
- * Clients of the HAL call ath_hal_attach to obtain a reference to an
- * ath_hal structure for use with the device.  Hardware-related operations
- * that follow must call back into the HAL through interface, supplying
- * the reference as the first parameter.  Note that before using the
- * reference returned by ath_hal_attach the caller should verify the
- * ABI version number.
- */
-struct ath_hal {
-	u_int32_t	ah_magic;	/* consistency check magic number */
-	u_int32_t	ah_abi;		/* HAL ABI version */
-#define	HAL_ABI_VERSION	0x06102600	/* YYMMDDnn */
-	u_int16_t	ah_devid;	/* PCI device ID */
-	u_int16_t	ah_subvendorid;	/* PCI subvendor ID */
-	HAL_SOFTC	ah_sc;		/* back pointer to driver/os state */
-	HAL_BUS_TAG	ah_st;		/* params for register r+w */
-	HAL_BUS_HANDLE	ah_sh;
-	HAL_CTRY_CODE	ah_countryCode;
-
-	u_int32_t	ah_macVersion;	/* MAC version id */
-	u_int16_t	ah_macRev;	/* MAC revision */
-	u_int16_t	ah_phyRev;	/* PHY revision */
-	/* NB: when only one radio is present the rev is in 5Ghz */
-	u_int16_t	ah_analog5GhzRev;/* 5GHz radio revision */
-	u_int16_t	ah_analog2GhzRev;/* 2GHz radio revision */
-
-	const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *,
-				u_int mode);
-	void	  __ahdecl(*ah_detach)(struct ath_hal*);
-
-	/* Reset functions */
-	HAL_BOOL  __ahdecl(*ah_reset)(struct ath_hal *, HAL_OPMODE,
-				HAL_CHANNEL *, HAL_BOOL bChannelChange,
-				HAL_STATUS *status);
-	HAL_BOOL  __ahdecl(*ah_phyDisable)(struct ath_hal *);
-	HAL_BOOL  __ahdecl(*ah_disable)(struct ath_hal *);
-	void	  __ahdecl(*ah_setPCUConfig)(struct ath_hal *);
-	HAL_BOOL  __ahdecl(*ah_perCalibration)(struct ath_hal*, HAL_CHANNEL *, HAL_BOOL *);
-	HAL_BOOL  __ahdecl(*ah_setTxPowerLimit)(struct ath_hal *, u_int32_t);
-
-	/* DFS support */
-	HAL_BOOL  __ahdecl(*ah_radarWait)(struct ath_hal *, HAL_CHANNEL *);
-
-	/* Transmit functions */
-	HAL_BOOL  __ahdecl(*ah_updateTxTrigLevel)(struct ath_hal*,
-				HAL_BOOL incTrigLevel);
-	int	  __ahdecl(*ah_setupTxQueue)(struct ath_hal *, HAL_TX_QUEUE,
-				const HAL_TXQ_INFO *qInfo);
-	HAL_BOOL  __ahdecl(*ah_setTxQueueProps)(struct ath_hal *, int q, 
-				const HAL_TXQ_INFO *qInfo);
-	HAL_BOOL  __ahdecl(*ah_getTxQueueProps)(struct ath_hal *, int q, 
-				HAL_TXQ_INFO *qInfo);
-	HAL_BOOL  __ahdecl(*ah_releaseTxQueue)(struct ath_hal *ah, u_int q);
-	HAL_BOOL  __ahdecl(*ah_resetTxQueue)(struct ath_hal *ah, u_int q);
-	u_int32_t __ahdecl(*ah_getTxDP)(struct ath_hal*, u_int);
-	HAL_BOOL  __ahdecl(*ah_setTxDP)(struct ath_hal*, u_int, u_int32_t txdp);
-	u_int32_t __ahdecl(*ah_numTxPending)(struct ath_hal *, u_int q);
-	HAL_BOOL  __ahdecl(*ah_startTxDma)(struct ath_hal*, u_int);
-	HAL_BOOL  __ahdecl(*ah_stopTxDma)(struct ath_hal*, u_int);
-	HAL_BOOL  __ahdecl(*ah_setupTxDesc)(struct ath_hal *, struct ath_desc *,
-				u_int pktLen, u_int hdrLen,
-				HAL_PKT_TYPE type, u_int txPower,
-				u_int txRate0, u_int txTries0,
-				u_int keyIx, u_int antMode, u_int flags,
-				u_int rtsctsRate, u_int rtsctsDuration,
-				u_int compicvLen, u_int compivLen,
-				u_int comp);
-	HAL_BOOL  __ahdecl(*ah_setupXTxDesc)(struct ath_hal *, struct ath_desc*,
-				u_int txRate1, u_int txTries1,
-				u_int txRate2, u_int txTries2,
-				u_int txRate3, u_int txTries3);
-	HAL_BOOL  __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_desc *,
-				u_int segLen, HAL_BOOL firstSeg,
-				HAL_BOOL lastSeg, const struct ath_desc *);
-	HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *,
-				struct ath_desc *, struct ath_tx_status *);
-	void	   __ahdecl(*ah_getTxIntrQueue)(struct ath_hal *, u_int32_t *);
-	void	   __ahdecl(*ah_reqTxIntrDesc)(struct ath_hal *, struct ath_desc*);
-
-	/* Receive Functions */
-	u_int32_t __ahdecl(*ah_getRxDP)(struct ath_hal*);
-	void	  __ahdecl(*ah_setRxDP)(struct ath_hal*, u_int32_t rxdp);
-	void	  __ahdecl(*ah_enableReceive)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_stopDmaReceive)(struct ath_hal*);
-	void	  __ahdecl(*ah_startPcuReceive)(struct ath_hal*);
-	void	  __ahdecl(*ah_stopPcuReceive)(struct ath_hal*);
-	void	  __ahdecl(*ah_setMulticastFilter)(struct ath_hal*,
-				u_int32_t filter0, u_int32_t filter1);
-	HAL_BOOL  __ahdecl(*ah_setMulticastFilterIndex)(struct ath_hal*,
-				u_int32_t index);
-	HAL_BOOL  __ahdecl(*ah_clrMulticastFilterIndex)(struct ath_hal*,
-				u_int32_t index);
-	u_int32_t __ahdecl(*ah_getRxFilter)(struct ath_hal*);
-	void	  __ahdecl(*ah_setRxFilter)(struct ath_hal*, u_int32_t);
-	HAL_BOOL  __ahdecl(*ah_setupRxDesc)(struct ath_hal *, struct ath_desc *,
-				u_int32_t size, u_int flags);
-	HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *,
-				struct ath_desc *, u_int32_t phyAddr,
-				struct ath_desc *next, u_int64_t tsf,
-				struct ath_rx_status *);
-	void	  __ahdecl(*ah_rxMonitor)(struct ath_hal *,
-				const HAL_NODE_STATS *, HAL_CHANNEL *);
-	void	  __ahdecl(*ah_procMibEvent)(struct ath_hal *,
-				const HAL_NODE_STATS *);
-
-	/* Misc Functions */
-	HAL_STATUS __ahdecl(*ah_getCapability)(struct ath_hal *,
-				HAL_CAPABILITY_TYPE, u_int32_t capability,
-				u_int32_t *result);
-	HAL_BOOL   __ahdecl(*ah_setCapability)(struct ath_hal *,
-				HAL_CAPABILITY_TYPE, u_int32_t capability,
-				u_int32_t setting, HAL_STATUS *);
-	HAL_BOOL   __ahdecl(*ah_getDiagState)(struct ath_hal *, int request,
-				const void *args, u_int32_t argsize,
-				void **result, u_int32_t *resultsize);
-	void	  __ahdecl(*ah_getMacAddress)(struct ath_hal *, u_int8_t *);
-	HAL_BOOL  __ahdecl(*ah_setMacAddress)(struct ath_hal *, const u_int8_t*);
-	void	  __ahdecl(*ah_getBssIdMask)(struct ath_hal *, u_int8_t *);
-	HAL_BOOL  __ahdecl(*ah_setBssIdMask)(struct ath_hal *, const u_int8_t*);
-	HAL_BOOL  __ahdecl(*ah_setRegulatoryDomain)(struct ath_hal*,
-				u_int16_t, HAL_STATUS *);
-	void	  __ahdecl(*ah_setLedState)(struct ath_hal*, HAL_LED_STATE);
-	void	  __ahdecl(*ah_writeAssocid)(struct ath_hal*,
-				const u_int8_t *bssid, u_int16_t assocId);
-	HAL_BOOL  __ahdecl(*ah_gpioCfgOutput)(struct ath_hal *, u_int32_t gpio);
-	HAL_BOOL  __ahdecl(*ah_gpioCfgInput)(struct ath_hal *, u_int32_t gpio);
-	u_int32_t __ahdecl(*ah_gpioGet)(struct ath_hal *, u_int32_t gpio);
-	HAL_BOOL  __ahdecl(*ah_gpioSet)(struct ath_hal *,
-				u_int32_t gpio, u_int32_t val);
-	void	  __ahdecl(*ah_gpioSetIntr)(struct ath_hal*, u_int, u_int32_t);
-	u_int32_t __ahdecl(*ah_getTsf32)(struct ath_hal*);
-	u_int64_t __ahdecl(*ah_getTsf64)(struct ath_hal*);
-	void	  __ahdecl(*ah_resetTsf)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_detectCardPresent)(struct ath_hal*);
-	void	  __ahdecl(*ah_updateMibCounters)(struct ath_hal*,
-				HAL_MIB_STATS*);
-	HAL_RFGAIN __ahdecl(*ah_getRfGain)(struct ath_hal*);
-	u_int	  __ahdecl(*ah_getDefAntenna)(struct ath_hal*);
-	void	  __ahdecl(*ah_setDefAntenna)(struct ath_hal*, u_int);
-	HAL_ANT_SETTING	 __ahdecl(*ah_getAntennaSwitch)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_setAntennaSwitch)(struct ath_hal*,
-				HAL_ANT_SETTING);
-	HAL_BOOL  __ahdecl(*ah_setSlotTime)(struct ath_hal*, u_int);
-	u_int	  __ahdecl(*ah_getSlotTime)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_setAckTimeout)(struct ath_hal*, u_int);
-	u_int	  __ahdecl(*ah_getAckTimeout)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_setAckCTSRate)(struct ath_hal*, u_int);
-	u_int	  __ahdecl(*ah_getAckCTSRate)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_setCTSTimeout)(struct ath_hal*, u_int);
-	u_int	  __ahdecl(*ah_getCTSTimeout)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_setDecompMask)(struct ath_hal*, u_int16_t, int);
-	void	  __ahdecl(*ah_setCoverageClass)(struct ath_hal*, u_int8_t, int);
-
-	/* Key Cache Functions */
-	u_int32_t __ahdecl(*ah_getKeyCacheSize)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_resetKeyCacheEntry)(struct ath_hal*, u_int16_t);
-	HAL_BOOL  __ahdecl(*ah_isKeyCacheEntryValid)(struct ath_hal *,
-				u_int16_t);
-	HAL_BOOL  __ahdecl(*ah_setKeyCacheEntry)(struct ath_hal*,
-				u_int16_t, const HAL_KEYVAL *,
-				const u_int8_t *, int);
-	HAL_BOOL  __ahdecl(*ah_setKeyCacheEntryMac)(struct ath_hal*,
-				u_int16_t, const u_int8_t *);
-
-	/* Power Management Functions */
-	HAL_BOOL  __ahdecl(*ah_setPowerMode)(struct ath_hal*,
-				HAL_POWER_MODE mode, int setChip);
-	HAL_POWER_MODE __ahdecl(*ah_getPowerMode)(struct ath_hal*);
-	int16_t   __ahdecl(*ah_getChanNoise)(struct ath_hal *, HAL_CHANNEL *);
-
-
-	/* Beacon Management Functions */
-	void	  __ahdecl(*ah_setBeaconTimers)(struct ath_hal*,
-				const HAL_BEACON_TIMERS *);
-	/* NB: deprecated, use ah_setBeaconTimers instead */
-	void	  __ahdecl(*ah_beaconInit)(struct ath_hal *,
-				u_int32_t nexttbtt, u_int32_t intval);
-	void	  __ahdecl(*ah_setStationBeaconTimers)(struct ath_hal*,
-				const HAL_BEACON_STATE *);
-	void	  __ahdecl(*ah_resetStationBeaconTimers)(struct ath_hal*);
-
-	/* Interrupt functions */
-	HAL_BOOL  __ahdecl(*ah_isInterruptPending)(struct ath_hal*);
-	HAL_BOOL  __ahdecl(*ah_getPendingInterrupts)(struct ath_hal*, HAL_INT*);
-	HAL_INT	  __ahdecl(*ah_getInterrupts)(struct ath_hal*);
-	HAL_INT	  __ahdecl(*ah_setInterrupts)(struct ath_hal*, HAL_INT);
-};
-
-/* 
- * Check the PCI vendor ID and device ID against Atheros' values
- * and return a printable description for any Atheros hardware.
- * AH_NULL is returned if the ID's do not describe Atheros hardware.
- */
-extern	const char *__ahdecl ath_hal_probe(u_int16_t vendorid, u_int16_t devid);
-
-/*
- * Attach the HAL for use with the specified device.  The device is
- * defined by the PCI device ID.  The caller provides an opaque pointer
- * to an upper-layer data structure (HAL_SOFTC) that is stored in the
- * HAL state block for later use.  Hardware register accesses are done
- * using the specified bus tag and handle.  On successful return a
- * reference to a state block is returned that must be supplied in all
- * subsequent HAL calls.  Storage associated with this reference is
- * dynamically allocated and must be freed by calling the ah_detach
- * method when the client is done.  If the attach operation fails a
- * null (AH_NULL) reference will be returned and a status code will
- * be returned if the status parameter is non-zero.
- */
-extern	struct ath_hal * __ahdecl ath_hal_attach(u_int16_t devid, HAL_SOFTC,
-		HAL_BUS_TAG, HAL_BUS_HANDLE, HAL_STATUS* status);
-
-/*
- * Set the Vendor ID for Vendor SKU's which can modify the
- * channel properties returned by ath_hal_init_channels.
- * Return AH_TRUE if set succeeds
- */
-
-extern  HAL_BOOL __ahdecl ath_hal_setvendor(struct ath_hal *, u_int32_t );
-
-/*
- * Return a list of channels available for use with the hardware.
- * The list is based on what the hardware is capable of, the specified
- * country code, the modeSelect mask, and whether or not outdoor
- * channels are to be permitted.
- *
- * The channel list is returned in the supplied array.  maxchans
- * defines the maximum size of this array.  nchans contains the actual
- * number of channels returned.  If a problem occurred or there were
- * no channels that met the criteria then AH_FALSE is returned.
- */
-extern	HAL_BOOL __ahdecl ath_hal_init_channels(struct ath_hal *,
-		HAL_CHANNEL *chans, u_int maxchans, u_int *nchans,
-		u_int8_t *regclassids, u_int maxregids, u_int *nregids,
-		HAL_CTRY_CODE cc, u_int16_t modeSelect,
-		HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels);
-
-/*
- * Calibrate noise floor data following a channel scan or similar.
- * This must be called prior retrieving noise floor data.
- */
-extern	void __ahdecl ath_hal_process_noisefloor(struct ath_hal *ah);
-
-/*
- * Return bit mask of wireless modes supported by the hardware.
- */
-extern	u_int __ahdecl ath_hal_getwirelessmodes(struct ath_hal*, HAL_CTRY_CODE);
-
-/*
- * Return rate table for specified mode (11a, 11b, 11g, etc).
- */
-extern	const HAL_RATE_TABLE * __ahdecl ath_hal_getratetable(struct ath_hal *,
-		u_int mode);
-
-/*
- * Calculate the transmit duration of a frame.
- */
-extern u_int16_t __ahdecl ath_hal_computetxtime(struct ath_hal *,
-		const HAL_RATE_TABLE *rates, u_int32_t frameLen,
-		u_int16_t rateix, HAL_BOOL shortPreamble);
-
-/*
- * Return if device is public safety.
- */
-extern HAL_BOOL __ahdecl ath_hal_ispublicsafetysku(struct ath_hal *);
-
-/*
- * Convert between IEEE channel number and channel frequency
- * using the specified channel flags; e.g. CHANNEL_2GHZ.
- */
-extern	int __ahdecl ath_hal_mhz2ieee(struct ath_hal *, u_int mhz, u_int flags);
-
-/*
- * Return a version string for the HAL release.
- */
-extern	char ath_hal_version[];
-/*
- * Return a NULL-terminated array of build/configuration options.
- */
-extern	const char* ath_hal_buildopts[];
-#endif /* _ATH_AH_H_ */

Deleted: trunk/sys/contrib/dev/ath/ah_desc.h
===================================================================
--- trunk/sys/contrib/dev/ath/ah_desc.h	2018-07-11 13:43:03 UTC (rev 11750)
+++ trunk/sys/contrib/dev/ath/ah_desc.h	2018-07-11 13:43:55 UTC (rev 11751)
@@ -1,182 +0,0 @@
-/* $MidnightBSD$ */
-/*-
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros
- * Communications, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. The materials contained herein are unmodified and are used
- *    unmodified.
- * 2. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following NO
- *    ''WARRANTY'' disclaimer below (''Disclaimer''), without
- *    modification.
- * 3. Redistributions in binary form must reproduce at minimum a
- *    disclaimer similar to the Disclaimer below and any redistribution
- *    must be conditioned upon including a substantially similar
- *    Disclaimer requirement for further binary redistribution.
- * 4. Neither the names of the above-listed copyright holders nor the
- *    names of any contributors may be used to endorse or promote
- *    product derived from this software without specific prior written
- *    permission.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT,
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
- * FOR 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 DAMAGES.
- *
- * $Id: ah_desc.h,v 1.2 2008-09-19 02:07:52 laffer1 Exp $
- */
-
-#ifndef _DEV_ATH_DESC_H
-#define _DEV_ATH_DESC_H
-
-/*
- * Transmit descriptor status.  This structure is filled
- * in only after the tx descriptor process method finds a
- * ``done'' descriptor; at which point it returns something
- * other than HAL_EINPROGRESS.
- *
- * Note that ts_antenna may not be valid for all h/w.  It
- * should be used only if non-zero.
- */
-struct ath_tx_status {
-	u_int16_t	ts_seqnum;	/* h/w assigned sequence number */
-	u_int16_t	ts_tstamp;	/* h/w assigned timestamp */
-	u_int8_t	ts_status;	/* frame status, 0 => xmit ok */
-	u_int8_t	ts_rate;	/* h/w transmit rate index */
-#define	HAL_TXSTAT_ALTRATE	0x80	/* alternate xmit rate used */
-	int8_t		ts_rssi;	/* tx ack RSSI */
-	u_int8_t	ts_shortretry;	/* # short retries */
-	u_int8_t	ts_longretry;	/* # long retries */
-	u_int8_t	ts_virtcol;	/* virtual collision count */
-	u_int8_t	ts_antenna;	/* antenna information */
-	u_int8_t	ts_finaltsi;	/* final transmit series index */
-};
-
-#define	HAL_TXERR_XRETRY	0x01	/* excessive retries */
-#define	HAL_TXERR_FILT		0x02	/* blocked by tx filtering */
-#define	HAL_TXERR_FIFO		0x04	/* fifo underrun */
-
-/*
- * Receive descriptor status.  This structure is filled
- * in only after the rx descriptor process method finds a
- * ``done'' descriptor; at which point it returns something
- * other than HAL_EINPROGRESS.
- *
- * If rx_status is zero, then the frame was received ok;
- * otherwise the error information is indicated and rs_phyerr
- * contains a phy error code if HAL_RXERR_PHY is set.  In general
- * the frame contents is undefined when an error occurred thought
- * for some errors (e.g. a decryption error), it may be meaningful.
- *
- * Note that the receive timestamp is expanded using the TSF to
- * 15 bits (regardless of what the h/w provides directly).
- *
- * rx_rssi is in units of dbm above the noise floor.  This value
- * is measured during the preamble and PLCP; i.e. with the initial
- * 4us of detection.  The noise floor is typically a consistent
- * -96dBm absolute power in a 20MHz channel.
- */
-struct ath_rx_status {
-	u_int16_t	rs_datalen;	/* rx frame length */
-	u_int16_t	rs_tstamp;	/* h/w assigned timestamp */
-	u_int8_t	rs_status;	/* rx status, 0 => recv ok */
-	u_int8_t	rs_phyerr;	/* phy error code */
-	int8_t		rs_rssi;	/* rx frame RSSI */
-	u_int8_t	rs_keyix;	/* key cache index */
-	u_int8_t	rs_rate;	/* h/w receive rate index */
-	u_int8_t	rs_antenna;	/* antenna information */
-	u_int8_t	rs_more;	/* more descriptors follow */
-};
-
-#define	HAL_RXERR_CRC		0x01	/* CRC error on frame */
-#define	HAL_RXERR_PHY		0x02	/* PHY error, rs_phyerr is valid */
-#define	HAL_RXERR_FIFO		0x04	/* fifo overrun */
-#define	HAL_RXERR_DECRYPT	0x08	/* non-Michael decrypt error */
-#define	HAL_RXERR_MIC		0x10	/* Michael MIC decrypt error */
-
-enum {
-	HAL_PHYERR_UNDERRUN		= 0,	/* Transmit underrun */
-	HAL_PHYERR_TIMING		= 1,	/* Timing error */
-	HAL_PHYERR_PARITY		= 2,	/* Illegal parity */
-	HAL_PHYERR_RATE			= 3,	/* Illegal rate */
-	HAL_PHYERR_LENGTH		= 4,	/* Illegal length */
-	HAL_PHYERR_RADAR		= 5,	/* Radar detect */
-	HAL_PHYERR_SERVICE		= 6,	/* Illegal service */
-	HAL_PHYERR_TOR			= 7,	/* Transmit override receive */
-	/* NB: these are specific to the 5212 */
-	HAL_PHYERR_OFDM_TIMING		= 17,	/* */
-	HAL_PHYERR_OFDM_SIGNAL_PARITY	= 18,	/* */
-	HAL_PHYERR_OFDM_RATE_ILLEGAL	= 19,	/* */
-	HAL_PHYERR_OFDM_LENGTH_ILLEGAL	= 20,	/* */
-	HAL_PHYERR_OFDM_POWER_DROP	= 21,	/* */
-	HAL_PHYERR_OFDM_SERVICE		= 22,	/* */
-	HAL_PHYERR_OFDM_RESTART		= 23,	/* */
-	HAL_PHYERR_CCK_TIMING		= 25,	/* */
-	HAL_PHYERR_CCK_HEADER_CRC	= 26,	/* */
-	HAL_PHYERR_CCK_RATE_ILLEGAL	= 27,	/* */
-	HAL_PHYERR_CCK_SERVICE		= 30,	/* */
-	HAL_PHYERR_CCK_RESTART		= 31,	/* */
-};
-
-/* value found in rs_keyix to mark invalid entries */
-#define	HAL_RXKEYIX_INVALID	((u_int8_t) -1)
-/* value used to specify no encryption key for xmit */
-#define	HAL_TXKEYIX_INVALID	((u_int) -1)
-
-/* XXX rs_antenna definitions */
-
-/*
- * Definitions for the software frame/packet descriptors used by
- * the Atheros HAL.  This definition obscures hardware-specific
- * details from the driver.  Drivers are expected to fillin the
- * portions of a descriptor that are not opaque then use HAL calls
- * to complete the work.  Status for completed frames is returned
- * in a device-independent format.
- */
-struct ath_desc {
-	/*
-	 * The following definitions are passed directly
-	 * the hardware and managed by the HAL.  Drivers
-	 * should not touch those elements marked opaque.
-	 */
-	u_int32_t	ds_link;	/* phys address of next descriptor */
-	u_int32_t	ds_data;	/* phys address of data buffer */
-	u_int32_t	ds_ctl0;	/* opaque DMA control 0 */
-	u_int32_t	ds_ctl1;	/* opaque DMA control 1 */
-	u_int32_t	ds_hw[4];	/* opaque h/w region */
-};
-
-struct ath_desc_status {
-	union {
-		struct ath_tx_status tx;/* xmit status */
-		struct ath_rx_status rx;/* recv status */
-	} ds_us;
-};
-
-#define	ds_txstat	ds_us.tx
-#define	ds_rxstat	ds_us.rx
-
-/* flags passed to tx descriptor setup methods */
-#define	HAL_TXDESC_CLRDMASK	0x0001	/* clear destination filter mask */
-#define	HAL_TXDESC_NOACK	0x0002	/* don't wait for ACK */
-#define	HAL_TXDESC_RTSENA	0x0004	/* enable RTS */
-#define	HAL_TXDESC_CTSENA	0x0008	/* enable CTS */
-#define	HAL_TXDESC_INTREQ	0x0010	/* enable per-descriptor interrupt */
-#define	HAL_TXDESC_VEOL		0x0020	/* mark virtual EOL */
-/* NB: this only affects frame, not any RTS/CTS */
-#define	HAL_TXDESC_DURENA	0x0040	/* enable h/w write of duration field */
-
-/* flags passed to rx descriptor setup methods */
-#define	HAL_RXDESC_INTREQ	0x0020	/* enable per-descriptor interrupt */
-#endif /* _DEV_ATH_DESC_H */

Deleted: trunk/sys/contrib/dev/ath/ah_devid.h
===================================================================
--- trunk/sys/contrib/dev/ath/ah_devid.h	2018-07-11 13:43:03 UTC (rev 11750)
+++ trunk/sys/contrib/dev/ath/ah_devid.h	2018-07-11 13:43:55 UTC (rev 11751)
@@ -1,100 +0,0 @@
-/* $MidnightBSD$ */
-/*-
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros
- * Communications, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. The materials contained herein are unmodified and are used
- *    unmodified.
- * 2. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following NO
- *    ''WARRANTY'' disclaimer below (''Disclaimer''), without
- *    modification.
- * 3. Redistributions in binary form must reproduce at minimum a
- *    disclaimer similar to the Disclaimer below and any redistribution
- *    must be conditioned upon including a substantially similar
- *    Disclaimer requirement for further binary redistribution.
- * 4. Neither the names of the above-listed copyright holders nor the
- *    names of any contributors may be used to endorse or promote
- *    product derived from this software without specific prior written
- *    permission.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT,
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
- * FOR 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 DAMAGES.
- *
- * $Id: ah_devid.h,v 1.2 2008-09-19 02:07:52 laffer1 Exp $
- */
-
-#ifndef _DEV_ATH_DEVID_H_
-#define _DEV_ATH_DEVID_H_
-
-#define ATHEROS_VENDOR_ID	0x168c		/* Atheros PCI vendor ID */
-/*
- * NB: all Atheros-based devices should have a PCI vendor ID
- *     of 0x168c, but some vendors, in their infinite wisdom
- *     do not follow this so we must handle them specially.
- */
-#define	ATHEROS_3COM_VENDOR_ID	0xa727		/* 3Com 3CRPAG175 vendor ID */
-#define	ATHEROS_3COM2_VENDOR_ID	0x10b7		/* 3Com 3CRDAG675 vendor ID */
-
-/* AR5210 (for reference) */
-#define AR5210_DEFAULT          0x1107          /* No eeprom HW default */
-#define AR5210_PROD             0x0007          /* Final device ID */
-#define AR5210_AP               0x0207          /* Early AP11s */
-
-/* AR5211 */
-#define AR5211_DEFAULT          0x1112          /* No eeprom HW default */
-#define AR5311_DEVID            0x0011          /* Final ar5311 devid */
-#define AR5211_DEVID            0x0012          /* Final ar5211 devid */
-#define AR5211_LEGACY           0xff12          /* Original emulation board */
-#define AR5211_FPGA11B          0xf11b          /* 11b emulation board */
-
-/* AR5212 */
-#define AR5212_DEFAULT          0x1113          /* No eeprom HW default */
-#define AR5212_DEVID            0x0013          /* Final ar5212 devid */
-#define AR5212_FPGA             0xf013          /* Emulation board */
-#define	AR5212_DEVID_IBM	0x1014          /* IBM minipci ID */
-#define AR5212_AR5312_REV2      0x0052          /* AR5312 WMAC (AP31) */
-#define AR5212_AR5312_REV7      0x0057          /* AR5312 WMAC (AP30-040) */
-#define AR5212_AR2313_REV8      0x0058          /* AR2313 WMAC (AP43-030) */
-#define AR5212_AR2315_REV6      0x0086          /* AR2315 WMAC (AP51-Light) */
-#define AR5212_AR2315_REV7      0x0087          /* AR2315 WMAC (AP51-Full) */
-#define AR5212_AR2317_REV1      0x0091          /* AR2317 WMAC (AP61) */
-
-/* AR5212 compatible devid's also attach to 5212 */
-#define	AR5212_DEVID_0014	0x0014
-#define	AR5212_DEVID_0015	0x0015
-#define	AR5212_DEVID_0016	0x0016
-#define	AR5212_DEVID_0017	0x0017
-#define	AR5212_DEVID_0018	0x0018
-#define	AR5212_DEVID_0019	0x0019
-#define AR5212_AR2413      	0x001a          /* AR2413 aka Griffin-lite */
-#define AR5212_AR5413		0x001b          /* Eagle */
-#define AR5212_AR5424		0x001c          /* Condor (PCI express) */
-#define AR5212_DEVID_FF19	0xff19          /* XXX PCI express */
-
-/* AR5213 */
-#define	AR5213_SREV_1_0		0x0055
-#define	AR5213_SREV_REG		0x4020
-
-/* AR5416  */
-#define AR5416_DEVID_EMU_PCI	0xff1d		/* PCI Owl Emulation*/
-#define AR5416_DEVID_EMU_PCIE	0xff1c		/* PCIe Owl Emulation*/
-#define AR5416_DEVID		0x0023          /* PCI (MB/CB) */
-#define AR5418_DEVID		0x0024          /* PCI Express (XB) */
-
-#define	AR_SUBVENDOR_ID_NOG	0x0e11		/* No 11G subvendor ID */
-#define AR_SUBVENDOR_ID_NEW_A	0x7065		/* Update device to new RD */
-#endif /* _DEV_ATH_DEVID_H */

Deleted: trunk/sys/contrib/dev/ath/ah_soc.h
===================================================================
--- trunk/sys/contrib/dev/ath/ah_soc.h	2018-07-11 13:43:03 UTC (rev 11750)
+++ trunk/sys/contrib/dev/ath/ah_soc.h	2018-07-11 13:43:55 UTC (rev 11751)
@@ -1,111 +0,0 @@
-/* $MidnightBSD$ */
-/*-
- * Copyright (c) 2006 Sam Leffler, Errno Consulting, Atheros
- * Communications, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. The materials contained herein are unmodified and are used
- *    unmodified.
- * 2. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following NO
- *    ''WARRANTY'' disclaimer below (''Disclaimer''), without
- *    modification.
- * 3. Redistributions in binary form must reproduce at minimum a
- *    disclaimer similar to the Disclaimer below and any redistribution
- *    must be conditioned upon including a substantially similar
- *    Disclaimer requirement for further binary redistribution.
- * 4. Neither the names of the above-listed copyright holders nor the
- *    names of any contributors may be used to endorse or promote
- *    product derived from this software without specific prior written
- *    permission.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT,
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
- * FOR 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 DAMAGES.
- *
- * $Id: ah_soc.h,v 1.1 2008-09-19 02:07:52 laffer1 Exp $
- */
-#ifndef _ATH_AH_SOC_H_
-#define _ATH_AH_SOC_H_
-/*
- * Atheros System on Chip (SoC) public definitions.
- */
-
-/*
- * This is board-specific data that is stored in a "known"
- * location in flash.  To find the start of this data search
- * back from the (aliased) end of flash by 0x1000 bytes at a
- * time until you find the string "5311", which marks the
- * start of Board Configuration.  Typically one gives up if
- * more than 500KB is searched.
- */
-struct ar531x_boarddata {
-	u_int32_t magic;             /* board data is valid */
-#define AR531X_BD_MAGIC 0x35333131   /* "5311", for all 531x platforms */
-	u_int16_t cksum;             /* checksum (starting with BD_REV 2) */
-	u_int16_t rev;               /* revision of this struct */
-#define BD_REV  4
-	char   boardName[64];        /* Name of board */
-	u_int16_t major;             /* Board major number */
-	u_int16_t minor;             /* Board minor number */
-	u_int32_t config;            /* Board configuration */
-#define BD_ENET0        0x00000001   /* ENET0 is stuffed */
-#define BD_ENET1        0x00000002   /* ENET1 is stuffed */
-#define BD_UART1        0x00000004   /* UART1 is stuffed */
-#define BD_UART0        0x00000008   /* UART0 is stuffed (dma) */
-#define BD_RSTFACTORY   0x00000010   /* Reset factory defaults stuffed */
-#define BD_SYSLED       0x00000020   /* System LED stuffed */
-#define BD_EXTUARTCLK   0x00000040   /* External UART clock */
-#define BD_CPUFREQ      0x00000080   /* cpu freq is valid in nvram */
-#define BD_SYSFREQ      0x00000100   /* sys freq is set in nvram */
-#define BD_WLAN0        0x00000200   /* Enable WLAN0 */
-#define BD_MEMCAP       0x00000400   /* CAP SDRAM @ memCap for testing */
-#define BD_DISWATCHDOG  0x00000800   /* disable system watchdog */
-#define BD_WLAN1        0x00001000   /* Enable WLAN1 (ar5212) */
-#define BD_ISCASPER     0x00002000   /* FLAG for AR2312 */
-#define BD_WLAN0_2G_EN  0x00004000   /* FLAG for radio0_2G */
-#define BD_WLAN0_5G_EN  0x00008000   /* FLAG for radio0_2G */
-#define BD_WLAN1_2G_EN  0x00020000   /* FLAG for radio0_2G */
-#define BD_WLAN1_5G_EN  0x00040000   /* FLAG for radio0_2G */
-	u_int16_t resetConfigGpio;   /* Reset factory GPIO pin */
-	u_int16_t sysLedGpio;        /* System LED GPIO pin */
-	
-	u_int32_t cpuFreq;           /* CPU core frequency in Hz */
-	u_int32_t sysFreq;           /* System frequency in Hz */
-	u_int32_t cntFreq;           /* Calculated C0_COUNT frequency */
-	
-	u_int8_t  wlan0Mac[6];
-	u_int8_t  enet0Mac[6];
-	u_int8_t  enet1Mac[6];
-	
-	u_int16_t pciId;             /* Pseudo PCIID for common code */
-	u_int16_t memCap;            /* cap bank1 in MB */
-	
-	/* version 3 */
-	u_int8_t  wlan1Mac[6];       /* (ar5212) */
-};
-
-/*
- * Board support data.  The driver is required to locate
- * and fill-in this information before passing a reference to
- * this structure as the HAL_BUS_TAG parameter supplied to
- * ath_hal_attach.
- */
-struct ar531x_config {
-	const struct ar531x_boarddata *board;	/* board config data */
-	const char	*radio;			/* radio config data */
-	int		unit;			/* unit number [0, 1] */
-	void		*tag;			/* bus space tag */
-};
-#endif	/* _ATH_AH_SOC_H_ */

Deleted: trunk/sys/contrib/dev/ath/version.h
===================================================================
--- trunk/sys/contrib/dev/ath/version.h	2018-07-11 13:43:03 UTC (rev 11750)
+++ trunk/sys/contrib/dev/ath/version.h	2018-07-11 13:43:55 UTC (rev 11751)
@@ -1,39 +0,0 @@
-/* $MidnightBSD$ */
-/*-
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
- * 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,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
- *    redistribution must be conditioned upon including a substantially
- *    similar Disclaimer requirement for further binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
- *
- * $Id: version.h,v 1.2 2008-09-19 02:07:52 laffer1 Exp $
- */
-#define	ATH_HAL_VERSION	"0.9.20.3"



More information about the Midnightbsd-cvs mailing list