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

cc253x: P2-related routines are now bankable

Browse source 
We keep the ISR in its own file and move everything else
to a different one, so that we only have to keep the ISR
in HOME

See Pull Request #18
This commit is contained in:
George Oikonomou 2012-08-16 15:11:31 +01:00
parent d9d4fa168d
commit c60f0b4349
3 changed files with 82 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/cc253x/Makefile.cc253x
View file

@ -106,7 +106,7 @@ CONTIKI_SOURCEFILES += uart0.c uart1.c uart-intr.c
CONTIKI_SOURCEFILES += dma.c dma_intr.c
CONTIKI_SOURCEFILES += cc2530-rf.c
CONTIKI_SOURCEFILES += watchdog.c rtimer-arch.c
CONTIKI_SOURCEFILES += p2-intr.c
CONTIKI_SOURCEFILES += p2-intr.c port2.c
CONTIKI_ASMFILES +=
include $(CONTIKI_CPU)/usb/Makefile.usb

48
cpu/cc253x/dev/p2-intr.c
View file

@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "cc253x.h"
#include "p2-intr.h"
static struct cc253x_p2_handler *handlers = NULL;
extern struct cc253x_p2_handler *handlers;
void
port_2_isr(void) __interrupt(P2INT_VECTOR)
@ -47,49 +47,3 @@ port_2_isr(void) __interrupt(P2INT_VECTOR)
P2IF = 0;
}
}
void
cc253x_p2_register_handler(struct cc253x_p2_handler *h)
{
uint8_t flags;
if(!h) {
return;
}
cc253x_p2_irq_disable(flags);
h->next = handlers;
handlers = h;
cc253x_p2_irq_enable(flags);
}
void
cc253x_p2_unregister_handler(struct cc253x_p2_handler *remove)
{
uint8_t flags;
struct cc253x_p2_handler *h = handlers;
// Protect against dumb users
if(!h || !remove) {
return;
}
cc253x_p2_irq_disable(flags);
if(h == remove) {
// First element in the list
handlers = h->next;
} else {
while(h->next) {
if(h->next == remove) {
h->next = h->next->next;
break;
}
h = h->next;
}
}
cc253x_p2_irq_enable(flags);
}

80
cpu/cc253x/dev/port2.c Normal file
View file

@ -0,0 +1,80 @@
/*
Copyright (c) 2012, Philippe Retornaz
Copyright (c) 2012, EPFL STI IMT LSRO1 -- Mobots group
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.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote
products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
*/
#include "cc253x.h"
#include "p2-intr.h"
struct cc253x_p2_handler *handlers = NULL;
void
cc253x_p2_register_handler(struct cc253x_p2_handler *h)
{
uint8_t flags;
if(!h) {
return;
}
cc253x_p2_irq_disable(flags);
h->next = handlers;
handlers = h;
cc253x_p2_irq_enable(flags);
}
void
cc253x_p2_unregister_handler(struct cc253x_p2_handler *remove)
{
uint8_t flags;
struct cc253x_p2_handler *h = handlers;
// Protect against dumb users
if(!h || !remove) {
return;
}
cc253x_p2_irq_disable(flags);
if(h == remove) {
// First element in the list
handlers = h->next;
} else {
while(h->next) {
if(h->next == remove) {
h->next = h->next->next;
break;
}
h = h->next;
}
}
cc253x_p2_irq_enable(flags);
}