projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: coding style fixes (structure naming)
[bertos.git]
/
bertos
/
kern
/
signal_test.c
diff --git
a/bertos/kern/signal_test.c
b/bertos/kern/signal_test.c
index ea8c76e26fde6f9768810ad48e6e627ef50de091..6734347b0e345089a0c7dbf8ff725b0f9023027f 100644
(file)
--- a/
bertos/kern/signal_test.c
+++ b/
bertos/kern/signal_test.c
@@
-32,7
+32,6
@@
*
* \brief Signals test.
*
*
* \brief Signals test.
*
- * \version $Id$
*
* \author Daniele Basile <asterix@develer.com>
*
*
* \author Daniele Basile <asterix@develer.com>
*
@@
-76,29
+75,43
@@
sigmask_t sig_to_slave;
* These macros generate the code needed to create the test process functions.
*/
#define PROC_TEST_SLAVE(index, signal) \
* These macros generate the code needed to create the test process functions.
*/
#define PROC_TEST_SLAVE(index, signal) \
-static void
NORETURN
proc_signalTest##index(void) \
+static void proc_signalTest##index(void) \
{ \
{ \
- for(;;) \
- { \
- kprintf("> Slave [%d]: Wait signal [%d]\n", index, signal); \
- sig_wait(signal); \
- kprintf("> Slave [%d]: send signal [%d]\n", index, signal); \
- sig_signal(proc_currentUserData(), signal); \
- } \
-} \
+ kputs("> Slave [" #index "]: Wait signal [" #signal "]\n"); \
+ sig_wait(signal); \
+ kputs("> Slave [" #index "]: send signal [" #signal "]\n"); \
+ sig_send(proc_currentUserData(), signal); \
+}
#define MAIN_CHECK_SIGNAL(index, slave) \
do { \
kprintf("> Main: send signal [%d]\n", test_signal[index]); \
#define MAIN_CHECK_SIGNAL(index, slave) \
do { \
kprintf("> Main: send signal [%d]\n", test_signal[index]); \
- sig_s
ignal
(slave, test_signal[index]); \
+ sig_s
end
(slave, test_signal[index]); \
kprintf("> Main: wait signal [%d]\n", test_signal[index]); \
sig_wait(test_signal[index]); \
count++; \
} while(0) \
kprintf("> Main: wait signal [%d]\n", test_signal[index]); \
sig_wait(test_signal[index]); \
count++; \
} while(0) \
-#define PROC_TEST_SLAVE_STACK(index) static cpu_stack_t proc_signal_test##index##_stack[700 / sizeof(cpu_stack_t)];
+#if CONFIG_KERN_HEAP
+
+#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_signalTest##index, master_process, KERN_MINSTACKSIZE * 2, NULL)
+
+#else
+
+#define PROC_TEST_SLAVE_STACK(index) PROC_DEFINE_STACK(proc_signal_test##index##_stack, KERN_MINSTACKSIZE * 2);
#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_signalTest##index, master_process, sizeof(proc_signal_test##index##_stack), proc_signal_test##index##_stack)
#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_signalTest##index, master_process, sizeof(proc_signal_test##index##_stack), proc_signal_test##index##_stack)
+PROC_TEST_SLAVE_STACK(0)
+PROC_TEST_SLAVE_STACK(1)
+PROC_TEST_SLAVE_STACK(2)
+PROC_TEST_SLAVE_STACK(3)
+PROC_TEST_SLAVE_STACK(4)
+PROC_TEST_SLAVE_STACK(5)
+PROC_TEST_SLAVE_STACK(6)
+PROC_TEST_SLAVE_STACK(7)
+
+#endif
+
// Generate the code for signal test.
PROC_TEST_SLAVE(0, SIG_USER0)
PROC_TEST_SLAVE(1, SIG_USER1)
// Generate the code for signal test.
PROC_TEST_SLAVE(0, SIG_USER0)
PROC_TEST_SLAVE(1, SIG_USER1)
@@
-109,15
+122,6
@@
PROC_TEST_SLAVE(5, SIG_SYSTEM5)
PROC_TEST_SLAVE(6, SIG_SYSTEM6)
PROC_TEST_SLAVE(7, SIG_SINGLE)
PROC_TEST_SLAVE(6, SIG_SYSTEM6)
PROC_TEST_SLAVE(7, SIG_SINGLE)
-PROC_TEST_SLAVE_STACK(0)
-PROC_TEST_SLAVE_STACK(1)
-PROC_TEST_SLAVE_STACK(2)
-PROC_TEST_SLAVE_STACK(3)
-PROC_TEST_SLAVE_STACK(4)
-PROC_TEST_SLAVE_STACK(5)
-PROC_TEST_SLAVE_STACK(6)
-PROC_TEST_SLAVE_STACK(7)
-
/**
* Run signal test
*/
/**
* Run signal test
*/
@@
-166,12
+170,6
@@
int signal_testSetup(void)
{
kdbg_init();
{
kdbg_init();
- #if CONFIG_KERN_PREEMPT
- kprintf("Init Interrupt (preempt mode)..");
- irq_init();
- kprintf("Done.\n");
- #endif
-
kprintf("Init Timer..");
timer_init();
kprintf("Done.\n");
kprintf("Init Timer..");
timer_init();
kprintf("Done.\n");