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.

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

Changes required for new Spresense SDK 3.2.0 #9094

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion ports/cxd56/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ CFLAGS += \
-DCONFIG_WCHAR_BUILTIN \
-DCONFIG_HAVE_DOUBLE \
-DNDEBUG \
-Dmain=spresense_main \
-D_estack=__stack \
-DCIRCUITPY_BOARD_ID="\"$(BOARD)\"" \
-c \
Expand Down
2 changes: 1 addition & 1 deletion ports/cxd56/common-hal/camera/Camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ports/cxd56/configs/circuitpython/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions ports/cxd56/supervisor/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Loading