diff options
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/Makefile | 1 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/board.c | 6 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/board.h | 2 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/main.c | 5 | ||||
| -rw-r--r-- | ports/MSP430/chcore.h | 2 | ||||
| -rw-r--r-- | ports/MSP430/msp430_serial.c | 113 | ||||
| -rw-r--r-- | ports/MSP430/msp430_serial.h | 49 |
7 files changed, 174 insertions, 4 deletions
diff --git a/demos/MSP430-MSP430x1611-GCC/Makefile b/demos/MSP430-MSP430x1611-GCC/Makefile index 4d2b01bd3..097300911 100644 --- a/demos/MSP430-MSP430x1611-GCC/Makefile +++ b/demos/MSP430-MSP430x1611-GCC/Makefile @@ -67,6 +67,7 @@ include ../../test/test.mk # List ARM-mode C source files here
SRC = ../../ports/MSP430/chcore.c \
+ ../../ports/MSP430/msp430_serial.c \
${KERNSRC} \
${TESTSRC} \
../../src/lib/evtimer.c \
diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c index caef10720..e6ae187da 100644 --- a/demos/MSP430-MSP430x1611-GCC/board.c +++ b/demos/MSP430-MSP430x1611-GCC/board.c @@ -21,6 +21,7 @@ #include <signal.h>
#include "board.h"
+#include "msp430_serial.h"
/*
* Hardware initialization goes here.
@@ -77,6 +78,11 @@ void hwinit(void) { TACTL = TACLR; /* Clean start. */
TACTL = TASSEL_2 | MC_1; /* Src=SMCLK, cmp=TACCR0. */
TACCTL0 = CCIE; /* Interrupt on compare. */
+
+ /*
+ * Other subsystems.
+ */
+ InitSerial();
}
interrupt(TIMERA0_VECTOR) tmr0irq(void) {
diff --git a/demos/MSP430-MSP430x1611-GCC/board.h b/demos/MSP430-MSP430x1611-GCC/board.h index d72da9c2c..f7173f712 100644 --- a/demos/MSP430-MSP430x1611-GCC/board.h +++ b/demos/MSP430-MSP430x1611-GCC/board.h @@ -34,7 +34,7 @@ #define LFXT1CLK 32768
#define XT2CLK 8000000
-#define DCOCLK 1000000
+#define DCOCLK 750000
#define ACLK LFXT1CLK
#if defined(MSP_USE_XT2CLK)
diff --git a/demos/MSP430-MSP430x1611-GCC/main.c b/demos/MSP430-MSP430x1611-GCC/main.c index 72736fc54..19ffacf7f 100644 --- a/demos/MSP430-MSP430x1611-GCC/main.c +++ b/demos/MSP430-MSP430x1611-GCC/main.c @@ -21,6 +21,7 @@ #include <test.h>
#include "board.h"
+#include "msp430_serial.h"
/*
* Red LEDs blinker thread, times are in milliseconds.
@@ -63,8 +64,8 @@ int main(int argc, char **argv) { * sleeping in a loop.
*/
while (TRUE) {
-// if (!(P6IN & P6_I_BUTTON))
-// TestThread(&COM1);
+ if (!(P6IN & P6_I_BUTTON))
+ TestThread(&COM1);
chThdSleep(500);
}
return 0;
diff --git a/ports/MSP430/chcore.h b/ports/MSP430/chcore.h index 0d07204d2..fc689f806 100644 --- a/ports/MSP430/chcore.h +++ b/ports/MSP430/chcore.h @@ -71,7 +71,7 @@ typedef struct { #define IDLE_THREAD_STACK_SIZE 0
-#define INT_REQUIRED_STACK 16
+#define INT_REQUIRED_STACK 32
#define StackAlign(n) ((((n) - 1) | 1) + 1)
#define UserStackSize(n) StackAlign(sizeof(Thread) + \
sizeof(struct intctx) + \
diff --git a/ports/MSP430/msp430_serial.c b/ports/MSP430/msp430_serial.c new file mode 100644 index 000000000..d77632d96 --- /dev/null +++ b/ports/MSP430/msp430_serial.c @@ -0,0 +1,113 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
+
+ This file is part of ChibiOS/RT.
+
+ ChibiOS/RT is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ ChibiOS/RT is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <ch.h>
+#include <signal.h>
+
+#include "board.h"
+#include "msp430_serial.h"
+
+static void SetError(uint8_t urctl, FullDuplexDriver *com) {
+ dflags_t sts = 0;
+
+ if (urctl & OE)
+ sts |= SD_OVERRUN_ERROR;
+ if (urctl & PE)
+ sts |= SD_PARITY_ERROR;
+ if (urctl & FE)
+ sts |= SD_FRAMING_ERROR;
+ if (urctl & BRK)
+ sts |= SD_BREAK_DETECTED;
+ chFDDAddFlagsI(com, sts);
+}
+
+#ifdef USE_MSP430_USART0
+FullDuplexDriver COM1;
+static uint8_t ib1[SERIAL_BUFFERS_SIZE];
+static uint8_t ob1[SERIAL_BUFFERS_SIZE];
+
+interrupt(USART0TX_VECTOR) u0txirq(void) {
+ msg_t b;
+
+ chSysIRQEnterI();
+
+ b = chFDDRequestDataI(&COM1);
+ if (b < Q_OK)
+ U0IE &= ~UTXIE0;
+ else
+ U0TXBUF = b;
+
+ chSysIRQExitI();
+}
+
+interrupt(USART0RX_VECTOR) u0rxirq(void) {
+ uint8_t urctl;
+
+ chSysIRQEnterI();
+
+ if ((urctl = U0RCTL) & RXERR)
+ SetError(urctl, &COM1);
+ chFDDIncomingDataI(&COM1, U0RXBUF);
+
+ chSysIRQExitI();
+}
+
+/*
+ * Invoked by the high driver when one or more bytes are inserted in the
+ * output queue.
+ */
+static void OutNotify1(void) {
+
+ U0IE |= UTXIE0;
+}
+
+/*
+ * USART setup, must be invoked with interrupts disabled.
+ * NOTE: Does not reset I/O queues.
+ */
+void SetUSART0I(uint16_t div, uint8_t mod, uint8_t ctl) {
+
+ U0CTL = SWRST; /* Resets the USART, it should already be */
+ /* USART init */
+ U0TCTL = SSEL0 | SSEL1; /* SMCLK as clock source */
+ U0MCTL = mod; /* Modulator */
+ U0BR1 = (uint8_t)(div >> 8); /* Divider high */
+ U0BR0 = (uint8_t)(div >> 0); /* Divider low */
+ /* Clear USART status */
+ (void)U0RXBUF;
+ U0RCTL = 0;
+ /* USART enable */
+ P3SEL |= BV(4) + BV(5); /* I/O pins for USART */
+ U0ME |= UTXE0 + URXE0; /* Enables the USART */
+ U0CTL = ctl & ~SWRST; /* Various settings, clears reset state */
+ U0IE |= URXIE0; /* Enables RX interrupt */
+}
+#endif /* USE_MSP430_USART0 */
+
+void InitSerial(void) {
+
+ /* I/O queues setup.*/
+#ifdef USE_MSP430_USART0
+ chFDDInit(&COM1, ib1, sizeof ib1, NULL, ob1, sizeof ob1, OutNotify1);
+ SetUSART0I(UBR(38400), 0, CHAR);
+#endif
+
+#ifdef USE_MSP430_USART1
+#endif
+}
diff --git a/ports/MSP430/msp430_serial.h b/ports/MSP430/msp430_serial.h new file mode 100644 index 000000000..4fd9fa009 --- /dev/null +++ b/ports/MSP430/msp430_serial.h @@ -0,0 +1,49 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
+
+ This file is part of ChibiOS/RT.
+
+ ChibiOS/RT is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ ChibiOS/RT is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _MSP430_SERIAL_H_
+#define _MSP430_SERIAL_H_
+
+/*
+ * Configuration parameter, you can change the depth of the queue buffers
+ * depending on the requirements of your application.
+ */
+#define SERIAL_BUFFERS_SIZE 32
+
+#define USE_MSP430_USART0
+//#define USE_MSP430_USART1
+
+/*
+ * Macro for baud rate computation.
+ */
+#define UBR(b) (SMCLK / (b))
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void InitSerial(void);
+ void SetUSART0I(uint16_t div, uint8_t mod, uint8_t ctl);
+ void SetUSART1I(uint16_t div, uint8_t mod, uint8_t ctl);
+#ifdef __cplusplus
+}
+#endif
+
+extern FullDuplexDriver COM1, COM2;
+
+#endif /* _MSP430_SERIAL_H_ */
|