Tree reorganization.

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

1 files changed, 27 insertions, 29 deletions

diff --git a/os/rt/include/chregistry.h b/os/rt/include/chregistry.h
index a5d13b798..39029b195 100644
--- a/os/rt/include/chregistry.h
+++ b/os/rt/include/chregistry.h
@@ -50,26 +50,24 @@
  * @brief   ChibiOS/RT memory signature record.

  */

 typedef struct {

-  char      ch_identifier[4];       /**< @brief Always set to "main".       */

-  uint8_t   ch_zero;                /**< @brief Must be zero.               */

-  uint8_t   ch_size;                /**< @brief Size of this structure.     */

-  uint16_t  ch_version;             /**< @brief Encoded ChibiOS/RT version. */

-  uint8_t   ch_ptrsize;             /**< @brief Size of a pointer.          */

-  uint8_t   ch_timesize;            /**< @brief Size of a @p systime_t.     */

-  uint8_t   ch_threadsize;          /**< @brief Size of a @p thread_t.      */

-  uint8_t   cf_off_prio;            /**< @brief Offset of @p p_prio field.  */

-  uint8_t   cf_off_ctx;             /**< @brief Offset of @p p_ctx field.   */

-  uint8_t   cf_off_newer;           /**< @brief Offset of @p p_newer field. */

-  uint8_t   cf_off_older;           /**< @brief Offset of @p p_older field. */

-  uint8_t   cf_off_name;            /**< @brief Offset of @p p_name field.  */

-  uint8_t   cf_off_stklimit;        /**< @brief Offset of @p p_stklimit

-                                                field.                      */

-  uint8_t   cf_off_state;           /**< @brief Offset of @p p_state field. */

-  uint8_t   cf_off_flags;           /**< @brief Offset of @p p_flags field. */

-  uint8_t   cf_off_refs;            /**< @brief Offset of @p p_refs field.  */

-  uint8_t   cf_off_preempt;         /**< @brief Offset of @p p_preempt

-                                                field.                      */

-  uint8_t   cf_off_time;            /**< @brief Offset of @p p_time field.  */

+  char      identifier[4];          /**< @brief Always set to "main".       */

+  uint8_t   zero;                   /**< @brief Must be zero.               */

+  uint8_t   size;                   /**< @brief Size of this structure.     */

+  uint16_t  version;                /**< @brief Encoded ChibiOS/RT version. */

+  uint8_t   ptrsize;                /**< @brief Size of a pointer.          */

+  uint8_t   timesize;               /**< @brief Size of a @p systime_t.     */

+  uint8_t   threadsize;             /**< @brief Size of a @p thread_t.      */

+  uint8_t   off_prio;               /**< @brief Offset of @p prio field.    */

+  uint8_t   off_ctx;                /**< @brief Offset of @p ctx field.     */

+  uint8_t   off_newer;              /**< @brief Offset of @p newer field.   */

+  uint8_t   off_older;              /**< @brief Offset of @p older field.   */

+  uint8_t   off_name;               /**< @brief Offset of @p name field.    */

+  uint8_t   off_stklimit;           /**< @brief Offset of @p stklimit field.*/

+  uint8_t   off_state;              /**< @brief Offset of @p state field.   */

+  uint8_t   off_flags;              /**< @brief Offset of @p flags field.   */

+  uint8_t   off_refs;               /**< @brief Offset of @p refs field.    */

+  uint8_t   off_preempt;            /**< @brief Offset of @p preempt field. */

+  uint8_t   off_time;               /**< @brief Offset of @p time field.    */

 } chdebug_t;

 

 /*===========================================================================*/

@@ -83,8 +81,8 @@ typedef struct {
  * @param[in] tp        thread to remove from the registry

  */

 #define REG_REMOVE(tp) {                                                    \

-  (tp)->p_older->p_newer = (tp)->p_newer;                                   \

-  (tp)->p_newer->p_older = (tp)->p_older;                                   \

+  (tp)->older->newer = (tp)->newer;                                         \

+  (tp)->newer->older = (tp)->older;                                         \

 }

 

 /**

@@ -94,10 +92,10 @@ typedef struct {
  * @param[in] tp        thread to add to the registry

  */

 #define REG_INSERT(tp) {                                                    \

-  (tp)->p_newer = (thread_t *)&ch.rlist;                                    \

-  (tp)->p_older = ch.rlist.r_older;                                         \

-  (tp)->p_older->p_newer = (tp);                                            \

-  ch.rlist.r_older = (tp);                                                  \

+  (tp)->newer = (thread_t *)&ch.rlist;                                      \

+  (tp)->older = ch.rlist.older;                                           \

+  (tp)->older->newer = (tp);                                                \

+  ch.rlist.older = (tp);                                                  \

 }

 

 /*===========================================================================*/

@@ -132,7 +130,7 @@ extern "C" {
 static inline void chRegSetThreadName(const char *name) {

 

 #if CH_CFG_USE_REGISTRY == TRUE

-  ch.rlist.r_current->p_name = name;

+  ch.rlist.current->name = name;

 #else

   (void)name;

 #endif

@@ -152,7 +150,7 @@ static inline void chRegSetThreadName(const char *name) {
 static inline const char *chRegGetThreadNameX(thread_t *tp) {

 

 #if CH_CFG_USE_REGISTRY == TRUE

-  return tp->p_name;

+  return tp->name;

 #else

   (void)tp;

   return NULL;

@@ -172,7 +170,7 @@ static inline const char *chRegGetThreadNameX(thread_t *tp) {
 static inline void chRegSetThreadNameX(thread_t *tp, const char *name) {

 

 #if CH_CFG_USE_REGISTRY == TRUE

-  tp->p_name = name;

+  tp->name = name;

 #else

   (void)tp;

   (void)name;