Skip to content

Commit 136369d

Browse files
dpgeorgedpgeorge
committed
all: Update to point to files in new shared/ directory.
Signed-off-by: Damien George <damien@micropython.org>
1 parent 4d54671 commit 136369d

File tree

141 files changed

+324
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+324
-306
lines changed

‎docs/develop/porting.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ The basic MicroPython firmware is implemented in the main port file, e.g ``main.
4242
#include "py/gc.h"
4343
#include "py/mperrno.h"
4444
#include "py/stackctrl.h"
45-
#include "lib/utils/gchelper.h"
46-
#include "lib/utils/pyexec.h"
45+
#include "shared/runtime/gchelper.h"
46+
#include "shared/runtime/pyexec.h"
4747
4848
// Allocate memory for the MicroPython GC heap.
4949
static char heap[4096];
@@ -106,10 +106,10 @@ We also need a Makefile at this point for the port:
106106
SRC_C = \
107107
main.c \
108108
mphalport.c \
109-
lib/mp-readline/readline.c \
110-
lib/utils/gchelper_generic.c \
111-
lib/utils/pyexec.c \
112-
lib/utils/stdout_helpers.c \
109+
shared/readline/readline.c \
110+
shared/runtime/gchelper_generic.c \
111+
shared/runtime/pyexec.c \
112+
shared/runtime/stdout_helpers.c \
113113
114114
# Define the required object files.
115115
OBJ = $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))

‎drivers/cyw43/cyw43.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "lwip/netif.h"
3030
#include "lwip/dhcp.h"
31-
#include "lib/netutils/dhcpserver.h"
31+
#include "shared/netutils/dhcpserver.h"
3232
#include "drivers/cyw43/cyw43_ll.h"
3333

3434
// For trace_flags

‎drivers/cyw43/cyw43_lwip.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <string.h>
2929

3030
#include "py/mphal.h"
31-
#include "lib/netutils/netutils.h"
31+
#include "shared/netutils/netutils.h"
3232
#include "lwip/etharp.h"
3333
#include "lwip/dns.h"
3434
#include "lwip/apps/mdns.h"

‎examples/embedding/Makefile.upylib

+8-8
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ endif
8282
endif
8383

8484
ifeq ($(MICROPY_USE_READLINE),1)
85-
INC += -I$(MPTOP)/lib/mp-readline
85+
INC += -I$(MPTOP)/shared/readline
8686
CFLAGS_MOD += -DMICROPY_USE_READLINE=1
87-
LIB_SRC_C_EXTRA += mp-readline/readline.c
87+
SHARED_SRC_C_EXTRA += readline/readline.c
8888
endif
8989
ifeq ($(MICROPY_USE_READLINE),2)
9090
CFLAGS_MOD += -DMICROPY_USE_READLINE=2
@@ -145,19 +145,19 @@ SRC_C = $(addprefix ports/unix/,\
145145
$(SRC_MOD) \
146146
)
147147

