From 835c3015b231908d1f6936fda553c7adfa7ac755 Mon Sep 17 00:00:00 2001 From: Camila Date: Tue, 26 Mar 2024 19:36:41 +0100 Subject: [PATCH 1/2] Changes required for new Spresense SDK 3.2.0 - Wrapped main function in spresense_main - video_uninitialize now requires dev path as parameter --- ports/cxd56/Makefile | 1 - ports/cxd56/common-hal/camera/Camera.c | 2 +- ports/cxd56/supervisor/port.c | 8 ++++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/cxd56/Makefile b/ports/cxd56/Makefile index c6203350d127f..48fecbfacf5df 100644 --- a/ports/cxd56/Makefile +++ b/ports/cxd56/Makefile @@ -73,7 +73,6 @@ CFLAGS += \ -DCONFIG_WCHAR_BUILTIN \ -DCONFIG_HAVE_DOUBLE \ -DNDEBUG \ - -Dmain=spresense_main \ -D_estack=__stack \ -DCIRCUITPY_BOARD_ID="\"$(BOARD)\"" \ -c \ diff --git a/ports/cxd56/common-hal/camera/Camera.c b/ports/cxd56/common-hal/camera/Camera.c index 4f468a537b956..65ab3b89f674f 100644 --- a/ports/cxd56/common-hal/camera/Camera.c +++ b/ports/cxd56/common-hal/camera/Camera.c @@ -169,7 +169,7 @@ void common_hal_camera_deinit(camera_obj_t *self) { return; } - video_uninitialize(); + video_uninitialize(camera_dev.devpath); close(camera_dev.fd); camera_dev.fd = -1; diff --git a/ports/cxd56/supervisor/port.c b/ports/cxd56/supervisor/port.c index ecb16d77da91b..029ca314cac5c 100644 --- a/ports/cxd56/supervisor/port.c +++ b/ports/cxd56/supervisor/port.c @@ -165,3 +165,11 @@ void port_interrupt_after_ticks(uint32_t ticks) { void port_idle_until_interrupt(void) { // TODO: Implement sleep. } + +// Wrap main in spresense_main +extern void main(void); +extern int spresense_main(int argc, FAR char *argv[]); +int spresense_main(int argc, FAR char *argv[]) { + main(); + return 0; +} From dfd2602da7d34ef157dc208a3e3c41b6a72643ab Mon Sep 17 00:00:00 2001 From: Camila Date: Tue, 26 Mar 2024 19:56:20 +0100 Subject: [PATCH 2/2] Updating defconfig for SDK 3.2.0 - CONFIG_MMCSD and CONFIG_MMCSD_SDIO no longer need to be explicitly set to y --- ports/cxd56/configs/circuitpython/defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/cxd56/configs/circuitpython/defconfig b/ports/cxd56/configs/circuitpython/defconfig index 3655a5fdcdfb4..deb83df913691 100644 --- a/ports/cxd56/configs/circuitpython/defconfig +++ b/ports/cxd56/configs/circuitpython/defconfig @@ -65,8 +65,6 @@ CONFIG_DRIVERS_VIDEO=y CONFIG_FS_FAT=y CONFIG_INIT_ENTRYPOINT="spresense_main" CONFIG_INIT_STACKSIZE=8192 -CONFIG_MMCSD=y -CONFIG_MMCSD_SDIO=y CONFIG_MTD=y CONFIG_MTD_BYTE_WRITE=y CONFIG_MTD_SMART=y pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy