From 0dac6b4d0f84fd8cb4fc86f3570cf5cf49fb301c Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel.bodenmann@simulton.com>
Date: Thu, 26 Aug 2021 02:08:42 +0200
Subject: [PATCH] Fix ChibiOS 6.x kernel support

---
 src/gos/gos_chibios.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h
index 19b17b4e..9c943e08 100644
--- a/src/gos/gos_chibios.h
+++ b/src/gos/gos_chibios.h
@@ -49,7 +49,12 @@ typedef tprio_t		gThreadpriority;
 
 #define GFX_THREAD_STACK(name, sz)			WORKING_AREA(name, sz)
 #define GFX_THREAD_FUNCTION(fnName, param)	gThreadreturn fnName(void *param)
-#define gfxThreadReturn(retval)				return retval
+
+#if CH_KERNEL_MAJOR >= 6
+	#define gfxThreadReturn(retval)				return
+#else
+	#define gfxThreadReturn(retval)				return retval
+#endif
 
 #if CH_KERNEL_MAJOR <= 2
 	typedef struct {