148-
LIB_SRC_C = $(addprefix lib/,\
149-
$(LIB_SRC_C_EXTRA) \
150-
utils/printf.c \
151-
utils/gchelper_generic.c \
148+
SHARED_SRC_C = $(addprefix shared/,\
149+
libc/printf.c \
150+
runtime/gchelper_generic.c \
152151
timeutils/timeutils.c \
152+
$(SHARED_SRC_C_EXTRA) \
153153
)
154154

155155
OBJ = $(PY_O)
156156
OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
157-
OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
157+
OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
158158

159159
# List of sources for qstr extraction
160-
SRC_QSTR += $(SRC_C) $(LIB_SRC_C)
160+
SRC_QSTR += $(SRC_C) $(SHARED_SRC_C)
161161
# Append any auto-generated sources that are needed by sources listed in
162162
# SRC_QSTR
163163
SRC_QSTR_AUTO_DEPS +=

‎extmod/extmod.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set(MICROPY_EXTMOD_DIR "${MICROPY_DIR}/extmod")
44
set(MICROPY_OOFATFS_DIR "${MICROPY_DIR}/lib/oofatfs")
55

66
set(MICROPY_SOURCE_EXTMOD
7-
${MICROPY_DIR}/lib/embed/abort_.c
8-
${MICROPY_DIR}/lib/utils/printf.c
7+
${MICROPY_DIR}/shared/libc/abort_.c
8+
${MICROPY_DIR}/shared/libc/printf.c
99
${MICROPY_EXTMOD_DIR}/machine_i2c.c
1010
${MICROPY_EXTMOD_DIR}/machine_mem.c
1111
${MICROPY_EXTMOD_DIR}/machine_pulse.c

‎extmod/extmod.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ LWIP_DIR = lib/lwip/src
153153
INC += -I$(TOP)/$(LWIP_DIR)/include
154154
CFLAGS_MOD += -DMICROPY_PY_LWIP=1
155155
$(BUILD)/$(LWIP_DIR)/core/ipv4/dhcp.o: CFLAGS_MOD += -Wno-address
156-
SRC_MOD += extmod/modlwip.c lib/netutils/netutils.c
156+
SRC_MOD += extmod/modlwip.c shared/netutils/netutils.c
157157
SRC_MOD += $(addprefix $(LWIP_DIR)/,\
158158
apps/mdns/mdns.c \
159159
core/def.c \

‎extmod/modlwip.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "py/mperrno.h"
3636
#include "py/mphal.h"
3737

38-
#include "lib/netutils/netutils.h"
38+
#include "shared/netutils/netutils.h"
3939

4040
#include "lwip/init.h"
4141
#include "lwip/tcp.h"

‎extmod/uos_dupterm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "py/objarray.h"
3434
#include "py/stream.h"
3535
#include "extmod/misc.h"
36-
#include "lib/utils/interrupt_char.h"
36+
#include "shared/runtime/interrupt_char.h"
3737

3838
#if MICROPY_PY_OS_DUPTERM
3939

‎extmod/vfs_fat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "py/mperrno.h"
3838
#include "lib/oofatfs/ff.h"
3939
#include "extmod/vfs_fat.h"
40-
#include "lib/timeutils/timeutils.h"
40+
#include "shared/timeutils/timeutils.h"
4141

4242
#if FF_MAX_SS == FF_MIN_SS
4343
#define SECSIZE(fs) (FF_MIN_SS)

‎extmod/vfs_lfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "py/runtime.h"
2828
#include "py/mphal.h"
29-
#include "lib/timeutils/timeutils.h"
29+
#include "shared/timeutils/timeutils.h"
3030
#include "extmod/vfs.h"
3131
#include "extmod/vfs_lfs.h"
3232

‎extmod/vfs_lfsx.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "py/objstr.h"
3535
#include "py/mperrno.h"
3636
#include "extmod/vfs.h"
37-
#include "lib/timeutils/timeutils.h"
37+
#include "shared/timeutils/timeutils.h"
3838

3939
STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, int arg, bool must_return_int) {
4040
mp_obj_t ret = mp_vfs_blockdev_ioctl(c->context, cmd, arg);

‎mpy-cross/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
4848
SRC_C = \
4949
main.c \
5050
gccollect.c \
51-
lib/utils/gchelper_generic.c \
51+
shared/runtime/gchelper_generic.c \
5252

5353
# Add fmode when compiling with mingw gcc
5454
COMPILER_TARGET := $(shell $(CC) -dumpmachine)

‎mpy-cross/gccollect.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "py/mpstate.h"
3030
#include "py/gc.h"
3131

32-
#include "lib/utils/gchelper.h"
32+
#include "shared/runtime/gchelper.h"
3333

3434
#if MICROPY_ENABLE_GC
3535

‎mpy-cross/mpy-cross.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<Import Project="$(PyMsvcDir)sources.props" />
9090
<ItemGroup>
9191
<ClCompile Include="@(PyCoreSource)" />
92-
<ClCompile Include="$(PyBaseDir)lib/utils/gchelper_generic.c" >
92+
<ClCompile Include="$(PyBaseDir)shared/runtime/gchelper_generic.c" >
9393
<PreprocessorDefinitions>MICROPY_GCREGS_SETJMP</PreprocessorDefinitions>
9494
</ClCompile>
9595
<ClCompile Include="$(PyBaseDir)mpy-cross\gccollect.c"/>
@@ -103,4 +103,4 @@
103103
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
104104
<ImportGroup Label="ExtensionTargets">
105105
</ImportGroup>
106-
</Project>
106+
</Project>

‎ports/bare-arm/lib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void free(void *p) {
5454
}
5555

5656
// These standard string functions are needed by the runtime, and can be
57-
// provided either by the system or lib/libc/string0.c. The implementations
57+
// provided either by the system or shared/libc/string0.c. The implementations
5858
// here are very simple.
5959

6060
int memcmp(const void *s1, const void *s2, size_t n) {

‎ports/cc3200/application.mk

+12-9
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,18 @@ APP_MAIN_SRC_C = \
140140
APP_LIB_SRC_C = $(addprefix lib/,\
141141
oofatfs/ff.c \
142142
oofatfs/ffunicode.c \
143+
)
144+
145+
APP_SHARED_SRC_C = $(addprefix shared/,\
143146
libc/string0.c \
144-
mp-readline/readline.c \
147+
readline/readline.c \
145148
netutils/netutils.c \
146149
timeutils/timeutils.c \
147-
utils/gchelper_native.c \
148-
utils/pyexec.c \
149-
utils/interrupt_char.c \
150-
utils/stdout_helpers.c \
151-
utils/sys_stdio_mphal.c \
150+
runtime/gchelper_native.c \
151+
runtime/pyexec.c \
152+
runtime/interrupt_char.c \
153+
runtime/stdout_helpers.c \
154+
runtime/sys_stdio_mphal.c \
152155
)
153156

154157
APP_STM_SRC_C = $(addprefix ports/stm32/,\
@@ -158,12 +161,12 @@ APP_STM_SRC_C = $(addprefix ports/stm32/,\
158161

159162
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_RTOS_SRC_C:.c=.o) $(APP_FTP_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_MISC_SRC_C:.c=.o))
160163
OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_CC3100_SRC_C:.c=.o) $(APP_SL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_UTIL_SRC_S:.s=.o))
161-
OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
162-
OBJ += $(BUILD)/lib/utils/gchelper_m3.o
164+
OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_SHARED_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
165+
OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
163166
OBJ += $(BUILD)/pins.o
164167

165168
# List of sources for qstr extraction
166-
SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C)
169+
SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C)
167170
# Append any auto-generated sources that are needed by sources listed in
168171
# SRC_QSTR
169172
SRC_QSTR_AUTO_DEPS +=

