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

native: allow for native to be resetable via SIGUSR1 #12517

Merged
merged 2 commits into from
Dec 3, 2019
Merged

native: allow for native to be resetable via SIGUSR1 #12517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa31791
native: allow for native to be resetable via SIGUSR1
miri64 Oct 20, 2019
d670f77
native: add and use reset script to reset certain PID
miri64 Oct 20, 2019
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: 1 addition & 0 deletions boards/native/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ else
DEBUGGER ?= gdb
endif

RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh
FLASHER = true
FLASHFILE ?= $(ELFFILE)

Expand Down
18 changes: 18 additions & 0 deletions boards/native/dist/reset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/sh
#
# Copyright (C) 2019 Freie Universität Berlin
#
# This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.

case ${DEBUG_ADAPTER_ID} in
# check if ${DEBUG_ADAPTER_ID} is empty or contains a number
''|*[!0-9]*)
echo "Please provide native instance's PID using DEBUG_ADAPTER_ID" >&2
exit 1
;;
*) ;;
esac

kill -USR1 "${DEBUG_ADAPTER_ID}"
8 changes: 8 additions & 0 deletions cpu/native/startup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "tty_uart.h"

#include "periph/init.h"
#include "periph/pm.h"

#define ENABLE_DEBUG (0)
#include "debug.h"
Expand Down Expand Up @@ -390,6 +391,11 @@ extern init_func_t __init_array_start;
extern init_func_t __init_array_end;
#endif

static void _reset_handler(void)
{
pm_reboot();
}

__attribute__((constructor)) static void startup(int argc, char **argv, char **envp)
{
_native_init_syscalls();
Expand Down Expand Up @@ -577,6 +583,8 @@ __attribute__((constructor)) static void startup(int argc, char **argv, char **e
periph_init();
board_init();

register_interrupt(SIGUSR1, _reset_handler);

puts("RIOT native hardware initialization complete.\n");
irq_enable();
kernel_init();
Expand Down