diff --git a/msb-430-common/Makefile.include b/msb-430-common/Makefile.include
index 4adcbb6dd1129e0051ee1eae3c7c25d09eb88b3b..33ce3d11eba8f2bf6c72e5ec0bac39f826856e1c 100644
--- a/msb-430-common/Makefile.include
+++ b/msb-430-common/Makefile.include
@@ -13,12 +13,14 @@ export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(RIOTBASE)/bin/startup.o
+TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
export FLASHER = mspdebug
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = bin/$(PROJECT).hex
-export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
+#export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
+export FFLAGS = -j olimex "prog $(HEXFILE)"
export USEMODULE += msp430_common
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/
diff --git a/msb-430-common/board_init.c b/msb-430-common/board_init.c
index de2e5c01dc1f4eb6fde17be0a08681f1c0360dd0..4999b38d9caafb6d2b200a79d7b68483598bbe45 100644
--- a/msb-430-common/board_init.c
+++ b/msb-430-common/board_init.c
@@ -9,7 +9,7 @@ static volatile uint32_t __msp430_cpu_speed = MSP430_INITIAL_CPU_SPEED;
/*---------------------------------------------------------------------------*/
static uint8_t calc_umctl(uint16_t br)
{
- // from TI slaa049
+ /* from TI slaa049 */
register uint8_t CMOD = 256 * br - 256 * (br + 1) / 2;
register uint8_t c = 0;
register int i = 0;
@@ -17,12 +17,12 @@ static uint8_t calc_umctl(uint16_t br)
a <<= 1;
do {
- if (a & 0x80) { // Overflow to integer?
- a = a - 128 + CMOD; // Yes, subtract 1.000000
+ if (a & 0x80) { /* Overflow to integer? */
+ a = a - 128 + CMOD; /* Yes, subtract 1.000000 */
c |= 0x80;
}
else {
- a += CMOD; // No, add fraction
+ a += CMOD; /* No, add fraction */
}
if (i == 7) {
@@ -37,71 +37,71 @@ static uint8_t calc_umctl(uint16_t br)
static void msb_ports_init(void)
{
- // Port 1: Free port, for energy saving all outputs are set to zero.
- P1SEL = 0x00; // Port1 Zweitfunktion
- P1OUT = 0x00; // Port1 Ausgangsregister: 00000000 = 0x00
- P1DIR = 0xFF; // Port1 Direction: 11111111 = 0xFF
-
- P2SEL = 0x20; // Port2 Zweitfunktion
- P2OUT = 0x00; // Port2 Ausgangsregister: 00000000 = 0x00
- P2DIR = 0x1C; // Port2 Direction: 00011010 = 0x1C
- // 0 - P2.0 [IN ] -
- // 0 - P2.1 [OUT] -
- // 1 - P2.2 [IN ] -
- // 1 - P2.3 [OUT] -
- // 1 - P2.4 [OUT] -
- // 0 - P2.5 [IN ] -
- // 0 - P2.6 [IN ] - SD-KARTE Protect
- // 0 - P2.7 [IN ] - SD-KARTE Detect
-
- P3SEL = 0xC0; // Port3 Zweitfunktion
- P3OUT = 0x09; // Port3 Ausgangsregister: 00001001 = 0x09
- P3DIR = 0x2B; // Port3 Direction
- // 1 - P3.0
- // 1 - P3.1
- // 0 - P3.2
- // 1 - P3.3
- // 0 - P3.4 [IN ] - SHT 11 DATA (OUT/IN)
- // 1 - P3.5 [OUT] - SHT 11 CLK
- // 0 - P3.6 [2-Funktion] - RS232_RxD
- // 0 - P3.7 [2-Funktion] - RS232_TxD
-
- // Port 4: Free port, for energy saving all outputs are set to zero.
- P4SEL = 0x00; // Port4 Zweitfunktion
- P4OUT = 0x00; // Port4 Ausgangsregister: 00000000 = 0x00
- P4DIR = 0xFF; // Port4 Direction: 11111111 = 0xFF
- // 1 - P4.0 [OUT] - unused
- // 1 - P4.1 [OUT] - unused
- // 1 - P4.2 [OUT] - unused
- // 1 - P4.3 [OUT] - unused
- // 1 - P4.4 [OUT] - unused
- // 1 - P4.5 [OUT] - unused
- // 1 - P4.6 [OUT] - unused
- // 1 - P4.7 [OUT] - unused
-
- P5SEL = 0x00; // Port5 Zweitfunktion: 00000000 = 0x00
- P5OUT = 0x80; // Port5 Ausgangsregister: 00001001 = 0x09
- P5DIR = 0xFF; // Port5 Direction: 11111011 = 0xFB
- // 1 - P5.0 [OUT] - SD-KARTE /CS
- // 1 - P5.1 [OUT] - SD-KARTE DI
- // 0 - P5.2 [IN ] - SD-KARTE DO
- // 1 - P5.3 [OUT] - SD-KARTE DCLK
- // 1 - P5.4 [OUT] - MMA GS1
- // 1 - P5.5 [OUT] - MMA GS2
- // 1 - P5.6 [OUT] - MMA /SLEEP
- // 1 - P5.7 [OUT] - LED_ROT 0-an, 1-aus
-
- P6SEL = 0x00; // Port6 Zweitfunktion = 0x07
- P6OUT = 0x00; // Port6 Ausgangsregister: 00000000 = 0x00
- P6DIR = 0xFF; // Port6 Direction: 11111000 = 0xF8
- // 0 - P6.0 [AD-IN] - MMA X-Achse
- // 0 - P6.1 [AD-IN] - MMA Y-Achse
- // 0 - P6.2 [AD-IN] - MMA Z-Achse
- // 1 - P6.3 [OUT] - unused
- // 1 - P6.4 [OUT] - unused
- // 1 - P6.5 [OUT] - unused
- // 1 - P6.6 [OUT] - unused
- // 1 - P6.7 [OUT] - unused
+ /* Port 1: Free port, for energy saving all outputs are set to zero. */
+ P1SEL = 0x00; /* Port1 I/O Function */
+ P1OUT = 0x00; /* Port1 Ausgangsregister: 00000000 = 0x00 */
+ P1DIR = 0xFF; /* Port1 Direction: 11111111 = 0xFF */
+
+ P2SEL = 0x20; /* Port2 I/O Function */
+ P2OUT = 0x00; /* Port2 Output register: 00000000 = 0x00 */
+ P2DIR = 0x1C; /* Port2 Direction: 00011010 = 0x1C */
+ /* 0 - P2.0 [IN ] - */
+ /* 0 - P2.1 [OUT] - */
+ /* 1 - P2.2 [IN ] - */
+ /* 1 - P2.3 [OUT] - */
+ /* 1 - P2.4 [OUT] - */
+ /* 0 - P2.5 [IN ] - */
+ /* 0 - P2.6 [IN ] - SDC Protect */
+ /* 0 - P2.7 [IN ] - SDC Detect */
+
+ P3SEL = 0xC0; /* Port3 Pins 6 & 7 for USART */
+ P3OUT = 0x49; /* Port3 Output register: 01001001: 0x49 */
+ P3DIR = 0xAB; /* Port3 Direction: 10101011: 0xAB */
+ /* 1 - P3.0 */
+ /* 1 - P3.1 */
+ /* 0 - P3.2 */
+ /* 1 - P3.3 */
+ /* 0 - P3.4 [IN ] - SHT 11 DATA (OUT/IN) */
+ /* 1 - P3.5 [OUT] - SHT 11 CLK */
+ /* 0 - P3.6 [2-Funktion] - RS232_RxD */
+ /* 1 - P3.7 [2-Funktion] - RS232_TxD */
+
+ /* Port 4: Free port, for energy saving all outputs are set to zero. */
+ P4SEL = 0x00; /* Port4 I/O Function */
+ P4OUT = 0x00; /* Port4 Output register: 00000000 = 0x00 */
+ P4DIR = 0xFF; /* Port4 Direction: 11111111 = 0xFF */
+ /* 1 - P4.0 [OUT] - unused */
+ /* 1 - P4.1 [OUT] - unused */
+ /* 1 - P4.2 [OUT] - unused */
+ /* 1 - P4.3 [OUT] - unused */
+ /* 1 - P4.4 [OUT] - unused */
+ /* 1 - P4.5 [OUT] - unused */
+ /* 1 - P4.6 [OUT] - unused */
+ /* 1 - P4.7 [OUT] - unused */
+
+ P5SEL = 0x00; /* Port5 I/O Function: 00000000 = 0x00 */
+ P5OUT = 0x80; /* Port5 Output register: 00001001 = 0x09 */
+ P5DIR = 0xFF; /* Port5 Direction: 11111011 = 0xFB */
+ /* 1 - P5.0 [OUT] - SDC /CS */
+ /* 1 - P5.1 [OUT] - SDC DI */
+ /* 0 - P5.2 [IN ] - SDC DO */
+ /* 1 - P5.3 [OUT] - SDC DCLK */
+ /* 1 - P5.4 [OUT] - MMA GS1 */
+ /* 1 - P5.5 [OUT] - MMA GS2 */
+ /* 1 - P5.6 [OUT] - MMA /SLEEP */
+ /* 1 - P5.7 [OUT] - LED_RED 0-on, 1-off */
+
+ P6SEL = 0x00; /* Port6 I/O Function = 0x07 */
+ P6OUT = 0x00; /* Port6 Output register: 00000000 = 0x00 */
+ P6DIR = 0xFF; /* Port6 Direction: 11111000 = 0xF8 */
+ /* 0 - P6.0 [AD-IN] - MMA X-Axis */
+ /* 0 - P6.1 [AD-IN] - MMA Y-Axis */
+ /* 0 - P6.2 [AD-IN] - MMA Z-Axis */
+ /* 1 - P6.3 [OUT] - unused */
+ /* 1 - P6.4 [OUT] - unused */
+ /* 1 - P6.5 [OUT] - unused */
+ /* 1 - P6.6 [OUT] - unused */
+ /* 1 - P6.7 [OUT] - unused */
}
void msp430_set_cpu_speed(uint32_t speed)
@@ -110,16 +110,19 @@ void msp430_set_cpu_speed(uint32_t speed)
__msp430_cpu_speed = speed;
msp430_init_dco();
uint16_t br;
- UCTL1 = SWRST | CHAR; // 8-bit character
- UTCTL1 |= SSEL1 | URXSE; // UCLK = MCLK
- // activate
- U1ME |= UTXE1 | URXE1; // Enable USART1 TXD/RXD
+ UCTL1 = SWRST | CHAR; /* 8-bit character */
+ UTCTL1 |= SSEL1 | URXSE; /* UCLK = MCLK */
+ /* activate */
+ U1ME |= UTXE1 | URXE1; /* Enable USART1 TXD/RXD */
br = (uint16_t)(__msp430_cpu_speed / 115200uL);
- UBR01 = br; // set baudrate
+ UBR01 = br; /* set baudrate */
UBR11 = br >> 8;
- UMCTL1 = calc_umctl(br); // set modulation
+ UMCTL1 = calc_umctl(br); /* set modulation */
+ ME2 |= (UTXE1 | URXE1);
UCTL1 &= ~SWRST;
+
+ IE2 |= URXIE1;
//clock_init();
eint();
}
@@ -132,22 +135,22 @@ msp430_init_dco()
/*------------------ use external oszillator -----------------------*/
uint16_t i;
- // Stop watchdog
+ /* Stop watchdog */
WDTCTL = WDTPW + WDTHOLD;
//Init crystal for mclk
//XT2 = HF XTAL
BCSCTL1 = RSEL2;
- // Wait for xtal to stabilize
+ /* Wait for xtal to stabilize */
do {
- IFG1 &= ~OFIFG; // Clear oscillator fault flag
+ IFG1 &= ~OFIFG; /* Clear oscillator fault flag */
- for (i = 0xFF; i > 0; i--); // Time for flag to set
+ for (i = 0xFF; i > 0; i--); /* Time for flag to set */
}
- while ((IFG1 & OFIFG) != 0); // Oscillator fault flag still set?
+ while ((IFG1 & OFIFG) != 0); /* Oscillator fault flag still set? */
- BCSCTL2 = SELM_2 + SELS; // MCLK und SMCLK = XT2 (safe)
+ BCSCTL2 = SELM_2 + SELS; /* MCLK und SMCLK = XT2 (safe) */
#else
/* Thdeltais code taken from the FU Berlin sources and reformatted. */
int delta = __msp430_cpu_speed >> 12;
@@ -160,7 +163,7 @@ msp430_init_dco()
BCSCTL1 = 0xa4; /* ACLK is devided by 4. RSEL=6 no division for MCLK
and SSMCLK. XT2 is off. */
- // Init FLL to desired frequency using the 32762Hz crystal
+ /* Init FLL to desired frequency using the 32762Hz crystal */
#if MSP430_HAS_DCOR
BCSCTL2 = 0x01;
#else
@@ -172,8 +175,8 @@ msp430_init_dco()
for (i = 0xffff; i > 0; i--); /* Delay for XTAL to settle */
- CCTL2 = CCIS0 + CM0 + CAP; // Define CCR2, CAP, ACLK
- TACTL = TASSEL1 + TACLR + MC1; // SMCLK, continous mode
+ CCTL2 = CCIS0 + CM0 + CAP; /* Define CCR2, CAP, ACLK */
+ TACTL = TASSEL1 + TACLR + MC1; /* SMCLK, continous mode */
while (1) {
diff --git a/msb-430-common/uart1.c b/msb-430-common/uart1.c
index 2b22b3171b2ca7f7efd5afbff0d1af316c9dab3d..025d09dc6e7ab61521adfe8b3d9bdb27967d992a 100644
--- a/msb-430-common/uart1.c
+++ b/msb-430-common/uart1.c
@@ -1,9 +1,12 @@
#include "board.h"
-#define UART1_TX TXBUF1
+#define UART1_TX TXBUF1
#define UART1_WAIT_TXDONE() while( (UTCTL1 & TXEPT) == 0 ) { _NOP(); }
#include <stdio.h>
+#include <kernel.h>
+
+#include <board_uart0.h>
int putchar(int c)
{
@@ -11,11 +14,44 @@ int putchar(int c)
UART1_WAIT_TXDONE();
if (c == 10) {
- UART1_TX = 13;
UART1_WAIT_TXDONE();
}
return c;
}
+void usart0irq(void);
+/**
+ * \brief the interrupt function
+ */
+interrupt(USART1RX_VECTOR) usart0irq(void)
+{
+ U1TCTL &= ~URXSE; /* Clear the URXS signal */
+ U1TCTL |= URXSE; /* Re-enable URXS - needed here?*/
+ int c = 0;
+ /* Check status register for receive errors. */
+ if(U1RCTL & RXERR) {
+ if (U1RCTL & FE) {
+ puts("rx framing error");
+ }
+ if (U1RCTL & OE) {
+ puts("rx overrun error");
+ }
+ if (U1RCTL & PE) {
+ puts("rx parity error");
+ }
+ if (U1RCTL & BRK) {
+ puts("rx break error");
+ }
+ /* Clear error flags by forcing a dummy read. */
+ c = U1RXBUF;
+ }
+#ifdef MODULE_UART0
+ else if (uart0_handler_pid) {
+ c = U1RXBUF;
+ uart0_handle_incoming(c);
+ uart0_notify_thread();
+ }
+#endif
+}
diff --git a/msb-430h/Makefile.include b/msb-430h/Makefile.include
index c5716486ebb6b4f4e954ea3dc38c1c8f12b37026..166060e36fee949587776c7c0889157ca12dc68c 100644
--- a/msb-430h/Makefile.include
+++ b/msb-430h/Makefile.include
@@ -1,3 +1,4 @@
+export INCLUDES += -I$(RIOTBOARD)/msb-430h/include -I$(RIOTBOARD)/msb-430-common/include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/msb-430h/driver_cc110x.c b/msb-430h/driver_cc110x.c
index deb6835fd29c96a37ea49e20af1e7c3fac959c46..857bfcf1d424acb211ef63268c98723fd7488bc6 100644
--- a/msb-430h/driver_cc110x.c
+++ b/msb-430h/driver_cc110x.c
@@ -337,8 +337,6 @@ void cc110x_spi_init(uint8_t clockrate)
interrupt(PORT2_VECTOR) __attribute__((naked)) cc110x_isr(void)
{
__enter_isr();
- puts("cc110x_isr()");
-
// if (system_state.POWERDOWN) SPI_INIT; /* Initialize SPI after wakeup */
/* Check IFG */
if ((P2IFG & 0x01) != 0) {
diff --git a/msba2-common/Makefile.include b/msba2-common/Makefile.include
index 082a2e57f1d9646e547e5c2de28acd2a8d6a5ad5..c2832ca47d10a8265a073add4e6b3a0b55405a1d 100644
--- a/msba2-common/Makefile.include
+++ b/msba2-common/Makefile.include
@@ -13,7 +13,7 @@ export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
FLASHER = lpc2k_pgm
-TERM = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
+TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x
ifeq ($(strip $(PORT)),)
diff --git a/msba2/Makefile b/msba2/Makefile
index a5393274760a4572d9adeb690c5c88c7adc981ea..0aff0df0b14cb786c255ac89d8461d5718813bf2 100644
--- a/msba2/Makefile
+++ b/msba2/Makefile
@@ -5,6 +5,7 @@ export ARCH = msba2_base.a
DEP = $(SRC:%.c=$(BINDIR)%.d)
+INCLUDES += -I$(RIOTBOARD)/msba2/include/
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/