From 346375c00161239a434b878fe74d574862b6d159 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Thu, 12 Aug 2021 12:47:08 +0200 Subject: [PATCH] Add experimental support for ChibiOS 6.x kernel --- changelog.txt | 1 + src/gos/gos_chibios.c | 2 +- src/gos/gos_chibios.h | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index d41f7cd0..944ffd76 100644 --- a/changelog.txt +++ b/changelog.txt @@ -7,6 +7,7 @@ CHANGE: Added type gImage to replace V2.x gdispImage FIX: Fixed GWIN console widget scroll FIX: A warning and adjusted is made if GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE is less than 40 bytes. FIX: Prevent compiler warnings on duplicate const specifiers. +FEATURE: Added support for ChibiOS 6.x kernel. *** Release 2.9 *** diff --git a/src/gos/gos_chibios.c b/src/gos/gos_chibios.c index 674d090f..9de04579 100644 --- a/src/gos/gos_chibios.c +++ b/src/gos/gos_chibios.c @@ -11,7 +11,7 @@ #include -#if CH_KERNEL_MAJOR < 2 || CH_KERNEL_MAJOR > 5 +#if CH_KERNEL_MAJOR < 2 || CH_KERNEL_MAJOR > 6 #error "GOS: Unsupported version of ChibiOS" #endif diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h index d2a8db3c..19b17b4e 100644 --- a/src/gos/gos_chibios.h +++ b/src/gos/gos_chibios.h @@ -35,7 +35,11 @@ #endif typedef systime_t gTicks; typedef cnt_t gSemcount; -typedef msg_t gThreadreturn; +#if CH_KERNEL_MAJOR >= 6 + typedef void gThreadreturn; +#else + typedef msg_t gThreadreturn; +#endif typedef tprio_t gThreadpriority; #define gSemMaxCount ((gSemcount)(((unsigned long)((gSemcount)(-1))) >> 1))