aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-03 13:35:40 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-03 13:35:40 +0000
commit6db8c459a58514b2c49fbe94b9ff73aaf7ccba5f (patch)
tree741d69a111c0c8e90691e899f489642706940255
parentfa8b45cc5be41840b99d4a5468108568f93513c1 (diff)
downloadChibiOS-6db8c459a58514b2c49fbe94b9ff73aaf7ccba5f.tar.gz
ChibiOS-6db8c459a58514b2c49fbe94b9ff73aaf7ccba5f.tar.bz2
ChibiOS-6db8c459a58514b2c49fbe94b9ff73aaf7ccba5f.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6256 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/nil/NIL-STM32F051-DISCOVERY/main.c8
-rw-r--r--os/nil/include/nil.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/main.c b/demos/nil/NIL-STM32F051-DISCOVERY/main.c
index f601b10a4..2600550bb 100644
--- a/demos/nil/NIL-STM32F051-DISCOVERY/main.c
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/main.c
@@ -55,10 +55,10 @@ THD_FUNCTION(Thread2, arg) {
* Threads static table, one entry per thread. The number of entries must
* match NIL_CFG_NUM_THREADS.
*/
-NIL_THREADS_TABLE_BEGIN()
- NIL_THREADS_TABLE_ENTRY("thread1", Thread1, NULL, waThread1, sizeof(waThread1))
- NIL_THREADS_TABLE_ENTRY("thread2", Thread2, NULL, waThread2, sizeof(waThread2))
-NIL_THREADS_TABLE_END()
+THD_TABLE_BEGIN
+ THD_TABLE_ENTRY("thread1", Thread1, NULL, waThread1, sizeof(waThread1))
+ THD_TABLE_ENTRY("thread2", Thread2, NULL, waThread2, sizeof(waThread2))
+THD_TABLE_END
/*
* Application entry point.
diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h
index 6a831d880..5f4b09768 100644
--- a/os/nil/include/nil.h
+++ b/os/nil/include/nil.h
@@ -297,19 +297,19 @@ typedef struct {
/**
* @brief Start of user threads table.
*/
-#define NIL_THREADS_TABLE_BEGIN() \
+#define THD_TABLE_BEGIN \
const thread_config_t nil_thd_configs[NIL_CFG_NUM_THREADS + 1] = {
/**
* @brief Entry of user threads table
*/
-#define NIL_THREADS_TABLE_ENTRY(name, funcp, arg, wap, size) \
+#define THD_TABLE_ENTRY(name, funcp, arg, wap, size) \
{name, funcp, arg, wap, size},
/**
* @brief End of user threads table.
*/
-#define NIL_THREADS_TABLE_END() \
+#define THD_TABLE_END \
{"idle", 0, NULL, NULL, 0} \
};
/** @} */