From 672284080b34b89789c173186e80c0e0f20a2dfa Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Thu, 20 Aug 2015 20:39:08 -0700
Subject: [PATCH] Extract M4 IPC IRQ code into separate file.

---
 firmware/baseband/Makefile       |  1 +
 firmware/baseband/irq_ipc_m4.cpp | 54 ++++++++++++++++++++++++++++++++
 firmware/baseband/irq_ipc_m4.hpp | 28 +++++++++++++++++
 firmware/baseband/main.cpp       | 26 ++-------------
 4 files changed, 85 insertions(+), 24 deletions(-)
 create mode 100644 firmware/baseband/irq_ipc_m4.cpp
 create mode 100644 firmware/baseband/irq_ipc_m4.hpp

diff --git a/firmware/baseband/Makefile b/firmware/baseband/Makefile
index f28181307..91add4fb5 100755
--- a/firmware/baseband/Makefile
+++ b/firmware/baseband/Makefile
@@ -125,6 +125,7 @@ CSRC = $(PORTSRC) \
 CPPSRC = main.cpp \
          message_queue.cpp \
          event_m4.cpp \
+         irq_ipc_m4.cpp \
          gpdma.cpp \
          baseband_dma.cpp \
          portapack_shared_memory.cpp \
diff --git a/firmware/baseband/irq_ipc_m4.cpp b/firmware/baseband/irq_ipc_m4.cpp
new file mode 100644
index 000000000..07a753352
--- /dev/null
+++ b/firmware/baseband/irq_ipc_m4.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ *
+ * This file is part of PortaPack.
+ *
+ * This program 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 2, or (at your option)
+ * any later version.
+ *
+ * This program 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; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "irq_ipc_m4.hpp"
+
+#include "ch.h"
+#include "hal.h"
+
+#include "event_m4.hpp"
+
+#include "lpc43xx_cpp.hpp"
+using namespace lpc43xx;
+
+void m0apptxevent_interrupt_enable() {
+	nvicEnableVector(M0CORE_IRQn, CORTEX_PRIORITY_MASK(LPC43XX_M0APPTXEVENT_IRQ_PRIORITY));
+}
+
+void m0apptxevent_interrupt_disable() {
+	nvicDisableVector(M0CORE_IRQn);
+}
+
+extern "C" {
+
+CH_IRQ_HANDLER(MAPP_IRQHandler) {
+	CH_IRQ_PROLOGUE();
+
+	chSysLockFromIsr();
+	events_flag_isr(EVT_MASK_BASEBAND);
+	chSysUnlockFromIsr();
+
+	creg::m0apptxevent::clear();
+
+	CH_IRQ_EPILOGUE();
+}
+
+}
diff --git a/firmware/baseband/irq_ipc_m4.hpp b/firmware/baseband/irq_ipc_m4.hpp
new file mode 100644
index 000000000..61328685d
--- /dev/null
+++ b/firmware/baseband/irq_ipc_m4.hpp
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ *
+ * This file is part of PortaPack.
+ *
+ * This program 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 2, or (at your option)
+ * any later version.
+ *
+ * This program 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; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __IRQ_IPC_M4_H__
+#define __IRQ_IPC_M4_H__
+
+void m0apptxevent_interrupt_enable();
+void m0apptxevent_interrupt_disable();
+
+#endif/*__IRQ_IPC_M4_H__*/
diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index 72a13e0bf..a496f1d66 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -33,6 +33,8 @@
 
 #include "event_m4.hpp"
 
+#include "irq_ipc_m4.hpp"
+
 #include "rssi.hpp"
 #include "rssi_dma.hpp"
 
@@ -772,30 +774,6 @@ private:
 	}
 };
 
-static void m0apptxevent_interrupt_enable() {
-	nvicEnableVector(M0CORE_IRQn, CORTEX_PRIORITY_MASK(LPC43XX_M0APPTXEVENT_IRQ_PRIORITY));
-}
-
-static void m0apptxevent_interrupt_disable() {
-	nvicDisableVector(M0CORE_IRQn);
-}
-
-extern "C" {
-
-CH_IRQ_HANDLER(MAPP_IRQHandler) {
-	CH_IRQ_PROLOGUE();
-
-	chSysLockFromIsr();
-	events_flag_isr(EVT_MASK_BASEBAND);
-	chSysUnlockFromIsr();
-
-	creg::m0apptxevent::clear();
-
-	CH_IRQ_EPILOGUE();
-}
-
-}
-
 static void shutdown() {
 	// TODO: Is this complete?