‎ports/cc3200/bootmgr/bootloader.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ BOOT_PY_SRC_C = $(addprefix py/,\
6565
mpprint.c \
6666
)
6767

68-
BOOT_LIB_SRC_C = $(addprefix lib/,\
68+
BOOT_SHARED_SRC_C = $(addprefix shared/,\
69+
libc/printf.c \
6970
libc/string0.c \
70-
utils/printf.c \
7171
)
7272

7373
OBJ = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o) $(BOOT_SL_SRC_C:.c=.o) $(BOOT_CC3100_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o) $(BOOT_MISC_SRC_C:.c=.o))
7474
OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o))
75-
OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o))
75+
OBJ += $(addprefix $(BUILD)/, $(BOOT_SHARED_SRC_C:.c=.o))
7676

7777
# Add the linker script
7878
LINKER_SCRIPT = bootmgr/bootmgr.lds

‎ports/cc3200/fatfs_port.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "py/runtime.h"
2929
#include "lib/oofatfs/ff.h"
30-
#include "lib/timeutils/timeutils.h"
30+
#include "shared/timeutils/timeutils.h"
3131
#include "mods/pybrtc.h"
3232

3333
#if FF_FS_REENTRANT

‎ports/cc3200/ftp/ftp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <stdio.h>
2929

3030
#include "py/runtime.h"
31-
#include "lib/timeutils/timeutils.h"
31+
#include "shared/timeutils/timeutils.h"
3232
#include "lib/oofatfs/ff.h"
3333
#include "extmod/vfs.h"
3434
#include "extmod/vfs_fat.h"

‎ports/cc3200/mods/moduos.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "py/objtuple.h"
3232
#include "py/objstr.h"
3333
#include "py/runtime.h"
34-
#include "lib/timeutils/timeutils.h"
34+
#include "shared/timeutils/timeutils.h"
3535
#include "lib/oofatfs/ff.h"
3636
#include "lib/oofatfs/diskio.h"
3737
#include "genhdr/mpversion.h"

‎ports/cc3200/mods/modusocket.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "py/runtime.h"
3636
#include "py/stream.h"
3737
#include "py/mphal.h"
38-
#include "lib/netutils/netutils.h"
38+
#include "shared/netutils/netutils.h"
3939
#include "modnetwork.h"
4040
#include "modusocket.h"
4141

