From 070867f8e8ced22e39f89b38571c82ad8281a00e Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Fri, 4 Oct 2019 13:40:43 +0200
Subject: [PATCH] chore(epicardium): Switch from MXC_ASSERT to assert
Newlib assert uses __assert_func and thus our panic() function while
MXC_ASSERT uses a custom assertion logic. Newlib assert is also more
portable as it works in expression position while MXC_ASSERT only works
as a statement.
Signed-off-by: Rahix <rahix@rahix.de>
---
epicardium/FreeRTOSConfig.h | 7 +++----
epicardium/modules/bhi.c | 7 ++++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/epicardium/FreeRTOSConfig.h b/epicardium/FreeRTOSConfig.h
index f1d3aa46..b731f6a9 100644
--- a/epicardium/FreeRTOSConfig.h
+++ b/epicardium/FreeRTOSConfig.h
@@ -1,11 +1,10 @@
#ifndef FREERTOS_CONFIG_H
#define FREERTOS_CONFIG_H
-#define MXC_ASSERT_ENABLE
-#include "mxc_assert.h"
-
#include "max32665.h"
+#include <assert.h>
+
/* CMSIS keeps a global updated with current system clock in Hz */
#define configCPU_CLOCK_HZ ((unsigned long)96000000)
@@ -69,7 +68,7 @@
#define xPortSysTickHandler SysTick_Handler
/* Assert */
-#define configASSERT(x) MXC_ASSERT(x)
+#define configASSERT(x) assert(x)
/* Tickless idle hooks */
typedef uint32_t TickType_t;
diff --git a/epicardium/modules/bhi.c b/epicardium/modules/bhi.c
index a40a73eb..b88e1dc2 100644
--- a/epicardium/modules/bhi.c
+++ b/epicardium/modules/bhi.c
@@ -1,3 +1,4 @@
+#include <assert.h>
#include <stdio.h>
#include <string.h>
@@ -259,14 +260,14 @@ bhi160_handle_packet(bhy_data_type_t data_type, bhy_data_generic_t *sensor_data)
wakeup = true;
/* fall through */
case VS_ID_TIMESTAMP_MSW:
- MXC_ASSERT(data_type == BHY_DATA_TYPE_SCALAR_U16);
+ assert(data_type == BHY_DATA_TYPE_SCALAR_U16);
timestamp = sensor_data->data_scalar_u16.data << 16;
break;
case VS_ID_TIMESTAMP_LSW_WAKEUP:
wakeup = true;
/* fall through */
case VS_ID_TIMESTAMP_LSW:
- MXC_ASSERT(data_type == BHY_DATA_TYPE_SCALAR_U16);
+ assert(data_type == BHY_DATA_TYPE_SCALAR_U16);
timestamp = (timestamp & 0xFFFF0000) |
sensor_data->data_scalar_u16.data;
break;
@@ -303,7 +304,7 @@ bhi160_handle_packet(bhy_data_type_t data_type, bhy_data_generic_t *sensor_data)
break;
}
- MXC_ASSERT(data_type == BHY_DATA_TYPE_VECTOR);
+ assert(data_type == BHY_DATA_TYPE_VECTOR);
if (bhi160_streams[sensor_type].queue == NULL) {
break;
}
--
GitLab