From 6239ea2a0bb6df3ecd4f09694682645569c415c5 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Fri, 9 Aug 2013 15:57:34 +0200
Subject: [PATCH] minor changes according to
7a2cc4ae096a90308c026dd857e19b4489b162cf
---
Makefile.include | 2 +-
cpu/msp430-common/include/cpu-conf.h | 2 +-
cpu/msp430-common/include/msp430.h | 105 ---------------------------
cpu/msp430-common/msp430-main.c | 1 -
4 files changed, 2 insertions(+), 108 deletions(-)
delete mode 100644 cpu/msp430-common/include/msp430.h
diff --git a/Makefile.include b/Makefile.include
index 011aae4972..5b16ee6652 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -88,7 +88,7 @@ flash: all
$(FLASHER) $(FFLAGS)
term:
- $(TERM) $(PORT)
+ $(TERMPROG) $(PORT)
doc:
make -BC $(RIOTBASE) doc
diff --git a/cpu/msp430-common/include/cpu-conf.h b/cpu/msp430-common/include/cpu-conf.h
index 57999236ea..888543bdc1 100644
--- a/cpu/msp430-common/include/cpu-conf.h
+++ b/cpu/msp430-common/include/cpu-conf.h
@@ -20,7 +20,7 @@ License. See the file LICENSE in the top level directory for more details.
#define KERNEL_CONF_STACKSIZE_PRINTF (512)
#ifndef KERNEL_CONF_STACKSIZE_DEFAULT
-#define KERNEL_CONF_STACKSIZE_DEFAULT (KERNEL_CONF_STACKSIZE_PRINTF + 512)
+#define KERNEL_CONF_STACKSIZE_DEFAULT (KERNEL_CONF_STACKSIZE_PRINTF)
#endif
#define KERNEL_CONF_STACKSIZE_IDLE 64
diff --git a/cpu/msp430-common/include/msp430.h b/cpu/msp430-common/include/msp430.h
deleted file mode 100644
index 1647bdd4f0..0000000000
--- a/cpu/msp430-common/include/msp430.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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$
- */
-
-#ifndef __MSP430_H__
-#define __MSP430_H__
-
-/**
- * @ingroup msp430
- * @{
- */
-
-/**
- * \file
- * MSP430 definitions
- * \author
- * Adam Dunkels <adam@sics.se>
- * Modified by Kaspar Schleiser
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "board.h"
-
-#ifndef MSP430_INITIAL_CPU_SPEED
-#define MSP430_INITIAL_CPU_SPEED 2457600uL
-#warning MSP430_INITIAL_CPU_SPEED undefined. MSP430 initial dco speed set to 2.457600 MHz.
-#endif
-
-#ifndef MSP430_HAS_DCOR
-#define MSP430_HAS_DCOR 0
-#endif
-
-#ifndef MSP430_HAS_EXTERNAL_CRYSTAL
-#define MSP430_HAS_EXTERNAL_CRYSTAL 0
-#endif
-
-#define HAVE_STDINT_H
-
-#define CC_CONF_REGISTER_ARGS 1
-#define CC_CONF_FUNCTION_POINTER_ARGS 1
-#define CC_CONF_INLINE inline
-#define CC_CONF_VA_ARGS 1
-//#define CC_CONF_USED // is ignored my mspgcc
-#define CC_CONF_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
-#define CC_CONF_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-
-#if (MSP430_INITIAL_CPU_SPEED > 5000000) && (MSP430_HAS_DCOR != 1) || (MSP430_INITIAL_CPU_SPEED > 10000000) && (MSP430_HAS_DCOR == 1)
-#warning MSP430_INITIAL_CPU_SPEED too high
-#endif
-
-extern volatile uint32_t cpu_speed;
-#define RTIMER_ARCH_SECOND (32767 / 4) ///< frequency of the rtimer
-#define CLOCK_CONF_SECOND (32767 / 8) ///< frequency of the software timers
-
-void msp430_set_cpu_speed(uint32_t speed);
-
-void msp430_cpu_init(void); /* Rename to cpu_init() later!*/
-#define cpu_init() msp430_cpu_init()
-
-void msp430_init_dco(void);
-
-void *sbrk(int);
-
-typedef int spl_t;
-void splx_(spl_t);
-spl_t splhigh_(void);
-
-#define splhigh() splhigh_()
-#define splx(sr) __asm__ __volatile__("bis %0, r2" : : "r" (sr))
-
-void msp430_set_cpu_speed(uint32_t speed);
-void msp430_cpu_init(void);
-
-/** @} */
-#endif /* __MSP430_H__ */
diff --git a/cpu/msp430-common/msp430-main.c b/cpu/msp430-common/msp430-main.c
index ba65b0c992..6eef94a1c6 100644
--- a/cpu/msp430-common/msp430-main.c
+++ b/cpu/msp430-common/msp430-main.c
@@ -39,7 +39,6 @@
#else
#include <msp430x16x.h>
#endif
-#include "msp430.h"
/*---------------------------------------------------------------------------*/
--
GitLab