Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Oct 6, 2023
+1 −16
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions micropython/micropython-1.15-config/patches/08_os_varia.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Loading