From 6dec5d35b9971d543a42de7647ea3f1ee8832530 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date: Tue, 3 Mar 2015 15:07:17 +0100
Subject: [PATCH] hooks: return type must be given in application

The application can no longer write

   PreTaskHook() {}

but must write

   void PreTaskHook() {}

This improves compatibility with KESO and other OSEK implementations.

Change-Id: Ie3a8a1c2ad9cb16b0f4b23e32b1d2b5be22d3880
---
 app/bcc1/alarm1/a.cc              | 2 +-
 app/bcc1/alarm1/b.cc              | 2 +-
 app/bcc1/alarm1/c.cc              | 2 +-
 app/bcc1/alarm1/d.cc              | 2 +-
 app/bcc1/alarm1/e.cc              | 2 +-
 app/bcc1/alarm1/f.cc              | 2 +-
 app/bcc1/alarm3/a.cc              | 2 +-
 app/bcc1/alarm3/b.cc              | 2 +-
 app/bcc1/alarm3/c.cc              | 2 +-
 app/bcc1/alarm3/d.cc              | 2 +-
 app/bcc1/alarm3/e.cc              | 2 +-
 app/bcc1/complex1/a.cc            | 2 +-
 app/bcc1/complex1/b.cc            | 2 +-
 app/bcc1/complex1/c.cc            | 2 +-
 app/bcc1/complex1/d.cc            | 2 +-
 app/bcc1/complex2/a.cc            | 2 +-
 app/bcc1/counter1/a.cc            | 2 +-
 app/bcc1/depsvc/depsvc.cc         | 2 +-
 app/bcc1/hoffmann/a.cc            | 2 +-
 app/bcc1/isr2/a.cc                | 2 +-
 app/bcc1/isr2/b.cc                | 2 +-
 app/bcc1/isr2/c.cc                | 2 +-
 app/bcc1/isr2/d.cc                | 2 +-
 app/bcc1/isr2/e.cc                | 2 +-
 app/bcc1/lukas/alarmstress.cc     | 1 -
 app/bcc1/resource1/a.cc           | 2 +-
 app/bcc1/resource1/b.cc           | 2 +-
 app/bcc1/resource1/c.cc           | 2 +-
 app/bcc1/resource1/d.cc           | 2 +-
 app/bcc1/resource1/e.cc           | 2 +-
 app/bcc1/resource1/f.cc           | 2 +-
 app/bcc1/resource1/g.cc           | 2 +-
 app/bcc1/resource1/h.cc           | 2 +-
 app/bcc1/resource1/j.cc           | 2 +-
 app/bcc1/resource1/k.cc           | 2 +-
 app/bcc1/resource2/a.cc           | 2 +-
 app/bcc1/sse1/a.cc                | 2 +-
 app/bcc1/sse1/b.cc                | 2 +-
 app/bcc1/sse1/c.cc                | 2 +-
 app/bcc1/task1/a.cc               | 2 +-
 app/bcc1/task1/b.cc               | 2 +-
 app/bcc1/task1/c.cc               | 2 +-
 app/bcc1/task1/d.cc               | 2 +-
 app/bcc1/task1/e.cc               | 2 +-
 app/bcc1/task1/f.cc               | 2 +-
 app/bcc1/task1/g.cc               | 2 +-
 app/bcc1/task2/a.cc               | 2 +-
 app/bcc1/task2/b.cc               | 2 +-
 app/bcc1/task2/c.cc               | 2 +-
 app/benchmark/a.cc                | 2 +-
 app/benchmark/coptermock/dosek.cc | 2 +-
 app/benchmark/zedboard/dosek.cc   | 2 +-
 app/ecc1/event1/a.cc              | 2 +-
 app/ecc1/event1/b.cc              | 2 +-
 app/ecc1/event1/c.cc              | 2 +-
 app/ecc1/event1/d.cc              | 2 +-
 app/ecc1/event1/e.cc              | 2 +-
 app/ecc1/eventisr1/a.cc           | 2 +-
 app/ecc1/eventisr1/b.cc           | 2 +-
 app/ecc1/eventisr1/c.cc           | 2 +-
 app/ecc1/eventisr1/d.cc           | 2 +-
 app/ecc1/eventisr1/e.cc           | 2 +-
 app/ecc1/eventisr1/f.cc           | 2 +-
 os/hooks.h                        | 4 ++--
 64 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/app/bcc1/alarm1/a.cc b/app/bcc1/alarm1/a.cc
