micropython: Fix patch 08 - there're no custom dirent types anymore

JIRA: RTOS-603
phoenix-rtos · Oct 5, 2023 · fe77d58 · fe77d58
1 parent 863bfce
commit fe77d58
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/micropython/micropython-1.15-config/patches/08_os_varia.patch b/micropython/micropython-1.15-config/patches/08_os_varia.patch
@@ -1,18 +1,3 @@
-diff -Naur micropython-1.15/ports/unix/modos.c micropython-phoenix/ports/unix/modos.c
---- micropython-1.15/ports/unix/modos.c	2021-04-18 16:27:07.000000000 +0200
-+++ micropython-phoenix/ports/unix/modos.c	2021-06-30 11:48:28.980936563 +0200
-@@ -259,9 +259,9 @@
-     #ifdef DTTOIF
-     t->items[1] = MP_OBJ_NEW_SMALL_INT(DTTOIF(dirent->d_type));
-     #else
--    if (dirent->d_type == DT_DIR) {
-+    if (dirent->d_type == dtDir) {
-         t->items[1] = MP_OBJ_NEW_SMALL_INT(MP_S_IFDIR);
--    } else if (dirent->d_type == DT_REG) {
-+    } else if (dirent->d_type == dtFile) {
-         t->items[1] = MP_OBJ_NEW_SMALL_INT(MP_S_IFREG);
-     } else {
-         t->items[1] = MP_OBJ_NEW_SMALL_INT(dirent->d_type);
 diff -Naur micropython-1.15/ports/unix/modusocket.c micropython-phoenix/ports/unix/modusocket.c
 --- micropython-1.15/ports/unix/modusocket.c	2021-04-18 16:27:07.000000000 +0200
 +++ micropython-phoenix/ports/unix/modusocket.c	2021-06-30 11:48:28.980936563 +0200
@@ -27,7 +12,7 @@ diff -Naur micropython-1.15/ports/unix/modusocket.c micropython-phoenix/ports/un
 @@ -47,6 +48,10 @@
  #include "py/mphal.h"
  #include "py/mpthread.h"
- 
+
 +#ifndef MSG_DONTROUTE
 +#define MSG_DONTROUTE   0x04 //PHOENIX CHANGE: missing in phoenix
 +#endif