From 1bbe29b5d9d891879902e2b5576dda9b782c8220 Mon Sep 17 00:00:00 2001 From: Erki Date: Thu, 30 Jun 2022 19:58:56 +0300 Subject: [PATCH] Bring up to date with skullc --- main.cpp | 4 ++-- radio/src/radio_hw_instance.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main.cpp b/main.cpp index b1e37dd..97db4e9 100644 --- a/main.cpp +++ b/main.cpp @@ -12,9 +12,9 @@ namespace Hal = Peripherals::Hal::Samd; namespace { -[[noreturn]] void m_faultHandler(const char* file, const int line) +[[noreturn]] void m_faultHandler(const char* expression, const char* file, const int line) { - SKULLC_LOG_FATAL("Fault: %s:%d", file, line); + SKULLC_LOG_FATAL("Expression failed: (%s), source: %s:%d", expression, file, line); __asm__("BKPT"); diff --git a/radio/src/radio_hw_instance.cpp b/radio/src/radio_hw_instance.cpp index a037f24..a4358c2 100644 --- a/radio/src/radio_hw_instance.cpp +++ b/radio/src/radio_hw_instance.cpp @@ -36,7 +36,7 @@ HwInstance* HwInstance::instance() _INSTANCE.setup(); } - return &(*_INSTANCE); + return _INSTANCE.get(); } HwInstance::HwInstance()