First pass of LED related code changes.
Migrate the LED code out of if_ath.c and into if_ath_led.c. These routines are _all_ software based LED blinking.
This commit is contained in:
Adrian Chadd
parent
7e97436b0e
commit
c65ee21d46
@ -588,6 +588,8 @@ dev/ath/if_ath_debug.c optional ath \
|
||||
compile-with "${NORMAL_C} -I$S/dev/ath"
|
||||
dev/ath/if_ath_keycache.c optional ath \
|
||||
compile-with "${NORMAL_C} -I$S/dev/ath"
|
||||
dev/ath/if_ath_led.c optional ath \
|
||||
compile-with "${NORMAL_C} -I$S/dev/ath"
|
||||
dev/ath/if_ath_tx.c optional ath \
|
||||
compile-with "${NORMAL_C} -I$S/dev/ath"
|
||||
dev/ath/if_ath_tx_ht.c optional ath \
|
||||
|
||||
@ -101,6 +101,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/ath/if_ath_misc.h>
|
||||
#include <dev/ath/if_ath_tx.h>
|
||||
#include <dev/ath/if_ath_sysctl.h>
|
||||
#include <dev/ath/if_ath_led.h>
|
||||
#include <dev/ath/if_ath_keycache.h>
|
||||
#include <dev/ath/if_athdfs.h>
|
||||
|
||||
@ -204,7 +205,6 @@ static int ath_setregdomain(struct ieee80211com *,
|
||||
static void ath_getradiocaps(struct ieee80211com *, int, int *,
|
||||
struct ieee80211_channel []);
|
||||
static int ath_getchannels(struct ath_softc *);
|
||||
static void ath_led_event(struct ath_softc *, int);
|
||||
|
||||
static int ath_rate_setup(struct ath_softc *, u_int mode);
|
||||
static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode);
|
||||
@ -5956,49 +5956,6 @@ ath_getchannels(struct ath_softc *sc)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
ath_led_done(void *arg)
|
||||
{
|
||||
struct ath_softc *sc = arg;
|
||||
|
||||
sc->sc_blinking = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Turn the LED off: flip the pin and then set a timer so no
|
||||
* update will happen for the specified duration.
|
||||
*/
|
||||
static void
|
||||
ath_led_off(void *arg)
|
||||
{
|
||||
struct ath_softc *sc = arg;
|
||||
|
||||
ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !sc->sc_ledon);
|
||||
callout_reset(&sc->sc_ledtimer, sc->sc_ledoff, ath_led_done, sc);
|
||||
}
|
||||
|
||||
/*
|
||||
* Blink the LED according to the specified on/off times.
|
||||
*/
|
||||
static void
|
||||
ath_led_blink(struct ath_softc *sc, int on, int off)
|
||||
{
|
||||
DPRINTF(sc, ATH_DEBUG_LED, "%s: on %u off %u\n", __func__, on, off);
|
||||
ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, sc->sc_ledon);
|
||||
sc->sc_blinking = 1;
|
||||
sc->sc_ledoff = off;
|
||||
callout_reset(&sc->sc_ledtimer, on, ath_led_off, sc);
|
||||
}
|
||||
|
||||
static void
|
||||
ath_led_event(struct ath_softc *sc, int rix)
|
||||
{
|
||||
sc->sc_ledevent = ticks; /* time of last event */
|
||||
if (sc->sc_blinking) /* don't interrupt active blink */
|
||||
return;
|
||||
ath_led_blink(sc, sc->sc_hwmap[rix].ledon, sc->sc_hwmap[rix].ledoff);
|
||||
}
|
||||
|
||||
static int
|
||||
ath_rate_setup(struct ath_softc *sc, u_int mode)
|
||||
{
|
||||
|
||||
154
sys/dev/ath/if_ath_led.c
Normal file
154
sys/dev/ath/if_ath_led.c
Normal file
@ -0,0 +1,154 @@
|
||||
/*-
|
||||
* Copyright (c) 2002-2009 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.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
/*
|
||||
* Driver for the Atheros Wireless LAN controller.
|
||||
*
|
||||
* This software is derived from work of Atsushi Onoe; his contribution
|
||||
* is greatly appreciated.
|
||||
*/
|
||||
|
||||
#include "opt_inet.h"
|
||||
#include "opt_ath.h"
|
||||
/*
|
||||
* This is needed for register operations which are performed
|
||||
* by the driver - eg, calls to ath_hal_gettsf32().
|
||||
*/
|
||||
#include "opt_ah.h"
|
||||
#include "opt_wlan.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/sockio.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/callout.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/endian.h>
|
||||
#include <sys/kthread.h>
|
||||
#include <sys/taskqueue.h>
|
||||
#include <sys/priv.h>
|
||||
#include <sys/module.h>
|
||||
#include <sys/ktr.h>
|
||||
#include <sys/smp.h> /* for mp_ncpus */
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_dl.h>
|
||||
#include <net/if_media.h>
|
||||
#include <net/if_types.h>
|
||||
#include <net/if_arp.h>
|
||||
#include <net/ethernet.h>
|
||||
#include <net/if_llc.h>
|
||||
|
||||
#include <net80211/ieee80211_var.h>
|
||||
#include <net80211/ieee80211_regdomain.h>
|
||||
#ifdef IEEE80211_SUPPORT_SUPERG
|
||||
#include <net80211/ieee80211_superg.h>
|
||||
#endif
|
||||
#ifdef IEEE80211_SUPPORT_TDMA
|
||||
#include <net80211/ieee80211_tdma.h>
|
||||
#endif
|
||||
|
||||
#include <net/bpf.h>
|
||||
|
||||
#ifdef INET
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
#endif
|
||||
|
||||
#include <dev/ath/if_athvar.h>
|
||||
#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
|
||||
#include <dev/ath/ath_hal/ah_diagcodes.h>
|
||||
|
||||
#include <dev/ath/if_ath_debug.h>
|
||||
#include <dev/ath/if_ath_misc.h>
|
||||
|
||||
#include <dev/ath/if_ath_led.h>
|
||||
|
||||
/*
|
||||
* Software LED driver routines.
|
||||
*/
|
||||
|
||||
/*
|
||||
* XXX TODO: move the LED sysctls here.
|
||||
*/
|
||||
|
||||
static void
|
||||
ath_led_done(void *arg)
|
||||
{
|
||||
struct ath_softc *sc = arg;
|
||||
|
||||
sc->sc_blinking = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Turn the LED off: flip the pin and then set a timer so no
|
||||
* update will happen for the specified duration.
|
||||
*/
|
||||
static void
|
||||
ath_led_off(void *arg)
|
||||
{
|
||||
struct ath_softc *sc = arg;
|
||||
|
||||
ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !sc->sc_ledon);
|
||||
callout_reset(&sc->sc_ledtimer, sc->sc_ledoff, ath_led_done, sc);
|
||||
}
|
||||
|
||||
/*
|
||||
* Blink the LED according to the specified on/off times.
|
||||
*/
|
||||
static void
|
||||
ath_led_blink(struct ath_softc *sc, int on, int off)
|
||||
{
|
||||
DPRINTF(sc, ATH_DEBUG_LED, "%s: on %u off %u\n", __func__, on, off);
|
||||
ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, sc->sc_ledon);
|
||||
sc->sc_blinking = 1;
|
||||
sc->sc_ledoff = off;
|
||||
callout_reset(&sc->sc_ledtimer, on, ath_led_off, sc);
|
||||
}
|
||||
|
||||
void
|
||||
ath_led_event(struct ath_softc *sc, int rix)
|
||||
{
|
||||
sc->sc_ledevent = ticks; /* time of last event */
|
||||
if (sc->sc_blinking) /* don't interrupt active blink */
|
||||
return;
|
||||
ath_led_blink(sc, sc->sc_hwmap[rix].ledon, sc->sc_hwmap[rix].ledoff);
|
||||
}
|
||||
36
sys/dev/ath/if_ath_led.h
Normal file
36
sys/dev/ath/if_ath_led.h
Normal file
@ -0,0 +1,36 @@
|
||||
/*-
|
||||
* Copyright (c) 2002-2009 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.
|
||||
*
|
||||
* 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$
|
||||
*/
|
||||
#ifndef __IF_ATH_LED_H__
|
||||
#define __IF_ATH_LED_H__
|
||||
|
||||
extern void ath_led_event(struct ath_softc *sc, int rix);
|
||||
|
||||
#endif
|
||||
@ -36,7 +36,7 @@ ATH_RATE?= sample # tx rate control algorithm
|
||||
|
||||
KMOD= if_ath
|
||||
SRCS= if_ath.c if_ath_debug.c if_ath_keycache.c if_ath_sysctl.c
|
||||
SRCS+= if_ath_tx.c if_ath_tx_ht.c
|
||||
SRCS+= if_ath_tx.c if_ath_tx_ht.c if_ath_led.c
|
||||
# NB: v3 eeprom support used by both AR5211 and AR5212; just include it
|
||||
SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c
|
||||
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h opt_wlan.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user