cc253x: Add p2 interrupt handler

The P2 Interrupt is shared across many periferal (I2C, USB, GPIO).
This adds a generic interrupt handler on which the differents drivers
can register a handler.

See Pull Request #18
This commit is contained in:
Philippe Rétornaz 2012-08-07 13:34:18 +02:00 committed by George Oikonomou
parent dec34c21ef
commit ddc8120d7c
4 changed files with 152 additions and 0 deletions

View file

@ -106,6 +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_ASMFILES +=
CONTIKI_ASMOBJECTFILES = $(addprefix $(OBJECTDIR)/,$(CONTIKI_ASMFILES:.S=.rel))

95
cpu/cc253x/dev/p2-intr.c Normal file
View file

@ -0,0 +1,95 @@
/*
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"
static struct cc253x_p2_handler *handlers = NULL;
void
cc253x_p2_int(void) __interrupt(P2INT_VECTOR)
{
struct cc253x_p2_handler *h;
uint8_t handled = 0;
for(h = handlers; h != NULL; h = h->next) {
handled |= h->cb();
}
if(handled) {
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);
}

55
cpu/cc253x/dev/p2-intr.h Normal file
View file

@ -0,0 +1,55 @@
/*
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.
*/
#ifndef __CC253x_P2_INTR_H__
#define __CC253x_P2_INTR_H__
#include "contiki.h"
#define CC253x_P2_ACK 0x1
#define CC253x_P2_NACK 0x0
struct cc253x_p2_handler {
struct cc253x_p2_handler *next;
uint8_t (*cb) (void);
};
void cc253x_p2_register_handler(struct cc253x_p2_handler *h);
void cc253x_p2_unregister_handler(struct cc253x_p2_handler *h);
void cc253x_p2_int(void) __interrupt(P2INT_VECTOR);
#define cc253x_p2_irq_disable(flag) do { flag = IEN2 & 0x2; IEN2 &= ~0x2; } while(0)
#define cc253x_p2_irq_enable(flag) do { IEN2 |= flag; } while(0)
#define cc253x_p2_irq_force_enable() cc253x_p2_irq_enable(0x2)
#endif

View file

@ -11,6 +11,7 @@
#include "dev/cc2530-rf.h"
#include "dev/watchdog.h"
#include "dev/clock-isr.h"
#include "dev/p2-intr.h"
#include "dev/lpm.h"
#include "dev/button-sensor.h"
#include "dev/adc-sensor.h"