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

6 files changed, 10 insertions, 13 deletions

diff --git a/ports/ARM7-LPC214x/GCC/chcore.c b/ports/ARM7-LPC214x/GCC/chcore.c
index d562a1527..88f041ddd 100644
--- a/ports/ARM7-LPC214x/GCC/chcore.c
+++ b/ports/ARM7-LPC214x/GCC/chcore.c
@@ -69,7 +69,7 @@ void chSysUnlock(void) {
 }

 #endif

 

-void chSysSwitchI(struct Thread *otp, struct Thread *ntp) {

+void chSysSwitchI(Thread *otp, Thread *ntp) {

 

 #ifdef THUMB

   asm(".p2align 2,,                                             \n\t" \

diff --git a/ports/ARM7-LPC214x/GCC/chcore.h b/ports/ARM7-LPC214x/GCC/chcore.h
index 624386f15..75392b6b9 100644
--- a/ports/ARM7-LPC214x/GCC/chcore.h
+++ b/ports/ARM7-LPC214x/GCC/chcore.h
@@ -122,7 +122,7 @@ extern void chSysUnlock(void);
 void _IdleThread(void *p) __attribute__((noreturn));

 

 void chSysHalt(void);

-void chSysSwitchI(struct Thread *otp, struct Thread *ntp);

+void chSysSwitchI(Thread *otp, Thread *ntp);

 void chSysPuts(char *msg);

 void threadstart(void);

 

diff --git a/readme.txt b/readme.txt
index c3e734385..505bcfc7e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -40,6 +40,7 @@ AVR-AT90CANx-GCC       - Port on AVR AT90CAN128, not complete yet.
 *****************************************************************************

 

 *** 0.5.2 ***

+- Fixed a small problem in the main header file ch.h.

 - Small reordering in the fields of the Thread structure in order to optimize

   the space when messages are not used.

 

diff --git a/src/include/ch.h b/src/include/ch.h
index dcb486626..52d3dd772 100644
--- a/src/include/ch.h
+++ b/src/include/ch.h
@@ -27,9 +27,6 @@
 

 #define _CHIBIOS_RT_

 

-struct Thread;

-

-#ifndef __DOXIGEN__

 #ifndef _CHCONF_H_

 #include <chconf.h>

 #endif

@@ -38,19 +35,18 @@ struct Thread;
 #include <chtypes.h>

 #endif

 

+#ifndef _LISTS_H_

+#include "lists.h"

+#endif

+

 #ifndef _CHCORE_H_

 #include <chcore.h>

 #endif

-#endif /* __DOXIGEN__ */

 

-#ifndef _LISTS_H_

+#ifndef _DELTA_H_

 #include "delta.h"

 #endif

 

-#ifndef _LISTS_H_

-#include "lists.h"

-#endif

-

 #ifndef _SCHEDULER_H_

 #include "scheduler.h"

 #endif

diff --git a/src/include/lists.h b/src/include/lists.h
index 2a8f20e82..1038cb340 100644
--- a/src/include/lists.h
+++ b/src/include/lists.h
@@ -32,7 +32,7 @@ typedef struct Thread Thread;
 #define notempty(p)    ((p)->p_next != (Thread *)(p))

 

 /**

- * Generic threads FIFO queue header and element.

+ * Generic threads queue header and element.

  */

 typedef struct {

   /** Next \p Thread in the queue, in FIFO order.*/

diff --git a/src/templates/chcore.c b/src/templates/chcore.c
index 195113abf..2aaa0b06a 100644
--- a/src/templates/chcore.c
+++ b/src/templates/chcore.c
@@ -57,7 +57,7 @@ void chSysHalt(void) {
 /**

  * Context switch.

  */

-void chSysSwitchI(Context *oldp, Context *newp) {}

+void chSysSwitchI(Thread *otp, Thread *ntp) {}

 

 /**

  * Prints a message on the system console (if any).