LED: Add LED trigger support
This patch allows to associate LEDs with certain triggers, such as heartbeat or network activity. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
91d781f51d
commit
32558d1ae5
|
@ -11,4 +11,11 @@ config LED_GPIO_RGB
|
||||||
bool "gpio rgb LED support"
|
bool "gpio rgb LED support"
|
||||||
depends on LED_GPIO
|
depends on LED_GPIO
|
||||||
|
|
||||||
|
config LED_TRIGGERS
|
||||||
|
select POLLER
|
||||||
|
bool "LED triggers support"
|
||||||
|
help
|
||||||
|
This allows to assign certain triggers like heartbeat or network
|
||||||
|
activity to LEDs.
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
obj-$(CONFIG_LED) += core.o
|
obj-$(CONFIG_LED) += core.o
|
||||||
obj-$(CONFIG_LED_GPIO) += led-gpio.o
|
obj-$(CONFIG_LED_GPIO) += led-gpio.o
|
||||||
|
obj-$(CONFIG_LED_TRIGGERS) += led-triggers.o
|
||||||
|
|
|
@ -0,0 +1,153 @@
|
||||||
|
/*
|
||||||
|
* LED trigger support for barebox
|
||||||
|
*
|
||||||
|
* (C) Copyright 2010 Sascha Hauer, Pengutronix
|
||||||
|
*
|
||||||
|
* See file CREDITS for list of people who contributed to this
|
||||||
|
* project.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||||
|
* MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
#include <poller.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <clock.h>
|
||||||
|
#include <led.h>
|
||||||
|
#include <init.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* @brief LED trigger framework
|
||||||
|
*
|
||||||
|
* This file contains triggers which can be associated to LEDs.
|
||||||
|
*
|
||||||
|
* With this framework LEDs can be associated to different events.
|
||||||
|
* An event can be a heartbeat, network activity or panic.
|
||||||
|
* led_trigger() is the central function which is called in the
|
||||||
|
* different barebox frameworks to trigger an event.
|
||||||
|
*
|
||||||
|
* currently there are the following triggers are defined:
|
||||||
|
*
|
||||||
|
* led_trigger_panic: triggered in panic()
|
||||||
|
* led_trigger_heartbeat: shows the heartbeat of barebox. Blinks as long
|
||||||
|
* barebox is up and running.
|
||||||
|
* led_trigger_net_rx: Triggered during network packet reception
|
||||||
|
* led_trigger_net_tx: Triggered during network packet transmission
|
||||||
|
* led_trigger_net_txrx: combination of the two above
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct led_trigger_struct {
|
||||||
|
struct led *led;
|
||||||
|
uint64_t flash_start;
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct led_trigger_struct triggers[LED_TRIGGER_MAX];
|
||||||
|
|
||||||
|
static void trigger_func(struct poller_struct *poller)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < LED_TRIGGER_MAX; i++) {
|
||||||
|
if (triggers[i].led &&
|
||||||
|
triggers[i].flash_start &&
|
||||||
|
is_timeout(triggers[i].flash_start, 200 * MSECOND)) {
|
||||||
|
led_set(triggers[i].led, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (triggers[LED_TRIGGER_HEARTBEAT].led &&
|
||||||
|
is_timeout(triggers[LED_TRIGGER_HEARTBEAT].flash_start, SECOND))
|
||||||
|
led_trigger(LED_TRIGGER_HEARTBEAT, TRIGGER_FLASH);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct poller_struct trigger_poller = {
|
||||||
|
.func = trigger_func,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* led_trigger - triggers a trigger
|
||||||
|
* @param trigger The trigger to enable/disable
|
||||||
|
* @param enable true if enable
|
||||||
|
*
|
||||||
|
* Enable/disable a LED for a given trigger.
|
||||||
|
*/
|
||||||
|
void led_trigger(enum led_trigger trigger, enum trigger_type type)
|
||||||
|
{
|
||||||
|
if (trigger >= LED_TRIGGER_MAX)
|
||||||
|
return;
|
||||||
|
if (!triggers[trigger].led)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (type == TRIGGER_FLASH) {
|
||||||
|
if (is_timeout(triggers[trigger].flash_start, 400 * MSECOND)) {
|
||||||
|
led_set(triggers[trigger].led, 1);
|
||||||
|
triggers[trigger].flash_start = get_time_ns();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
led_set(triggers[trigger].led, type == TRIGGER_ENABLE ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* led_set_trigger - set the LED for a trigger
|
||||||
|
* @param trigger The trigger to set a LED for
|
||||||
|
* @param led The LED
|
||||||
|
*
|
||||||
|
* This function associates a trigger with a LED. Pass led = NULL
|
||||||
|
* to disable a trigger
|
||||||
|
*/
|
||||||
|
int led_set_trigger(enum led_trigger trigger, struct led *led)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (trigger >= LED_TRIGGER_MAX)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (led)
|
||||||
|
for (i = 0; i < LED_TRIGGER_MAX; i++)
|
||||||
|
if (triggers[i].led == led)
|
||||||
|
return -EBUSY;
|
||||||
|
|
||||||
|
if (triggers[trigger].led && !led)
|
||||||
|
led_set(triggers[trigger].led, 0);
|
||||||
|
|
||||||
|
triggers[trigger].led = led;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* led_get_trigger - get the LED for a trigger
|
||||||
|
* @param trigger The trigger to set a LED for
|
||||||
|
*
|
||||||
|
* return the LED number of a trigger.
|
||||||
|
*/
|
||||||
|
int led_get_trigger(enum led_trigger trigger)
|
||||||
|
{
|
||||||
|
if (trigger >= LED_TRIGGER_MAX)
|
||||||
|
return -EINVAL;
|
||||||
|
if (!triggers[trigger].led)
|
||||||
|
return -ENODEV;
|
||||||
|
return led_get_number(triggers[trigger].led);
|
||||||
|
}
|
||||||
|
|
||||||
|
int trigger_init(void)
|
||||||
|
{
|
||||||
|
return poller_register(&trigger_poller);
|
||||||
|
}
|
||||||
|
late_initcall(trigger_init);
|
|
@ -26,6 +26,38 @@ int led_register(struct led *led);
|
||||||
void led_unregister(struct led *led);
|
void led_unregister(struct led *led);
|
||||||
void led_unregister(struct led *led);
|
void led_unregister(struct led *led);
|
||||||
|
|
||||||
|
/* LED trigger support */
|
||||||
|
enum led_trigger {
|
||||||
|
LED_TRIGGER_PANIC,
|
||||||
|
LED_TRIGGER_HEARTBEAT,
|
||||||
|
LED_TRIGGER_NET_RX,
|
||||||
|
LED_TRIGGER_NET_TX,
|
||||||
|
LED_TRIGGER_NET_TXRX,
|
||||||
|
LED_TRIGGER_MAX,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum trigger_type {
|
||||||
|
TRIGGER_ENABLE,
|
||||||
|
TRIGGER_DISABLE,
|
||||||
|
TRIGGER_FLASH,
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_LED_TRIGGERS
|
||||||
|
int led_set_trigger(enum led_trigger trigger, struct led *led);
|
||||||
|
void led_trigger(enum led_trigger trigger, enum trigger_type);
|
||||||
|
#else
|
||||||
|
static inline int led_set_trigger(enum led_trigger trigger, struct led *led)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void led_trigger(enum led_trigger trigger, enum trigger_type type)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int led_get_trigger(enum led_trigger trigger);
|
||||||
|
|
||||||
/* gpio LED support */
|
/* gpio LED support */
|
||||||
struct gpio_led {
|
struct gpio_led {
|
||||||
int gpio;
|
int gpio;
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
|
#include <led.h>
|
||||||
#include <asm/byteorder.h> /* for nton* / ntoh* stuff */
|
#include <asm/byteorder.h> /* for nton* / ntoh* stuff */
|
||||||
|
|
||||||
|
|
||||||
|
@ -417,4 +418,6 @@ static inline unsigned char *net_udp_get_payload(struct net_connection *con)
|
||||||
int net_udp_send(struct net_connection *con, int len);
|
int net_udp_send(struct net_connection *con, int len);
|
||||||
int net_icmp_send(struct net_connection *con, int len);
|
int net_icmp_send(struct net_connection *con, int len);
|
||||||
|
|
||||||
|
void led_trigger_network(enum led_trigger trigger);
|
||||||
|
|
||||||
#endif /* __NET_H__ */
|
#endif /* __NET_H__ */
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <led.h>
|
||||||
#include <reloc.h>
|
#include <reloc.h>
|
||||||
|
|
||||||
unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base)
|
unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base)
|
||||||
|
@ -625,6 +626,9 @@ void __noreturn panic(const char *fmt, ...)
|
||||||
vprintf(fmt, args);
|
vprintf(fmt, args);
|
||||||
putchar('\n');
|
putchar('\n');
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
|
led_trigger(LED_TRIGGER_PANIC, TRIGGER_ENABLE);
|
||||||
|
|
||||||
#if defined (CONFIG_PANIC_HANG)
|
#if defined (CONFIG_PANIC_HANG)
|
||||||
hang();
|
hang();
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -77,6 +77,8 @@ int eth_send(void *packet, int length)
|
||||||
eth_current->active = 1;
|
eth_current->active = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
led_trigger_network(LED_TRIGGER_NET_TX);
|
||||||
|
|
||||||
return eth_current->send(eth_current, packet, length);
|
return eth_current->send(eth_current, packet, length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,4 +185,8 @@ void eth_unregister(struct eth_device *edev)
|
||||||
list_del(&edev->list);
|
list_del(&edev->list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void led_trigger_network(enum led_trigger trigger)
|
||||||
|
{
|
||||||
|
led_trigger(trigger, TRIGGER_FLASH);
|
||||||
|
led_trigger(LED_TRIGGER_NET_TXRX, TRIGGER_FLASH);
|
||||||
|
}
|
||||||
|
|
20
net/net.c
20
net/net.c
|
@ -628,19 +628,29 @@ int net_receive(unsigned char *pkt, int len)
|
||||||
{
|
{
|
||||||
struct ethernet *et = (struct ethernet *)pkt;
|
struct ethernet *et = (struct ethernet *)pkt;
|
||||||
int et_protlen = ntohs(et->et_protlen);
|
int et_protlen = ntohs(et->et_protlen);
|
||||||
|
int ret;
|
||||||
|
|
||||||
if (len < ETHER_HDR_SIZE)
|
led_trigger_network(LED_TRIGGER_NET_RX);
|
||||||
return 0;
|
|
||||||
|
if (len < ETHER_HDR_SIZE) {
|
||||||
|
ret = 0;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
switch (et_protlen) {
|
switch (et_protlen) {
|
||||||
case PROT_ARP:
|
case PROT_ARP:
|
||||||
return net_handle_arp(pkt, len);
|
ret = net_handle_arp(pkt, len);
|
||||||
|
break;
|
||||||
case PROT_IP:
|
case PROT_IP:
|
||||||
return net_handle_ip(pkt, len);
|
ret = net_handle_ip(pkt, len);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
debug("%s: got unknown protocol type: %d\n", __func__, et_protlen);
|
debug("%s: got unknown protocol type: %d\n", __func__, et_protlen);
|
||||||
return 1;
|
ret = 1;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
out:
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int net_init(void)
|
static int net_init(void)
|
||||||
|
|
Loading…
Reference in New Issue