From 4bfa7b41b7d97a2f6db5642d81c6badb32248ddc Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sat, 19 Dec 2020 20:48:21 +0200 Subject: [PATCH] Remove STM32_HAL_H from common code. --- src/omv/alloc/fb_alloc.c | 2 +- src/omv/common/trace.c | 4 ++-- src/omv/imlib/draw.c | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/omv/alloc/fb_alloc.c b/src/omv/alloc/fb_alloc.c index e530d5c57..84cba37c6 100644 --- a/src/omv/alloc/fb_alloc.c +++ b/src/omv/alloc/fb_alloc.c @@ -40,7 +40,7 @@ char *fb_alloc_stack_pointer() return pointer; } -__weak NORETURN void fb_alloc_fail() +MP_WEAK NORETURN void fb_alloc_fail() { nlr_raise(mp_obj_new_exception_msg(&mp_type_MemoryError, "Out of fast Frame Buffer Stack Memory!" diff --git a/src/omv/common/trace.c b/src/omv/common/trace.c index 4670d4695..d2c7eaaa4 100644 --- a/src/omv/common/trace.c +++ b/src/omv/common/trace.c @@ -8,9 +8,9 @@ * * Trace buffer. */ -#include "trace.h" #include -#include STM32_HAL_H +#include "cmsis_gcc.h" +#include "trace.h" #define TRACEBUF_SIZE (256) typedef struct _tracebuf_t { diff --git a/src/omv/imlib/draw.c b/src/omv/imlib/draw.c index 585d3e7b8..961ac1939 100644 --- a/src/omv/imlib/draw.c +++ b/src/omv/imlib/draw.c @@ -8,11 +8,14 @@ * * Basic drawing functions. */ -#include STM32_HAL_H -#include "dma.h" #include "font.h" #include "imlib.h" +#ifdef IMLIB_ENABLE_DMA2D +#include STM32_HAL_H +#include "dma.h" +#endif + void* imlib_compute_row_ptr(const image_t *img, int y) { switch(img->bpp) { case IMAGE_BPP_BINARY: {