Updated SPI config for faster SPI, split msp430/clock/spi into separate versions for MSP430/MSP430X

2011-09-23 15:01:13 +02:00 · 2011-09-23 15:01:13 +02:00 · f4f84ffca4
commit f4f84ffca4
parent 09082f02fe
14 changed files with 677 additions and 237 deletions
--- a/cpu/msp430/f1xxx/rtimer-arch.c
+++ b/cpu/msp430/f1xxx/rtimer-arch.c
@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * 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. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * $Id: rtimer-arch.c,v 1.17 2010/11/27 15:27:20 nifi Exp $
+ */
+
+/**
+ * \file
+ *         MSP430-specific rtimer code
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ */
+
+#include "contiki.h"
+
+#include "sys/energest.h"
+#include "sys/rtimer.h"
+#include "sys/process.h"
+#include "dev/watchdog.h"
+
+#define DEBUG 0
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+/*---------------------------------------------------------------------------*/
+#ifdef __IAR_SYSTEMS_ICC__
+#pragma vector=TIMERA0_VECTOR
+__interrupt void
+#else
+interrupt(TIMERA0_VECTOR)
+#endif
+timera0 (void)
+{
+  ENERGEST_ON(ENERGEST_TYPE_IRQ);
+
+  watchdog_start();
+
+  rtimer_run_next();
+
+  if(process_nevents() > 0) {
+    LPM4_EXIT;
+  }
+
+  watchdog_stop();
+
+  ENERGEST_OFF(ENERGEST_TYPE_IRQ);
+}
+/*---------------------------------------------------------------------------*/
+void
+rtimer_arch_init(void)
+{
+  dint();
+
+  /* CCR0 interrupt enabled, interrupt occurs when timer equals CCR0. */
+  TACCTL0 = CCIE;
+
+  /* Enable interrupts. */
+  eint();
+}
+/*---------------------------------------------------------------------------*/
+rtimer_clock_t
+rtimer_arch_now(void)
+{
+  rtimer_clock_t t1, t2;
+  do {
+    t1 = TAR;
+    t2 = TAR;
+  } while(t1 != t2);
+  return t1;
+}
+/*---------------------------------------------------------------------------*/
+void
+rtimer_arch_schedule(rtimer_clock_t t)
+{
+  PRINTF("rtimer_arch_schedule time %u\n", t);
+
+  TACCR0 = t;
+}
+/*---------------------------------------------------------------------------*/