From 9396b6da6e0059bb1fd8c8f64e25883d16e0fd93 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Wed, 22 Nov 2017 23:14:43 +0000
Subject: [PATCH] Implement master interrupt manipulation (MSP430)

---
 arch/cpu/msp430/Makefile.msp430 |  2 +-
 arch/cpu/msp430/int-master.c    | 67 +++++++++++++++++++++++++++++++++
 arch/cpu/msp430/msp430-def.h    |  3 ++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 arch/cpu/msp430/int-master.c

diff --git a/arch/cpu/msp430/Makefile.msp430 b/arch/cpu/msp430/Makefile.msp430
index 82af8d420..f7267b694 100644
--- a/arch/cpu/msp430/Makefile.msp430
+++ b/arch/cpu/msp430/Makefile.msp430
@@ -37,7 +37,7 @@ endif
 CONTIKI_CPU_DIRS = $(CONTIKI_CPU_FAM_DIR) . dev
 
 MSP430     = msp430.c flash.c clock.c leds.c leds-arch.c \
-             watchdog.c lpm.c rtimer-arch.c
+             watchdog.c lpm.c rtimer-arch.c int-master.c
 UIPDRIVERS = slip.c crc16.c
 
 CONTIKI_TARGET_SOURCEFILES += $(MSP430) \
diff --git a/arch/cpu/msp430/int-master.c b/arch/cpu/msp430/int-master.c
new file mode 100644
index 000000000..5e50a563c
--- /dev/null
+++ b/arch/cpu/msp430/int-master.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017, George Oikonomou - http://www.spd.gr
+ * 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 copyright holder 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \file
+ * Master interrupt manipulation implementation for the MSP430
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "sys/int-master.h"
+
+#include <stdbool.h>
+/*---------------------------------------------------------------------------*/
+void
+int_master_enable(void)
+{
+  eint();
+}
+/*---------------------------------------------------------------------------*/
+int_master_status_t
+int_master_read_and_disable(void)
+{
+  __istate_t status = __get_interrupt_state();
+  dint();
+  return status;
+}
+/*---------------------------------------------------------------------------*/
+void
+int_master_status_set(int_master_status_t status)
+{
+  __set_interrupt_state(status);
+}
+/*---------------------------------------------------------------------------*/
+bool
+int_master_is_enabled(void)
+{
+  return __get_interrupt_state() & GIE ? true : false;
+}
+/*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/msp430/msp430-def.h b/arch/cpu/msp430/msp430-def.h
index 1d11b07c1..881c761e2 100644
--- a/arch/cpu/msp430/msp430-def.h
+++ b/arch/cpu/msp430/msp430-def.h
@@ -56,6 +56,9 @@
 
 #endif /* __IAR_SYSTEMS_ICC__ */
 
+/* Master interrupt state representation data type */
+#define INT_MASTER_CONF_STATUS_DATATYPE __istate_t
+
 #ifndef BV
 #define BV(x) (1 << x)
 #endif