‎ports/cc3200/mods/modutime.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "py/obj.h"
3434
#include "py/smallint.h"
3535
#include "py/mphal.h"
36-
#include "lib/timeutils/timeutils.h"
36+
#include "shared/timeutils/timeutils.h"
3737
#include "extmod/utime_mphal.h"
3838
#include "inc/hw_types.h"
3939
#include "inc/hw_ints.h"

‎ports/cc3200/mods/modwlan.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "py/runtime.h"
3636
#include "py/stream.h"
3737
#include "py/mphal.h"
38-
#include "lib/timeutils/timeutils.h"
39-
#include "lib/netutils/netutils.h"
38+
#include "shared/timeutils/timeutils.h"
39+
#include "shared/netutils/netutils.h"
4040
#include "modnetwork.h"
4141
#include "modusocket.h"
4242
#include "modwlan.h"

‎ports/cc3200/mods/pybrtc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "py/obj.h"
3030
#include "py/runtime.h"
3131
#include "py/mperrno.h"
32-
#include "lib/timeutils/timeutils.h"
32+
#include "shared/timeutils/timeutils.h"
3333
#include "inc/hw_types.h"
3434
#include "inc/hw_ints.h"
3535
#include "inc/hw_memmap.h"

‎ports/cc3200/mods/pybuart.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "py/objlist.h"
3434
#include "py/stream.h"
3535
#include "py/mphal.h"
36-
#include "lib/utils/interrupt_char.h"
36+
#include "shared/runtime/interrupt_char.h"
3737
#include "inc/hw_types.h"
3838
#include "inc/hw_ints.h"
3939
#include "inc/hw_memmap.h"

‎ports/cc3200/mptask.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "py/runtime.h"
3434
#include "py/gc.h"
3535
#include "py/mphal.h"
36-
#include "lib/mp-readline/readline.h"
36+
#include "shared/readline/readline.h"
3737
#include "lib/oofatfs/ff.h"
3838
#include "lib/oofatfs/diskio.h"
3939
#include "extmod/vfs.h"
@@ -49,8 +49,8 @@
4949
#include "pybuart.h"
5050
#include "pybpin.h"
5151
#include "pybrtc.h"
52-
#include "lib/utils/pyexec.h"
53-
#include "lib/utils/gchelper.h"
52+
#include "shared/runtime/pyexec.h"
53+
#include "shared/runtime/gchelper.h"
5454
#include "gccollect.h"
5555
#include "mperror.h"
5656
#include "simplelink.h"

‎ports/cc3200/telnet/telnet.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "py/runtime.h"
3030
#include "py/mphal.h"
31-
#include "lib/utils/interrupt_char.h"
31+
#include "shared/runtime/interrupt_char.h"
3232
#include "telnet.h"
3333
#include "simplelink.h"
3434
#include "modnetwork.h"

‎ports/cc3200/util/gccollect.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "py/gc.h"
3232
#include "py/mpthread.h"
33-
#include "lib/utils/gchelper.h"
33+
#include "shared/runtime/gchelper.h"
3434
#include "gccollect.h"
3535

3636
/******************************************************************************

‎ports/esp32/fatfs_port.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <sys/time.h>
3030
#include "lib/oofatfs/ff.h"
31-
#include "lib/timeutils/timeutils.h"
31+
#include "shared/timeutils/timeutils.h"
3232

3333
DWORD get_fattime(void) {
3434
struct timeval tv;

‎ports/esp32/machine_rtc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "py/obj.h"
3737
#include "py/runtime.h"
3838
#include "py/mphal.h"
39-
#include "lib/timeutils/timeutils.h"
39+
#include "shared/timeutils/timeutils.h"
4040
#include "modmachine.h"
4141
#include "machine_rtc.h"
4242

‎ports/esp32/main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
#include "py/repl.h"
5555
#include "py/gc.h"
5656
#include "py/mphal.h"
57-
#include "lib/mp-readline/readline.h"
58-
#include "lib/utils/pyexec.h"
57+
#include "shared/readline/readline.h"
58+
#include "shared/runtime/pyexec.h"
5959
#include "uart.h"
6060
#include "usb.h"
6161
#include "modmachine.h"

0 commit comments

Comments
 (0)