Просмотр исходного кода

【update】适配 rt-thread 5.0.0 +

guozhanxin 2 лет назад
Родитель
Сommit
a06880a401
3 измененных файлов с 13 добавлено и 1 удалено
  1. 1 1
      port/modules/machine/modmachine.c
  2. 8 0
      port/mpconfigport.h
  3. 4 0
      port/mpy_main.c

+ 1 - 1
port/modules/machine/modmachine.c

@@ -131,7 +131,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 *
 * @return 0 - ok, -1 - no such clock
 */
-RT_WEAK int mp_port_get_freq(int clkid, int *freq)
+MP_WEAK int mp_port_get_freq(int clkid, int *freq)
 {
     return -1;
 }

+ 8 - 0
port/mpconfigport.h

@@ -304,7 +304,11 @@
 #if defined(__CC_ARM)
 #include <sys/types.h>
 #define MICROPY_NO_ALLOCA           1
+#if (RTTHREAD_VERSION < RT_VERSION_CHECK(5, 0, 0))
 #define MP_WEAK                     RT_WEAK
+#else
+#define MP_WEAK                     rt_weak
+#endif
 #define MP_NOINLINE
 #define MP_ALWAYSINLINE
 #define MP_LIKELY(x)               x
@@ -317,7 +321,11 @@
 #include <sys/types.h>
 #define MICROPY_NO_ALLOCA           1
 #define NORETURN                    __noreturn
+#if (RTTHREAD_VERSION < RT_VERSION_CHECK(5, 0, 0))
 #define MP_WEAK                     RT_WEAK
+#else
+#define MP_WEAK                     rt_weak
+#endif
 #define MP_NOINLINE
 #define MP_ALWAYSINLINE
 #define MP_LIKELY(x)               x

+ 4 - 0
port/mpy_main.c

@@ -155,7 +155,11 @@ void mpy_main(const char *filename) {
 
     if (rt_thread_self()->stack_size < stack_size_check) 
     {
+        #if (RTTHREAD_VERSION < RT_VERSION_CHECK(5, 0, 1))
         mp_printf(&mp_plat_print, "The stack (%.*s) size for executing MicroPython must be >= %d\n", RT_NAME_MAX, rt_thread_self()->name, stack_size_check);
+        #else
+        mp_printf(&mp_plat_print, "The stack (%.*s) size for executing MicroPython must be >= %d\n", RT_NAME_MAX, rt_thread_self()->parent.name, stack_size_check);
+        #endif
     }
 
 #if MICROPY_PY_THREAD