TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-01-12 23:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #157 from eried/gcc9.3-assert-redefinition

Browse Source 
Gcc9.3 assert redefinition
This commit is contained in:
Erwin Ried 2020-08-20 21:45:11 +02:00 committed by GitHub
commit f1a2155e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/baseband_api.cpp
View File

@ -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);
}

2
firmware/baseband/stream_input.cpp
View File

@ -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();
}
}

2
firmware/baseband/stream_output.cpp
View File

@ -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();
}
}

4
firmware/common/lpc43xx_cpp.hpp
View File

@ -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

4
firmware/common/message_queue.cpp
View File

@ -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