From 1c9ccbc247a21c1e67b54816d22e8168d2fe1167 Mon Sep 17 00:00:00 2001
From: eried <1091420+eried@users.noreply.github.com>
Date: Wed, 19 Aug 2020 09:43:04 +0200
Subject: [PATCH 1/2] Rename m4txevent::assert and m0apptxevent::assert (adding
 "_event")

Copied from https://github.com/sharebrained/portapack-hackrf/commit/f6cdf6a7229638be5c14ae5879ba4ec0dc0bf29e#
---
 firmware/application/baseband_api.cpp | 2 +-
 firmware/baseband/stream_input.cpp    | 2 +-
 firmware/common/lpc43xx_cpp.hpp       | 4 ++--
 firmware/common/message_queue.cpp     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/firmware/application/baseband_api.cpp b/firmware/application/baseband_api.cpp
index 3cad9825..2bff3c53 100644
--- a/firmware/application/baseband_api.cpp
+++ b/firmware/application/baseband_api.cpp
@@ -39,7 +39,7 @@ static void send_message(const Message* const message) {
 	// If message is only sent by this function via one thread, no need to check if
 	// another message is present before setting new message.
 	shared_memory.baseband_message = message;
-	creg::m0apptxevent::assert();
+	creg::m0apptxevent::assert_event();
 	while(shared_memory.baseband_message);
 }
 
diff --git a/firmware/baseband/stream_input.cpp b/firmware/baseband/stream_input.cpp
index ead2d40d..2e7bf65d 100644
--- a/firmware/baseband/stream_input.cpp
+++ b/firmware/baseband/stream_input.cpp
@@ -65,7 +65,7 @@ size_t StreamInput::write(const void* const data, const size_t length) {
 				break;
 			}
 			active_buffer = nullptr;
-			creg::m4txevent::assert();
+			creg::m4txevent::assert_event();
 		}
 	}
 
diff --git a/firmware/common/lpc43xx_cpp.hpp b/firmware/common/lpc43xx_cpp.hpp
index 13ca9aa7..129ef390 100644
--- a/firmware/common/lpc43xx_cpp.hpp
+++ b/firmware/common/lpc43xx_cpp.hpp
@@ -69,7 +69,7 @@ inline void disable() {
 #endif
 
 #if defined(LPC43XX_M4)
-inline void assert() {
+inline void assert_event() {
 	__SEV();
 }
 #endif
@@ -93,7 +93,7 @@ inline void disable() {
 #endif
 
 #if defined(LPC43XX_M0)
-inline void assert() {
+inline void assert_event() {
 	__SEV();
 }
 #endif
diff --git a/firmware/common/message_queue.cpp b/firmware/common/message_queue.cpp
index 3001127d..a7b99b56 100644
--- a/firmware/common/message_queue.cpp
+++ b/firmware/common/message_queue.cpp
@@ -26,12 +26,12 @@ using namespace lpc43xx;
 
 #if defined(LPC43XX_M0)
 void MessageQueue::signal() {
-	creg::m0apptxevent::assert();
+	creg::m0apptxevent::assert_event();
 }
 #endif
 
 #if defined(LPC43XX_M4)
 void MessageQueue::signal() {
-	creg::m4txevent::assert();
+	creg::m4txevent::assert_event();
 }
 #endif

From 9186031e95c959945d2afca5f28dd92673cf8fd0 Mon Sep 17 00:00:00 2001
From: Erwin Ried <1091420+eried@users.noreply.github.com>
Date: Wed, 19 Aug 2020 22:52:39 +0200
Subject: [PATCH 2/2] Update stream_output.cpp

---
 firmware/baseband/stream_output.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firmware/baseband/stream_output.cpp b/firmware/baseband/stream_output.cpp
index 9bbf4ece..c28d8b2f 100644
--- a/firmware/baseband/stream_output.cpp
+++ b/firmware/baseband/stream_output.cpp
@@ -67,7 +67,7 @@ size_t StreamOutput::read(void* const data, const size_t length) {
 			}
 			// Tell M0 (IRQ) that a buffer has been consumed.
 			active_buffer = nullptr;
-			creg::m4txevent::assert();
+			creg::m4txevent::assert_event();
 		}
 	}