deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #77 from g-oikonomou/cc2530-patches

Browse source 
cc2530 patches
This commit is contained in:
Adam Dunkels 2013-01-09 22:39:51 -08:00
parent 326781ef43 a35580d068
commit 99389329d2
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/cc253x/dev/uart-intr.c
View file

@ -15,7 +15,6 @@
#include "dev/uart0.h" #include "dev/uart0.h"
#include "dev/uart1.h" #include "dev/uart1.h"
#include "sys/energest.h" #include "sys/energest.h"
#include "dev/leds.h"
#if UART0_ENABLE #if UART0_ENABLE
static int (* uart0_input_handler)(unsigned char c); static int (* uart0_input_handler)(unsigned char c);
@ -42,7 +41,6 @@ void
uart0_rx_isr(void) __interrupt(URX0_VECTOR) uart0_rx_isr(void) __interrupt(URX0_VECTOR)
{ {
ENERGEST_ON(ENERGEST_TYPE_IRQ); ENERGEST_ON(ENERGEST_TYPE_IRQ);
leds_toggle(LEDS_YELLOW);
URX0IF = 0; URX0IF = 0;
if(uart0_input_handler != NULL) { if(uart0_input_handler != NULL) {
uart0_input_handler(U0DBUF); uart0_input_handler(U0DBUF);

2
examples/cc2530dk/udp-ipv6/server.c
View file

@ -53,7 +53,7 @@ static uint16_t len;
#define SERVER_REPLY 1 #define SERVER_REPLY 1
/* Should we act as RPL root? */ /* Should we act as RPL root? */
#define SERVER_RPL_ROOT 1 #define SERVER_RPL_ROOT 0
#if SERVER_RPL_ROOT #if SERVER_RPL_ROOT
static uip_ipaddr_t ipaddr; static uip_ipaddr_t ipaddr;