1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

All files, which used by chronos board were edited according to new texas instruments headers, all warnings fixed

This commit is contained in:
mikoff 2013-03-30 21:44:16 +01:00
parent 349bec1f0f
commit 4f638eb887
14 changed files with 38 additions and 21 deletions

View File

@ -20,7 +20,7 @@ PROJBINDIR =$(CURDIR)/bin
## make script for your project. Build RIOT-base here!
all: $(PROJBINDIR)/$(PROJECT).a
@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(CPU)."
@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(MCU)."
$(MAKE) -C $(RIOTBOARD)
$(MAKE) -C $(RIOTBASE)
@$(LINK) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map $(LINKFLAGS)

View File

@ -7,7 +7,7 @@ ifeq ($(CPU),lpc214x)
endif
ifeq ($(CPU),cc430)
DIRS = msp430 cc430
DIRS = msp430-common cc430
endif
ifeq ($(CPU),msp430x16x)

View File

@ -1,6 +1,7 @@
MODULE =cpu
INCLUDES = -Iinclude -Idrivers/include -I../arm_common/include -I../../sys/lib -I../../sys/drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../..
INCLUDES += -Iinclude -Idrivers/include -I../arm_common/include -I../../sys/lib -I../../sys/drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../..
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
DIRS =
all: $(BINDIR)$(MODULE).a

View File

@ -36,7 +36,7 @@
* ************************************************************************************************/
#include <signal.h>
#include <legacymsp430.h>
#include <cpu.h>
#include <cc430-adc.h>
#include <hwtimer.h>

View File

@ -25,13 +25,13 @@ and the mailinglist (subscription via web site)
*******************************************************************************/
#include <stdlib.h>
#include <signal.h>
#include <legacymsp430.h>
#include <gpioint.h>
#include <bitarithm.h>
#include <cpu.h>
#include <irq.h>
#include <hwtimer.h>
#include <cc430x613x.h>
#include <cc430f6137.h>
/** min and max portnumber to generate interrupts */
#define PORTINT_MIN (1)
@ -222,9 +222,10 @@ interrupt (PORT2_VECTOR) __attribute__ ((naked)) port2_isr(void) {
cb[1][ifg_num]();
}
}
else {
cb[1][ifg_num]();
}
//else {
// cb[1][ifg_num]();
//}
P2IFG = 0x00;
P2IE = int_enable;

View File

@ -29,10 +29,10 @@ and the mailinglist (subscription via web site)
*/
#include <string.h>
#include <signal.h>
#include <legacymsp430.h>
#include <irq.h>
#include <cpu.h>
#include <cc430x613x.h>
#include <cc430f6137.h>
#include <cc430-rtc.h>
//static volatile time_t epoch;

View File

@ -1,4 +1,4 @@
#include <signal.h>
#include <legacymsp430.h>
#include <board.h>
#include <hwtimer.h>
#include <hwtimer_arch.h>
@ -12,7 +12,7 @@ static uint32_t ticks = 0;
extern void (*int_handler)(int);
extern void TA0_unset(short timer);
void timerA_init()
void timerA_init(void)
{
ticks = 0; // Set tick counter value to 0
TA0CTL = TASSEL_1 + TACLR; // Clear the timer counter, set ACLK

View File

@ -1,6 +1,6 @@
MODULE =cpu
INCLUDES = -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/include
INCLUDES += -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/include
DIRS =
all: $(BINDIR)$(MODULE).a

View File

@ -23,8 +23,11 @@ For further information and questions please use the web site
and the mailinglist (subscription via web site)
scatterweb@lists.spline.inf.fu-berlin.de
*******************************************************************************/
#include <msp430x16x.h>
#ifdef CC430
#include <cc430f6137.h>
#else
#include <msp430x16x.h>
#endif
#include "cpu.h"
#include "kernel.h"
#include "kernel_intern.h"

View File

@ -1,6 +1,6 @@
#include <stddef.h>
#include <stdint.h>
#include <msp430x16x.h>
#include <msp430x16x.h>
#include <irq.h>
uint8_t ie1, ie2;

View File

@ -39,7 +39,7 @@ and the mailinglist (subscription via web site)
#include <sched.h>
#include <stdio.h>
#include <signal.h>
#include <legacymsp430.h>
#include <cpu-conf.h>
#define WORDSIZE 16

View File

@ -27,7 +27,11 @@ and the mailinglist (subscription via web site)
#ifndef __HWTIMER_CPU_H
#define __HWTIMER_CPU_H
#include <msp430x16x.h>
#ifdef CC430
#include <cc430f6137.h>
#else
#include <msp430x16x.h>
#endif
#include <stdint.h>
#ifdef __MSP430_HAS_TA2__

View File

@ -1,5 +1,9 @@
#include <irq.h>
#include <msp430x16x.h>
#ifdef CC430
#include <cc430f6137.h>
#else
#include <msp430x16x.h>
#endif
#include <cpu.h>
unsigned int disableIRQ() {

View File

@ -34,7 +34,11 @@
*/
#include "cpu.h"
#include <msp430x16x.h>
#ifdef CC430
#include <cc430f6137.h>
#else
#include <msp430x16x.h>
#endif
#include "msp430.h"