kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

Merge pull request #2133 from LudwigOrtmann/native-doc-update

Browse Source 
Native doc update
This commit is contained in:
Ludwig Ortmann 2014-12-04 11:43:27 +01:00
commit 1c15cd0562
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cpu/native/irq_cpu.c
View File

@ -114,7 +114,7 @@ void native_print_signals(void)
}
if (sigprocmask(SIG_SETMASK, NULL, &q) == -1) {
err(EXIT_FAILURE, "native_print_signals(): sigprocmask");
err(EXIT_FAILURE, "native_print_signals: sigprocmask");
}
for (int i = 1; i < (NSIG); i++) {
@ -150,7 +150,7 @@ unsigned disableIRQ(void)
}
if (sigprocmask(SIG_SETMASK, &_native_sig_set_dint, NULL) == -1) {
err(EXIT_FAILURE, "disableIRQ(): sigprocmask()");
err(EXIT_FAILURE, "disableIRQ: sigprocmask");
}
prev_state = native_interrupts_enabled;
@ -181,7 +181,7 @@ unsigned enableIRQ(void)
DEBUG("enableIRQ()\n");
if (sigprocmask(SIG_SETMASK, &_native_sig_set, NULL) == -1) {
err(EXIT_FAILURE, "enableIRQ(): sigprocmask()");
err(EXIT_FAILURE, "enableIRQ: sigprocmask");
}
prev_state = native_interrupts_enabled;
@ -209,7 +209,7 @@ void restoreIRQ(unsigned state)
int inISR(void)
{
DEBUG("inISR(): %i\n", _native_in_isr);
DEBUG("inISR: %i\n", _native_in_isr);
return _native_in_isr;
}
@ -238,7 +238,7 @@ int _native_popsig(void)
}
if (nread == -1) {
err(EXIT_FAILURE, "_native_popsig(): real_read()");
err(EXIT_FAILURE, "_native_popsig: real_read");
}
return sig;
@ -257,18 +257,18 @@ void native_irq_handler(void)
_native_sigpend--;
if (native_irq_handlers[sig] != NULL) {
DEBUG("calling interrupt handler for %i\n", sig);
DEBUG("native_irq_handler: calling interrupt handler for %i\n", sig);
native_irq_handlers[sig]();
}
else if (sig == SIGUSR1) {
DEBUG("ignoring SIGUSR1\n");
warnx("native_irq_handler: ignoring SIGUSR1");
}
else {
errx(EXIT_FAILURE, "XXX: no handler for signal %i\nXXX: this should not have happened!\n", sig);
}
}
DEBUG("native_irq_handler(): return\n");
DEBUG("native_irq_handler: return\n");
cpu_switch_context_exit();
}
@ -287,7 +287,7 @@ void native_isr_entry(int sig, siginfo_t *info, void *context)
/* save the signal */
if (real_write(_sig_pipefd[1], &sig, sizeof(int)) == -1) {
err(EXIT_FAILURE, "native_isr_entry(): real_write()");
err(EXIT_FAILURE, "native_isr_entry: real_write()");
}
_native_sigpend++;
//real_write(STDOUT_FILENO, "sigpend\n", 8);
@ -314,7 +314,7 @@ void native_isr_entry(int sig, siginfo_t *info, void *context)
}
if (_native_in_syscall != 0) {
DEBUG("\n\n\t\treturn to syscall\n\n");
DEBUG("\n\n\t\tnative_isr_entry: return to syscall\n\n");
return;
}
@ -324,7 +324,7 @@ void native_isr_entry(int sig, siginfo_t *info, void *context)
makecontext(&native_isr_context, native_irq_handler, 0);
_native_cur_ctx = (ucontext_t *)sched_active_thread->sp;
DEBUG("\n\n\t\treturn to _native_sig_leave_tramp\n\n");
DEBUG("\n\n\t\tnative_isr_entry: return to _native_sig_leave_tramp\n\n");
/* disable interrupts in context */
isr_set_sigmask((ucontext_t *)context);
_native_in_isr = 1;
@ -359,7 +359,7 @@ void native_isr_entry(int sig, siginfo_t *info, void *context)
*/
int register_interrupt(int sig, _native_callback_t handler)
{
DEBUG("register_interrupt()\n");
DEBUG("register_interrupt\n");
_native_syscall_enter();
if (sigdelset(&_native_sig_set, sig)) {
@ -390,7 +390,7 @@ int register_interrupt(int sig, _native_callback_t handler)
*/
int unregister_interrupt(int sig)
{
DEBUG("XXX: unregister_interrupt()\n");
DEBUG("unregister_interrupt\n");
_native_syscall_enter();
if (sigaddset(&_native_sig_set, sig) == -1) {
@ -412,7 +412,7 @@ int unregister_interrupt(int sig)
for (int i = 0; i < 255; i++) {
if (native_irq_handlers[i] != NULL) {
if (sigaction(sig, &sa, NULL)) {
err(EXIT_FAILURE, "register_interrupt: sigaction");
err(EXIT_FAILURE, "unregister_interrupt: sigaction");
}
}
}
@ -439,7 +439,7 @@ static void native_shutdown(int sig, siginfo_t *info, void *context)
void native_interrupt_init(void)
{
struct sigaction sa;
DEBUG("XXX: native_interrupt_init()\n");
DEBUG("native_interrupt_init\n");
VALGRIND_STACK_REGISTER(__isr_stack, __isr_stack + sizeof(__isr_stack));
VALGRIND_DEBUG("VALGRIND_STACK_REGISTER(%p, %p)\n", __isr_stack, (void*)((int)__isr_stack + sizeof(__isr_stack)));
@ -461,12 +461,12 @@ void native_interrupt_init(void)
/* get current process interrupt masks */
if (sigprocmask(SIG_SETMASK, NULL, &_native_sig_set) == -1) {
err(EXIT_FAILURE, "native_interrupt_init(): sigprocmask");
err(EXIT_FAILURE, "native_interrupt_init: sigprocmask");
}
/* we need to disable all signals during our signal handler as it
* can not cope with interrupted signals ... */
if (sigfillset(&_native_sig_set_dint) == -1) {
err(EXIT_FAILURE, "native_isr_entry(): sigfillset");
err(EXIT_FAILURE, "native_interrupt_init: sigfillset");
}
/* SIGUSR1 is intended for debugging purposes and shall always be
@ -484,7 +484,7 @@ void native_interrupt_init(void)
}
if (getcontext(&native_isr_context) == -1) {
err(EXIT_FAILURE, "native_isr_entry(): getcontext()");
err(EXIT_FAILURE, "native_interrupt_init: getcontext");
}
native_isr_context.uc_stack.ss_sp = __isr_stack;
@ -498,7 +498,7 @@ void native_interrupt_init(void)
sigstk.ss_flags = 0;
if (sigaltstack(&sigstk, NULL) < 0) {
err(EXIT_FAILURE, "main: sigaltstack");
err(EXIT_FAILURE, "native_interrupt_init: sigaltstack");
}
makecontext(&native_isr_context, native_irq_handler, 0);
@ -506,7 +506,7 @@ void native_interrupt_init(void)
_native_in_syscall = 0;
if (real_pipe(_sig_pipefd) == -1) {
err(EXIT_FAILURE, "native_interrupt_init(): pipe()");
err(EXIT_FAILURE, "native_interrupt_init: pipe");
}
/* allow for ctrl+c to shut down gracefully always */

26
cpu/native/native_cpu.c
View File

@ -90,7 +90,7 @@ int reboot_arch(int mode)
*/
void thread_print_stack(void)
{
DEBUG("XXX: thread_print_stack()\n");
DEBUG("thread_print_stack\n");
return;
}
@ -102,7 +102,7 @@ char *thread_stack_init(thread_task_func_t task_func, void *arg, void *stack_sta
VALGRIND_STACK_REGISTER(stack_start, (char *) stack_start + stacksize);
VALGRIND_DEBUG("VALGRIND_STACK_REGISTER(%p, %p)\n", stack_start, (void*)((int)stack_start + stacksize));
DEBUG("thread_stack_init()\n");
DEBUG("thread_stack_init\n");
stk = (unsigned int *)stack_start;
@ -116,7 +116,7 @@ char *thread_stack_init(thread_task_func_t task_func, void *arg, void *stack_sta
#endif
if (getcontext(p) == -1) {
err(EXIT_FAILURE, "thread_stack_init(): getcontext()");
err(EXIT_FAILURE, "thread_stack_init: getcontext");
}
p->uc_stack.ss_sp = stk;
@ -125,7 +125,7 @@ char *thread_stack_init(thread_task_func_t task_func, void *arg, void *stack_sta
p->uc_link = &end_context;
if (sigemptyset(&(p->uc_sigmask)) == -1) {
err(EXIT_FAILURE, "thread_stack_init(): sigemptyset()");
err(EXIT_FAILURE, "thread_stack_init: sigemptyset");
}
makecontext(p, (void (*)(void)) task_func, 1, arg);
@ -137,21 +137,21 @@ void isr_cpu_switch_context_exit(void)
{
ucontext_t *ctx;
DEBUG("XXX: isr_cpu_switch_context_exit()\n");
DEBUG("isr_cpu_switch_context_exit\n");
if ((sched_context_switch_request == 1) || (sched_active_thread == NULL)) {
sched_run();
}
DEBUG("XXX: isr_cpu_switch_context_exit(): calling setcontext(%" PRIkernel_pid ")\n\n", sched_active_pid);
DEBUG("isr_cpu_switch_context_exit: calling setcontext(%" PRIkernel_pid ")\n\n", sched_active_pid);
ctx = (ucontext_t *)(sched_active_thread->sp);
/* the next context will have interrupts enabled due to ucontext */
DEBUG("XXX: isr_cpu_switch_context_exit: native_interrupts_enabled = 1;\n");
DEBUG("isr_cpu_switch_context_exit: native_interrupts_enabled = 1;\n");
native_interrupts_enabled = 1;
_native_in_isr = 0;
if (setcontext(ctx) == -1) {
err(EXIT_FAILURE, "isr_cpu_switch_context_exit(): setcontext():");
err(EXIT_FAILURE, "isr_cpu_switch_context_exit: setcontext");
}
errx(EXIT_FAILURE, "2 this should have never been reached!!");
}
@ -160,7 +160,7 @@ void cpu_switch_context_exit(void)
{
#ifdef NATIVE_AUTO_EXIT
if (sched_num_threads <= 1) {
DEBUG("cpu_switch_context_exit(): last task has ended. exiting.\n");
DEBUG("cpu_switch_context_exit: last task has ended. exiting.\n");
real_exit(EXIT_SUCCESS);
}
#endif
@ -185,16 +185,16 @@ void cpu_switch_context_exit(void)
void isr_thread_yield(void)
{
DEBUG("isr_thread_yield()\n");
DEBUG("isr_thread_yield\n");
sched_run();
ucontext_t *ctx = (ucontext_t *)(sched_active_thread->sp);
DEBUG("isr_thread_yield(): switching to(%" PRIkernel_pid ")\n\n", sched_active_pid);
DEBUG("isr_thread_yield: switching to(%" PRIkernel_pid ")\n\n", sched_active_pid);
native_interrupts_enabled = 1;
_native_in_isr = 0;
if (setcontext(ctx) == -1) {
err(EXIT_FAILURE, "isr_thread_yield(): setcontext()");
err(EXIT_FAILURE, "isr_thread_yield: setcontext");
}
}
@ -221,7 +221,7 @@ void thread_yield_higher(void)
void native_cpu_init(void)
{
if (getcontext(&end_context) == -1) {
err(EXIT_FAILURE, "end_context(): getcontext()");
err(EXIT_FAILURE, "native_cpu_init: getcontext");
}
end_context.uc_stack.ss_sp = __end_stack;