git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6250 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 14 insertions, 14 deletions

diff --git a/test/test.c b/test/test.c
index 77759f5b8..58cad43c3 100644
--- a/test/test.c
+++ b/test/test.c
@@ -56,7 +56,7 @@ static ROMCONST struct testcase * ROMCONST *patterns[] = {
   NULL

 };

 

-static bool_t local_fail, global_fail;

+static bool local_fail, global_fail;

 static unsigned failpoint;

 static char tokens_buffer[MAX_TOKENS];

 static char *tokp;

@@ -154,7 +154,7 @@ void test_emit_token(char token) {
 /*

  * Assertions.

  */

-bool_t _test_fail(unsigned point) {

+bool _test_fail(unsigned point) {

 

   local_fail = TRUE;

   global_fail = TRUE;

@@ -162,14 +162,14 @@ bool_t _test_fail(unsigned point) {
   return TRUE;

 }

 

-bool_t _test_assert(unsigned point, bool_t condition) {

+bool _test_assert(unsigned point, bool condition) {

 

   if (!condition)

     return _test_fail(point);

   return FALSE;

 }

 

-bool_t _test_assert_sequence(unsigned point, char *expected) {

+bool _test_assert_sequence(unsigned point, char *expected) {

   char *cp = tokens_buffer;

   while (cp < tokp) {

     if (*cp++ != *expected++)

@@ -181,7 +181,7 @@ bool_t _test_assert_sequence(unsigned point, char *expected) {
   return FALSE;

 }

 

-bool_t _test_assert_time_window(unsigned point, systime_t start, systime_t end) {

+bool _test_assert_time_window(unsigned point, systime_t start, systime_t end) {

 

   return _test_assert(point, chVTIsSystemTimeWithin(start, end));

 }

@@ -255,7 +255,7 @@ systime_t test_wait_tick(void) {
 /**

  * @brief   Set to @p TRUE when the test timer reaches its deadline.

  */

-bool_t test_timer_done;

+bool test_timer_done;

 

 static virtual_timer_t vt;

 static void tmr(void *p) {

diff --git a/test/test.h b/test/test.h
index 136631d8f..1088d0517 100644
--- a/test/test.h
+++ b/test/test.h
@@ -84,10 +84,10 @@ extern "C" {
   void test_print(const char *msgp);

   void test_println(const char *msgp);

   void test_emit_token(char token);

-  bool_t _test_fail(unsigned point);

-  bool_t _test_assert(unsigned point, bool_t condition);

-  bool_t _test_assert_sequence(unsigned point, char *expected);

-  bool_t _test_assert_time_window(unsigned point, systime_t start, systime_t end);

+  bool _test_fail(unsigned point);

+  bool _test_assert(unsigned point, bool condition);

+  bool _test_assert_sequence(unsigned point, char *expected);

+  bool _test_assert_time_window(unsigned point, systime_t start, systime_t end);

   void test_terminate_threads(void);

   void test_wait_threads(void);

   systime_t test_wait_tick(void);

@@ -165,7 +165,7 @@ extern "C" {
 extern thread_t *threads[MAX_THREADS];

 extern union test_buffers test;

 extern void * ROMCONST wa[];

-extern bool_t test_timer_done;

+extern bool test_timer_done;

 #endif

 

 #endif /* _TEST_H_ */

diff --git a/test/testdyn.c b/test/testdyn.c
index 3eb3304d5..cd73e73ce 100644
--- a/test/testdyn.c
+++ b/test/testdyn.c
@@ -188,9 +188,9 @@ ROMCONST struct testcase testdyn2 = {
  * coverage.

  */

 

-static bool_t regfind(thread_t *tp) {

+static bool regfind(thread_t *tp) {

   thread_t *ftp;

-  bool_t found = FALSE;

+  bool found = false;

 

   ftp = chRegFirstThread();

   do {

diff --git a/test/testmtx.c b/test/testmtx.c
index cd10fa986..b40242d3d 100644
--- a/test/testmtx.c
+++ b/test/testmtx.c
@@ -431,7 +431,7 @@ static void mtx5_setup(void) {
 }

 

 static void mtx5_execute(void) {

-  bool_t b;

+  bool b;

   tprio_t prio;

 

   prio = chThdGetPriorityX();