index 75e102f..daf8c96 100644
--- a/app/bcc1/alarm1/a.cc
+++ b/app/bcc1/alarm1/a.cc
@@ -25,7 +25,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/b.cc b/app/bcc1/alarm1/b.cc
index 66b8938..9975ca0 100644
--- a/app/bcc1/alarm1/b.cc
+++ b/app/bcc1/alarm1/b.cc
@@ -27,7 +27,7 @@ TASK(H3) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/c.cc b/app/bcc1/alarm1/c.cc
index 3785af8..a325653 100644
--- a/app/bcc1/alarm1/c.cc
+++ b/app/bcc1/alarm1/c.cc
@@ -25,7 +25,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/d.cc b/app/bcc1/alarm1/d.cc
index 5720a14..6ddfed1 100644
--- a/app/bcc1/alarm1/d.cc
+++ b/app/bcc1/alarm1/d.cc
@@ -27,7 +27,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/e.cc b/app/bcc1/alarm1/e.cc
index 400de09..40016c4 100644
--- a/app/bcc1/alarm1/e.cc
+++ b/app/bcc1/alarm1/e.cc
@@ -39,7 +39,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/f.cc b/app/bcc1/alarm1/f.cc
index f7f6bdd..c2baa16 100644
--- a/app/bcc1/alarm1/f.cc
+++ b/app/bcc1/alarm1/f.cc
@@ -36,7 +36,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm3/a.cc b/app/bcc1/alarm3/a.cc
index 2041e28..bc41973 100644
--- a/app/bcc1/alarm3/a.cc
+++ b/app/bcc1/alarm3/a.cc
@@ -53,7 +53,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5[3]{}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/b.cc b/app/bcc1/alarm3/b.cc
index f32ed8b..7eb26c6 100644
--- a/app/bcc1/alarm3/b.cc
+++ b/app/bcc1/alarm3/b.cc
@@ -60,7 +60,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{<>}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/c.cc b/app/bcc1/alarm3/c.cc
index d94edd3..02e371d 100644
--- a/app/bcc1/alarm3/c.cc
+++ b/app/bcc1/alarm3/c.cc
@@ -64,7 +64,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{<><><>}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/d.cc b/app/bcc1/alarm3/d.cc
index ec2229a..2c4fae6 100644
--- a/app/bcc1/alarm3/d.cc
+++ b/app/bcc1/alarm3/d.cc
@@ -60,7 +60,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{<>}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/e.cc b/app/bcc1/alarm3/e.cc
index 22733a0..6650bf7 100644
--- a/app/bcc1/alarm3/e.cc
+++ b/app/bcc1/alarm3/e.cc
@@ -59,7 +59,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{+}3x");
     test_finish();
