commit 96a208deb4846346d326359c5bc4ed750245c4af Author: Jiri Slaby Date: Mon Jun 25 14:36:16 2007 +0200 remove empty or unused files diff --git a/Makefile b/Makefile index e71cfe3..bcb2589 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ KBUILD=$(MAKE) -C $(KDIR) M=$(PWD) EXTRA_CFLAGS += -I$(src)/openhal ath5k-objs := ath/if_ath_pci.o openhal/ath5k_hw.o \ - openhal/ieee80211_regdomain.o #ath/radar.o #ath/if_ath.o + openhal/ieee80211_regdomain.o obj-m += ath5k.o diff --git a/ath/if_athrate.h b/ath/if_athrate.h deleted file mode 100644 index ff4beaf..0000000 --- a/ath/if_athrate.h +++ /dev/null @@ -1,147 +0,0 @@ -/*- - * Copyright (c) 2004-2005 Sam Leffler, Errno Consulting - * Copyright (c) 2004-2005 Video54 Technologies, Inc. - * 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. - * - * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.2 2004/12/31 22:41:45 sam Exp $ - */ -#ifndef _ATH_RATECTRL_H_ -#define _ATH_RATECTRL_H_ - -/* - * Interface definitions for transmit rate control modules for the - * Atheros driver. - * - * A rate control module is responsible for choosing the transmit rate - * for each data frame. Management+control frames are always sent at - * a fixed rate. - * - * Only one module may be present at a time; the driver references - * rate control interfaces by symbol name. If multiple modules are - * to be supported we'll need to switch to a registration-based scheme - * as is currently done, for example, for authentication modules. - * - * An instance of the rate control module is attached to each device - * at attach time and detached when the device is destroyed. The module - * may associate data with each device and each node (station). Both - * sets of storage are opaque except for the size of the per-node storage - * which must be provided when the module is attached. - * - * The rate control module is notified for each state transition and - * station association/reassociation. Otherwise it is queried for a - * rate for each outgoing frame and provided status from each transmitted - * frame. Any ancillary processing is the responsibility of the module - * (e.g. if periodic processing is required then the module should setup - * it's own timer). - * - * In addition to the transmit rate for each frame the module must also - * indicate the number of attempts to make at the specified rate. If this - * number is != ATH_TXMAXTRY then an additional callback is made to setup - * additional transmit state. The rate control code is assumed to write - * this additional data directly to the transmit descriptor. - */ -struct ath_softc; -struct ath_node; -struct ath_desc; - -struct ath_ratectrl { - size_t arc_space; /* space required for per-node state */ -}; -/* - * Attach/detach a rate control module. - */ -struct ath_ratectrl *ath_rate_attach(struct ath_softc *); -void ath_rate_detach(struct ath_ratectrl *); - -/* - * Allow rate control module to register dynamic sysctls, after - * dev->name is filled in; Modules are expected to unregister dynamic - * sysctls in ath_rate_detach(). - */ -void ath_rate_dynamic_sysctl_register(struct ath_softc *); - -/* - * State storage handling. - */ -/* - * Initialize per-node state already allocated for the specified - * node; this space can be assumed initialized to zero. - */ -void ath_rate_node_init(struct ath_softc *, struct ath_node *); -/* - * Cleanup any per-node state prior to the node being reclaimed. - */ -void ath_rate_node_cleanup(struct ath_softc *, struct ath_node *); -/* - * Update rate control state on station associate/reassociate - * (when operating as an ap or for nodes discovered when operating - * in ibss mode). - */ -void ath_rate_newassoc(struct ath_softc *, struct ath_node *, - int isNewAssociation); -#ifdef BLE -/* - * Update/reset rate control state for 802.11 state transitions. - * Important mostly as the analog to ath_rate_newassoc when operating - * in station mode. - */ -void ath_rate_newstate(struct ath_softc *, enum ieee80211_state); -#endif -/* - * Transmit handling. - */ -/* - * Return the transmit info for a data packet. If multi-rate state - * is to be setup then try0 should contain a value other than ATH_TXMATRY - * and ath_rate_setupxtxdesc will be called after deciding if the frame - * can be transmitted with multi-rate retry. - */ -void ath_rate_findrate(struct ath_softc *, struct ath_node *, - int shortPreamble, size_t frameLen, - u_int8_t *rix, int *try0, u_int8_t *txrate); -/* - * Setup any extended (multi-rate) descriptor state for a data packet. - * The rate index returned by ath_rate_findrate is passed back in. - */ -void ath_rate_setupxtxdesc(struct ath_softc *, struct ath_node *, - struct ath_desc *, int shortPreamble, u_int8_t rix); -/* - * Update rate control state for a packet associated with the - * supplied transmit descriptor. The routine is invoked both - * for packets that were successfully sent and for those that - * failed (consult the descriptor for details). - */ -void ath_rate_tx_complete(struct ath_softc *, struct ath_node *, - const struct ath_desc *); -#endif /* _ATH_RATECTRL_H_ */ diff --git a/ath/if_athvar.h b/ath/if_athvar.h index 14b5564..0b85915 100644 --- a/ath/if_athvar.h +++ b/ath/if_athvar.h @@ -48,7 +48,6 @@ #include "ath5k.h" #include "if_athioctl.h" -#include "if_athrate.h" #define ATH_TIMEOUT 1000 diff --git a/ath/radar.c b/ath/radar.c deleted file mode 100644 index 1da9edf..0000000 --- a/ath/radar.c +++ /dev/null @@ -1,88 +0,0 @@ -#ifndef AUTOCONF_INCLUDED -#include -#endif -#include -#include -#include -#include -#include -#include - -//#include "radar.h" - - -/* - Upon "in-service" radar detection, this code handles the frequency hopping - by finding a new channel where we haven't detected any radar or have not - tried to use for 30 minutes -*/ - -/* 30 minutes */ -#define RADAR_CHANNEL_REUSE_LIMIT (HZ * 60 * 30) - -static void -radar_device_reanimate(unsigned long arg) -{ - struct ieee80211com *ic = (struct ieee80211com *)arg; - struct net_device *dev = ic->ic_dev; - - del_timer(&ic->ic_radar_reanimate); - - printk("%s: reanimating device after radar disturbance\n", dev->name); - ic->ic_init(dev); -} - -void -radar_init(struct ieee80211com *ic) -{ - memset (ic->ic_channelList, 0, sizeof (ic->ic_channelList)); - init_timer(&ic->ic_radar_reanimate); - ic->ic_radar_reanimate.function = radar_device_reanimate; - ic->ic_radar_reanimate.data = (unsigned long) ic; -} - -struct ieee80211_channel * -radar_handle_interference(struct ieee80211com *ic) -{ - struct ieee80211_channel *c; - - int index = 0; - int chan; - u_int32_t firstTimeout = jiffies;; - - /* Mark current channel as having radar on it */ - chan = ic->ic_ibss_chan - ic->ic_channels; - - printk ("%s: Marking channel %d as radar disturbed, time=%lu.\n", __func__, chan, jiffies); - - if (ic->ic_ibss_chan != NULL) - ic->ic_channelList[chan] = jiffies; - - /* Find next appropriate channel */ - while (index < IEEE80211_CHAN_MAX) { - if (!isclr(ic->ic_chan_active, index) && - (ic->ic_channelList[index] == 0 || - (jiffies - ic->ic_channelList[index]) > RADAR_CHANNEL_REUSE_LIMIT)) { - printk ("%s: Hopping to channel %d (%u).\n", - ic->ic_dev->name, index, ic->ic_channelList[index]); - break; - } - /* channel blocked */ - if((ic->ic_channelList[index] != 0) && - (ic->ic_channelList[index] < firstTimeout)){ - firstTimeout = ic->ic_channelList[index]; - } - index ++; - } - if (index == IEEE80211_CHAN_MAX) { - /* No channels are availiable */ - printk("%s: all channels blocked, first timeout=%i\n", - ic->ic_dev->name, firstTimeout + RADAR_CHANNEL_REUSE_LIMIT); - ic->ic_radar_reanimate.expires = firstTimeout + RADAR_CHANNEL_REUSE_LIMIT; - add_timer(&ic->ic_radar_reanimate); - return NULL; - } - c = &ic->ic_channels[index]; - - return c; -} diff --git a/openhal/opt_ah.h b/openhal/opt_ah.h deleted file mode 100644 index e69de29..0000000