Skip to content

Commit

Permalink
cc253x: Renamed P2 interrupt-related files for better consistency
Browse files Browse the repository at this point in the history
See Pull Request contiki-os#18
  • Loading branch information
g-oikonomou committed Nov 1, 2012
1 parent c60f0b4 commit c1d7247
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cpu/cc253x/Makefile.cc253x
Original file line number Diff line number Diff line change
@@ -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 port2.c
CONTIKI_SOURCEFILES += port2-intr.c port2.c
CONTIKI_ASMFILES +=

include $(CONTIKI_CPU)/usb/Makefile.usb
2 changes: 1 addition & 1 deletion cpu/cc253x/dev/p2-intr.c → cpu/cc253x/dev/port2-intr.c
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "cc253x.h"
#include "p2-intr.h"
#include "port2.h"

extern struct cc253x_p2_handler *handlers;

2 changes: 1 addition & 1 deletion cpu/cc253x/dev/port2.c
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "cc253x.h"
#include "p2-intr.h"
#include "port2.h"

struct cc253x_p2_handler *handlers = NULL;

File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/cc253x/usb/usb-arch.c
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include "contiki.h"
#include "usb-arch.h"
#include "p2-intr.h"
#include "port2.h"

#include "cc253x.h"
#include "sfr-bits.h"
2 changes: 1 addition & 1 deletion platform/cc2530dk/contiki-main.c
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
#include "dev/cc2530-rf.h"
#include "dev/watchdog.h"
#include "dev/clock-isr.h"
#include "dev/p2-intr.h"
#include "dev/port2.h"
#include "dev/lpm.h"
#include "dev/button-sensor.h"
#include "dev/adc-sensor.h"

0 comments on commit c1d7247

Please sign in to comment.