Tests done. Some code cleanup done.

shkolnick-kun · Jul 3, 2015 · ebaf22d · ebaf22d
1 parent bf50352
commit ebaf22d
Show file tree

Hide file tree

Showing 4 changed files with 323 additions and 333 deletions.
diff --git a/tests/arch/cm0/gcc/config.h b/tests/arch/cm0/gcc/config.h
@@ -1,114 +1,110 @@
-#ifndef _CONFIG_H_
-// Example config file
-#define _CONFIG_H_
-///==================================================================
-///               Don't edit this part of the file!!!
-///==================================================================
-
-#ifndef __ASSEMBLER__
-
-#define SYSCALL_TABLE(a) const code_t a
-#define SYSCALL_TABLE_READ(a) a
-
-#ifndef NOP
-#define NOP() __asm__ __volatile__ ("nop":::)
-#endif
-
-typedef unsigned long stack_t;
-
-///==================================================================
-///               Edit this part carefully!!!
-///==================================================================
-
-// Max priority levels are defined by index_t,
-// you must specify BITS_IN_INDEX_T to show
-// how many levels you actually are going to use.
-// data types
-typedef unsigned long index_t;
-#define BITS_IN_INDEX_T (32)
-
-// Even if index_t is unsigned long long,
-// there will be only 64 priority levels available,
-// so unsigned char is always enough.
-typedef unsigned char prio_t;
-
-// unsigned char is enough.
-typedef unsigned char flag_t;
-
-// unsigned char is enough.
-typedef unsigned char status_t;
-
-typedef unsigned long count_t;
-
-typedef volatile unsigned long timer_t;
-
-// Unsigned char is enough.
-// There is no reason to make it bigger.
-typedef unsigned char bool_t;
-
-// Unsigned char is enough.
-// There is no reason to make it bigger.
-typedef unsigned char syscall_t;
-
-typedef unsigned long ipc_data_t;
-///=================================================================
-//     BuguRTOS behavior compilation flags, edit carefully!!!
-///=================================================================
-#define CONFIG_USE_O1_SEARCH
-#define CONFIG_USE_HIGHEST_LOCKER
-#define CONFIG_HARD_RT
-#define CONFIG_PREEMPTIVE_KERNEL
-
-///=================================================================
-///     Project specific stuff, you are welcome to edit it!!!
-///=================================================================
-#define CONFIG_TEST  //This is test project.
-#define STM32F0
-#include <libopencmsis/core_cm3.h>
-
-// These macros needed to interface cstartup code.
-#define SYSTEM_TIMER_ISR 	sys_tick_handler
-#define SYSCALL_ISR			pend_sv_handler
-
-#define CONFIG_FCPU_HZ 			( 32000000ul )
-#define CONFIG_FSYSTICK_HZ 		( 1000ul )
-
-#define CONFIG_PRIO_BITS        2  // Used upper priority bits
-#define CONFIG_SYSCALL_PRIO 	3 // SysCall priority
-#define CONFIG_SCHED_PRIO 		3 // Scheduler priority
-
-#define PROC_STACK_SIZE 128
-
-#define LOWEST (BITS_IN_INDEX_T - 1)
-
-#define SVH0 (code_t)0
-#define RSH0 (code_t)0
-
-#define SVH1 (code_t)0
-#define RSH1 (code_t)0
-
-#define SVH2 (code_t)0
-#define RSH2 (code_t)0
-
-#define SVH3 (code_t)0
-#define RSH3 (code_t)0
-
-#define SVH4 (code_t)0
-#define RSH4 (code_t)0
-
-#define SVH5 (code_t)0
-#define RSH5 (code_t)0
-
-///==================================================================
-///               Don't edit this part of the file!!!
-///==================================================================
-
-extern void kernel_preemt_hook(void);
+#ifndef _CONFIG_H_
+// Example config file
+#define _CONFIG_H_
+///==================================================================
+///               Don't edit this part of the file!!!
+///==================================================================
+
+#ifndef __ASSEMBLER__
+
+#define SYSCALL_TABLE(a) const code_t a
+#define SYSCALL_TABLE_READ(a) a
+
+#ifndef NOP
+#define NOP() __asm__ __volatile__ ("nop":::)
+#endif
+
+typedef unsigned long stack_t;
+
+///==================================================================
+///               Edit this part carefully!!!
+///==================================================================
+
+// Max priority levels are defined by index_t,
+// you must specify BITS_IN_INDEX_T to show
+// how many levels you actually are going to use.
+// data types
+typedef unsigned long index_t;
+#define BITS_IN_INDEX_T (32)
+
+// Even if index_t is unsigned long long,
+// there will be only 64 priority levels available,
+// so unsigned char is always enough.
+typedef unsigned char prio_t;
+
+// unsigned char is enough.
+typedef unsigned char flag_t;
+
+typedef unsigned long count_t;
+
+typedef volatile unsigned long timer_t;
+
+// Unsigned char is enough.
+// There is no reason to make it bigger.
+typedef unsigned char bool_t;
+
+// Unsigned char is enough.
+// There is no reason to make it bigger.
+typedef unsigned char syscall_t;
+
+typedef unsigned long ipc_data_t;
+///=================================================================
+//     BuguRTOS behavior compilation flags, edit carefully!!!
+///=================================================================
+#define CONFIG_USE_O1_SEARCH
+#define CONFIG_USE_HIGHEST_LOCKER
+#define CONFIG_HARD_RT
+#define CONFIG_PREEMPTIVE_KERNEL
+
+///=================================================================
+///     Project specific stuff, you are welcome to edit it!!!
+///=================================================================
+#define STM32F0
+#include <libopencmsis/core_cm3.h>
+
+// These macros needed to interface cstartup code.
+#define SYSTEM_TIMER_ISR 	sys_tick_handler
+#define SYSCALL_ISR			pend_sv_handler
+
+#define CONFIG_FCPU_HZ 			( 32000000ul )
+#define CONFIG_FSYSTICK_HZ 		( 1000ul )
+
+#define CONFIG_PRIO_BITS        2  // Used upper priority bits
+#define CONFIG_SYSCALL_PRIO 	3 // SysCall priority
+#define CONFIG_SCHED_PRIO 		3 // Scheduler priority
+
+#define PROC_STACK_SIZE 128
+
+#define LOWEST (BITS_IN_INDEX_T - 1)
+
+#define SVH0 (code_t)0
+#define RSH0 (code_t)0
+
+#define SVH1 (code_t)0
+#define RSH1 (code_t)0
+
+#define SVH2 (code_t)0
+#define RSH2 (code_t)0
+
+#define SVH3 (code_t)0
+#define RSH3 (code_t)0
+
+#define SVH4 (code_t)0
+#define RSH4 (code_t)0
+
+#define SVH5 (code_t)0
+#define RSH5 (code_t)0
+
+///==================================================================
+///               Don't edit this part of the file!!!
+///==================================================================
+
+extern void kernel_preemt_hook(void);
 #ifdef CONFIG_PREEMPTIVE_KERNEL
 #define KERNEL_PREEMPT() enable_interrupts(); disable_interrupts(); kernel_preemt_hook()
 #else // CONFIG_PREEMPTIVE_KERNEL
 #define KERNEL_PREEMPT() kernel_preemt_hook()
-#endif // CONFIG_PREEMPTIVE_KERNEL
-
-#endif //__ASSEMBLER__
-#endif //_CONFIG_H_
+#endif // CONFIG_PREEMPTIVE_KERNEL
+
+#endif //__ASSEMBLER__
+#endif //_CONFIG_H_
diff --git a/tests/arch/cm0/gcc/sched/sched.layout b/tests/arch/cm0/gcc/sched/sched.layout
@@ -38,7 +38,7 @@
 		<Cursor position="6417" topLine="68" />
 	</File>
 	<File name="../config.h" open="0" top="0" tabpos="1">
-		<Cursor position="1442" topLine="31" />
+		<Cursor position="1073" topLine="44" />
 	</File>
 	<File name="../test_func.c" open="0" top="0" tabpos="1">
 		<Cursor position="820" topLine="28" />