diff --git a/app/bcc1/complex1/a.cc b/app/bcc1/complex1/a.cc
index 72173de..50704d4 100644
--- a/app/bcc1/complex1/a.cc
+++ b/app/bcc1/complex1/a.cc
@@ -46,7 +46,7 @@ ISR2(ISR1) {
 
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex1/b.cc b/app/bcc1/complex1/b.cc
index 101551a..07418b4 100644
--- a/app/bcc1/complex1/b.cc
+++ b/app/bcc1/complex1/b.cc
@@ -43,7 +43,7 @@ ISR2(ISR1) {
 	test_trace('}');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex1/c.cc b/app/bcc1/complex1/c.cc
index 8e5a3df..b5f3d38 100644
--- a/app/bcc1/complex1/c.cc
+++ b/app/bcc1/complex1/c.cc
@@ -46,7 +46,7 @@ ISR2(ISR1) {
 	test_trace('}');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex1/d.cc b/app/bcc1/complex1/d.cc
index 44505b8..fb0edd9 100644
--- a/app/bcc1/complex1/d.cc
+++ b/app/bcc1/complex1/d.cc
@@ -52,7 +52,7 @@ ALARMCALLBACK(A1) {
 	test_trace('>');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex2/a.cc b/app/bcc1/complex2/a.cc
index b05b2cc..1e9dad0 100644
--- a/app/bcc1/complex2/a.cc
+++ b/app/bcc1/complex2/a.cc
@@ -55,7 +55,7 @@ ISR2(ISR1) {
 	test_trace(':');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("53.:-1");
 	test_finish();
diff --git a/app/bcc1/counter1/a.cc b/app/bcc1/counter1/a.cc
index 9cca2e3..e331951 100644
--- a/app/bcc1/counter1/a.cc
+++ b/app/bcc1/counter1/a.cc
@@ -61,7 +61,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1++2>>>23");
 	test_finish();
diff --git a/app/bcc1/depsvc/depsvc.cc b/app/bcc1/depsvc/depsvc.cc
index 27abdb2..dd79a78 100644
--- a/app/bcc1/depsvc/depsvc.cc
+++ b/app/bcc1/depsvc/depsvc.cc
@@ -61,6 +61,6 @@ TASK(CheckedTask) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	dep::release_all_CheckedObjects();
 }
diff --git a/app/bcc1/hoffmann/a.cc b/app/bcc1/hoffmann/a.cc
index 4bb31fd..04018a0 100644
--- a/app/bcc1/hoffmann/a.cc
+++ b/app/bcc1/hoffmann/a.cc
@@ -82,6 +82,6 @@ TASK(Handler13) {
 
 /****** EOT Task 13 ******/
 
-PreIdleHook() {
+void PreIdleHook() {
 	ShutdownMachine();
 }
diff --git a/app/bcc1/isr2/a.cc b/app/bcc1/isr2/a.cc
index 001fa31..0ddd222 100644
--- a/app/bcc1/isr2/a.cc
+++ b/app/bcc1/isr2/a.cc
@@ -41,7 +41,7 @@ ISR2(ISR1) {
 	test_trace(':');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/b.cc b/app/bcc1/isr2/b.cc
index 7c96be8..5ce6ec5 100644
--- a/app/bcc1/isr2/b.cc
+++ b/app/bcc1/isr2/b.cc
@@ -42,7 +42,7 @@ ISR2(ISR1) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/c.cc b/app/bcc1/isr2/c.cc
index d059412..ac8a97f 100644
--- a/app/bcc1/isr2/c.cc
+++ b/app/bcc1/isr2/c.cc
@@ -50,7 +50,7 @@ ISR2(ISR1) {
 	test_trace('T');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/d.cc b/app/bcc1/isr2/d.cc
index 79dd822..602650c 100644
--- a/app/bcc1/isr2/d.cc
+++ b/app/bcc1/isr2/d.cc
@@ -40,7 +40,7 @@ ISR2(ISR1) {
 	test_trace('!');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/e.cc b/app/bcc1/isr2/e.cc
index 2dcac16..7649ac2 100644
--- a/app/bcc1/isr2/e.cc
+++ b/app/bcc1/isr2/e.cc
@@ -43,7 +43,7 @@ ISR2(ISR1) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/lukas/alarmstress.cc b/app/bcc1/lukas/alarmstress.cc
index 32c2175..f9d3b1b 100644
--- a/app/bcc1/lukas/alarmstress.cc
+++ b/app/bcc1/lukas/alarmstress.cc
@@ -13,7 +13,6 @@ DeclareTask(Task2);
 DeclareTask(Task3);
 DeclareTask(Task4);
 DeclareCounter(C1);
-DeclareAlarm(A0);
 
 void os_main() {
     test_main();
diff --git a/app/bcc1/resource1/a.cc b/app/bcc1/resource1/a.cc
index 3ec257c..89ad08b 100644
--- a/app/bcc1/resource1/a.cc
+++ b/app/bcc1/resource1/a.cc
@@ -40,7 +40,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5<>1*");
 	test_finish();
diff --git a/app/bcc1/resource1/b.cc b/app/bcc1/resource1/b.cc
index a74eb41..75ef47e 100644
--- a/app/bcc1/resource1/b.cc
+++ b/app/bcc1/resource1/b.cc
@@ -44,7 +44,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("52-<>1*");
 	test_finish();
diff --git a/app/bcc1/resource1/c.cc b/app/bcc1/resource1/c.cc
index 3b2b2ab..1fc1b8c 100644
--- a/app/bcc1/resource1/c.cc
+++ b/app/bcc1/resource1/c.cc
@@ -47,7 +47,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5%<>1*%<>1*T");
 	test_finish();
diff --git a/app/bcc1/resource1/d.cc b/app/bcc1/resource1/d.cc
index 915f681..f653d7a 100644
--- a/app/bcc1/resource1/d.cc
+++ b/app/bcc1/resource1/d.cc
@@ -59,7 +59,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5<><>1T{}{}{}2X");
 	test_finish();
diff --git a/app/bcc1/resource1/e.cc b/app/bcc1/resource1/e.cc
index 5ab43b4..b667528 100644
--- a/app/bcc1/resource1/e.cc
+++ b/app/bcc1/resource1/e.cc
@@ -51,7 +51,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5<21>34.");
 	test_finish();
diff --git a/app/bcc1/resource1/f.cc b/app/bcc1/resource1/f.cc
index 4b601f9..4804e07 100644
--- a/app/bcc1/resource1/f.cc
+++ b/app/bcc1/resource1/f.cc
@@ -54,7 +54,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("4<{1}2>3.");
 	test_finish();
diff --git a/app/bcc1/resource1/g.cc b/app/bcc1/resource1/g.cc
index 6a38342..e58d8f6 100644
--- a/app/bcc1/resource1/g.cc
+++ b/app/bcc1/resource1/g.cc
@@ -50,7 +50,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5(2{}1:).");
 	test_finish();
diff --git a/app/bcc1/resource1/h.cc b/app/bcc1/resource1/h.cc
index 81257cc..386eff7 100644
--- a/app/bcc1/resource1/h.cc
+++ b/app/bcc1/resource1/h.cc
@@ -57,7 +57,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54{12}*|4[(1)2]*");
 	test_finish();
diff --git a/app/bcc1/resource1/j.cc b/app/bcc1/resource1/j.cc
index 7bcdfee..bc5d593 100644
--- a/app/bcc1/resource1/j.cc
+++ b/app/bcc1/resource1/j.cc
@@ -61,7 +61,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54{<1>3}*|4[(1)3]*");
 	test_finish();
diff --git a/app/bcc1/resource1/k.cc b/app/bcc1/resource1/k.cc
index 8647c78..d01c492 100644
--- a/app/bcc1/resource1/k.cc
+++ b/app/bcc1/resource1/k.cc
@@ -50,7 +50,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_start_check();
 	test_trace_assert((char *)"5{2}3T");
diff --git a/app/bcc1/resource2/a.cc b/app/bcc1/resource2/a.cc
index 4b4b01a..cab07e3 100644
--- a/app/bcc1/resource2/a.cc
+++ b/app/bcc1/resource2/a.cc
@@ -53,7 +53,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_start_check();
 	test_trace_assert((char *)"5..3*");
diff --git a/app/bcc1/sse1/a.cc b/app/bcc1/sse1/a.cc
index 6b01495..b51b5e9 100644
--- a/app/bcc1/sse1/a.cc
+++ b/app/bcc1/sse1/a.cc
@@ -37,7 +37,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54+4");
 	test_finish();
diff --git a/app/bcc1/sse1/b.cc b/app/bcc1/sse1/b.cc
index 37f1ff1..ebb55f5 100644
--- a/app/bcc1/sse1/b.cc
+++ b/app/bcc1/sse1/b.cc
@@ -55,7 +55,7 @@ TASK(H5) {
 	ChainTask(H1);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("51<bB>23|1bB2");
 	test_finish();
diff --git a/app/bcc1/sse1/c.cc b/app/bcc1/sse1/c.cc
index 9356d57..e506858 100644
--- a/app/bcc1/sse1/c.cc
+++ b/app/bcc1/sse1/c.cc
@@ -57,7 +57,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54{bB23}|4{bB3}");
 	test_finish();
diff --git a/app/bcc1/task1/a.cc b/app/bcc1/task1/a.cc
index 152ed17..771db77 100644
--- a/app/bcc1/task1/a.cc
+++ b/app/bcc1/task1/a.cc
@@ -47,7 +47,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("ab3c2");
 	test_finish();
diff --git a/app/bcc1/task1/b.cc b/app/bcc1/task1/b.cc
index 0fafe86..7827091 100644
--- a/app/bcc1/task1/b.cc
+++ b/app/bcc1/task1/b.cc
@@ -58,7 +58,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("cdf32");
 	test_finish();
diff --git a/app/bcc1/task1/c.cc b/app/bcc1/task1/c.cc
index db905f6..a367c66 100644
--- a/app/bcc1/task1/c.cc
+++ b/app/bcc1/task1/c.cc
@@ -56,7 +56,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1fX3");
 	test_finish();
diff --git a/app/bcc1/task1/d.cc b/app/bcc1/task1/d.cc
index 82b7f40..591b6c0 100644
--- a/app/bcc1/task1/d.cc
+++ b/app/bcc1/task1/d.cc
@@ -62,7 +62,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("12f5Y6X");
 	test_finish();
diff --git a/app/bcc1/task1/e.cc b/app/bcc1/task1/e.cc
index bc65946..eb7ad33 100644
--- a/app/bcc1/task1/e.cc
+++ b/app/bcc1/task1/e.cc
@@ -44,7 +44,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("a1CDL2CDL3CDLTB");
 	test_finish();
diff --git a/app/bcc1/task1/f.cc b/app/bcc1/task1/f.cc
index 7fed4be..2d946de 100644
--- a/app/bcc1/task1/f.cc
+++ b/app/bcc1/task1/f.cc
@@ -41,7 +41,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("134213421342T");
 	test_finish();
diff --git a/app/bcc1/task1/g.cc b/app/bcc1/task1/g.cc
index 1200e8f..4995483 100644
--- a/app/bcc1/task1/g.cc
+++ b/app/bcc1/task1/g.cc
@@ -48,7 +48,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("C32C32C321b3C321b3C3");
 	test_finish();
diff --git a/app/bcc1/task2/a.cc b/app/bcc1/task2/a.cc
index c89a645..6077649 100644
--- a/app/bcc1/task2/a.cc
+++ b/app/bcc1/task2/a.cc
@@ -36,7 +36,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("abc32");
 	test_finish();
diff --git a/app/bcc1/task2/b.cc b/app/bcc1/task2/b.cc
index 3ecc8c1..5ae93c3 100644
--- a/app/bcc1/task2/b.cc
+++ b/app/bcc1/task2/b.cc
@@ -44,7 +44,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	test_trace_assert("abc32");
 	test_finish();
 	ShutdownMachine();
diff --git a/app/bcc1/task2/c.cc b/app/bcc1/task2/c.cc
index cb2f216..3ecfc85 100644
--- a/app/bcc1/task2/c.cc
+++ b/app/bcc1/task2/c.cc
@@ -39,7 +39,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("abc32");
 	test_finish();
diff --git a/app/benchmark/a.cc b/app/benchmark/a.cc
index 2817109..ed0b4b9 100644
--- a/app/benchmark/a.cc
+++ b/app/benchmark/a.cc
@@ -43,7 +43,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	test_finish();
 	ShutdownMachine();
 }
diff --git a/app/benchmark/coptermock/dosek.cc b/app/benchmark/coptermock/dosek.cc
index 5783990..c2d7d42 100644
--- a/app/benchmark/coptermock/dosek.cc
+++ b/app/benchmark/coptermock/dosek.cc
@@ -148,6 +148,6 @@ TASK(CopterControlWatchdogTask) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	kout << "I" << round << endl;
 }
diff --git a/app/benchmark/zedboard/dosek.cc b/app/benchmark/zedboard/dosek.cc
index f85d1ca..f534e34 100644
--- a/app/benchmark/zedboard/dosek.cc
+++ b/app/benchmark/zedboard/dosek.cc
@@ -179,7 +179,7 @@ DeclareResource(RES_SCHEDULER);
 
 #include "dosek-tasks.cc"
 
-FaultDetectedHook() {
+void FaultDetectedHook() {
 	kout << "FFFFFF [[[[[[ DET DET DET ]]]]]]" << endl;
 	kout << "FL DET ";
 	switch (type) {
diff --git a/app/ecc1/event1/a.cc b/app/ecc1/event1/a.cc
index 73e64db..6b31fcd 100644
--- a/app/ecc1/event1/a.cc
+++ b/app/ecc1/event1/a.cc
@@ -48,7 +48,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1[&]}*");
 	test_finish();
diff --git a/app/ecc1/event1/b.cc b/app/ecc1/event1/b.cc
index 683fba8..38031b8 100644
--- a/app/ecc1/event1/b.cc
+++ b/app/ecc1/event1/b.cc
@@ -60,6 +60,6 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 
 }
diff --git a/app/ecc1/event1/c.cc b/app/ecc1/event1/c.cc
index d18ef61..a7979d3 100644
--- a/app/ecc1/event1/c.cc
+++ b/app/ecc1/event1/c.cc
@@ -43,7 +43,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1[{:}]");
 	test_finish();
diff --git a/app/ecc1/event1/d.cc b/app/ecc1/event1/d.cc
index defa5c9..40bba87 100644
--- a/app/ecc1/event1/d.cc
+++ b/app/ecc1/event1/d.cc
@@ -44,7 +44,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1.:{}");
 	test_finish();
diff --git a/app/ecc1/event1/e.cc b/app/ecc1/event1/e.cc
index 761c459..f8d753e 100644
--- a/app/ecc1/event1/e.cc
+++ b/app/ecc1/event1/e.cc
@@ -52,7 +52,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1{[.}{](.}{)");
 	test_finish();
diff --git a/app/ecc1/eventisr1/a.cc b/app/ecc1/eventisr1/a.cc
index 2d1c725..33d47aa 100644
--- a/app/ecc1/eventisr1/a.cc
+++ b/app/ecc1/eventisr1/a.cc
@@ -50,5 +50,5 @@ ISR2(ISR1) {
 	test_trace('!');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/b.cc b/app/ecc1/eventisr1/b.cc
index 18fe621..56184a5 100644
--- a/app/ecc1/eventisr1/b.cc
+++ b/app/ecc1/eventisr1/b.cc
@@ -50,5 +50,5 @@ ISR2(ISR1) {
 	test_trace('!');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/c.cc b/app/ecc1/eventisr1/c.cc
index 2ce0bbf..f8cc00a 100644
--- a/app/ecc1/eventisr1/c.cc
+++ b/app/ecc1/eventisr1/c.cc
@@ -55,5 +55,5 @@ ISR2(ISR1) {
 	SetEvent(H1, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/d.cc b/app/ecc1/eventisr1/d.cc
index e2fe7dd..a9e3f23 100644
--- a/app/ecc1/eventisr1/d.cc
+++ b/app/ecc1/eventisr1/d.cc
@@ -58,5 +58,5 @@ ISR2(ISR1) {
 	SetEvent(H3, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/e.cc b/app/ecc1/eventisr1/e.cc
index a856c2f..a81d358 100644
--- a/app/ecc1/eventisr1/e.cc
+++ b/app/ecc1/eventisr1/e.cc
@@ -56,7 +56,7 @@ ISR2(ISR1) {
 	SetEvent(H3, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("13.:{!}>");
 	test_finish();
diff --git a/app/ecc1/eventisr1/f.cc b/app/ecc1/eventisr1/f.cc
index 49f9891..3f42b26 100644
--- a/app/ecc1/eventisr1/f.cc
+++ b/app/ecc1/eventisr1/f.cc
@@ -59,7 +59,7 @@ ISR2(ISR1) {
 	SetEvent(H3, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("13.:{!}2>");
 	test_finish();
diff --git a/os/hooks.h b/os/hooks.h
index ca2820d..7b5210f 100644
--- a/os/hooks.h
+++ b/os/hooks.h
@@ -19,7 +19,7 @@ EXTERN_C_DECL void __OS_HOOK_PreIdleHook(void);
 EXTERN_C_DECL inlinehint void __OS_HOOK_DEFINED_PreIdleHook(void);
 
 #define PreIdleHook() \
-	void __OS_HOOK_DEFINED_PreIdleHook(void)
+	__OS_HOOK_DEFINED_PreIdleHook(void)
 
 
 
@@ -42,7 +42,7 @@ EXTERN_C_DECL void __OS_HOOK_FaultDetectedHook(DetectedFault_t, uint32_t, uint32
 EXTERN_C_DECL inlinehint void __OS_HOOK_DEFINED_FaultDetectedHook(DetectedFault_t, uint32_t, uint32_t);
 
 #define FaultDetectedHook() \
-	void __OS_HOOK_DEFINED_FaultDetectedHook(DetectedFault_t type, uint32_t arg1, uint32_t arg2)
+	__OS_HOOK_DEFINED_FaultDetectedHook(DetectedFault_t type, uint32_t arg1, uint32_t arg2)
 
 
 #define CALL_HOOK(NAME, ...) __OS_HOOK_ ## NAME (__VA_ARGS__)
-- 
GitLab