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

arm64 fixes #755

Merged
merged 3 commits into from
Sep 2, 2024
Merged

arm64 fixes #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe7d3b2
pwm_esc: Use PX4_STACK_ADJUSTED() for stack size
pussuw Aug 28, 2024
802d555
board_ioctl.c: Fix return values, check incoming parameter
pussuw Sep 2, 2024
828d95a
hrt_ioctl.c: Cast NULL (which is defined as (void *)0) to integer
pussuw Sep 2, 2024
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
8 changes: 6 additions & 2 deletions platforms/nuttx/src/px4/common/board_ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static int launch_kernel_builtin(int argc, char **argv)
return builtin->main(argc, argv);
}

return ENOENT;
return -ENOENT;
}

/************************************************************************************
Expand All @@ -144,7 +144,11 @@ static int launch_kernel_builtin(int argc, char **argv)

static int platform_ioctl(unsigned int cmd, unsigned long arg)
{
int ret = PX4_OK;
int ret = OK;

if (arg == 0) {
return -EINVAL;
}

switch (cmd) {
case PLATFORMIOCLAUNCH: {
Expand Down
2 changes: 1 addition & 1 deletion platforms/nuttx/src/px4/common/hrt_ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ hrt_ioctl(unsigned int cmd, unsigned long arg)
#ifdef PX4_USERSPACE_HRT
*(uintptr_t *)arg = hrt_absolute_time_usr_base();
#else
*(uintptr_t *)arg = NULL;
*(uintptr_t *)arg = (uintptr_t)NULL;
#endif
}
break;
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/pwm_esc/pwm_esc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ PWMESC::init(bool hitl_mode)
_task = px4_task_spawn_cmd("pwm_esc",
SCHED_DEFAULT,
SCHED_PRIORITY_ACTUATOR_OUTPUTS,
3048,
PX4_STACK_ADJUSTED(3048),
(px4_main_t)&PWMESC::task_main_trampoline,
nullptr);

Expand Down
Loading