Fix the memheap_realloc issue

1 files changed, 7 insertions, 18 deletions

diff --git a/include/rtdef.h b/include/rtdef.h
index b2267292cc..7a983efb65 100644
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -145,17 +145,6 @@ typedef rt_base_t                       rt_off_t;       /**< Type for offset */
     #define ALIGN(n)                    __declspec(align(n))
     #define rt_inline                   static __inline
     #define RTT_API
-#elif defined (__TI_COMPILER_VERSION__)
-    /* The way that TI compiler set section is different from other(at least
-     * GCC and MDK) compilers. See ARM Optimizing C/C++ Compiler 5.9.3 for more
-     * details. */
-    #define SECTION(x)
-    #define UNUSED
-    #define ALIGN(n)
-    #define rt_inline                   static inline
-    #define RTT_API
-#else
-    #error not supported tool chain
 #endif
 
 /* event length */
@@ -175,6 +164,10 @@ typedef rt_base_t                       rt_off_t;       /**< Type for offset */
 #define RT_KERNEL_FREE(ptr)				rt_free(ptr)
 #endif
 
+#ifndef RT_KERNEL_REALLOC
+#define RT_KERNEL_REALLOC(ptr, size)	rt_realloc(ptr, size)
+#endif
+
 /**
  * @addtogroup Error
  */
@@ -596,11 +589,11 @@ typedef struct rt_messagequeue *rt_mq_t;
 struct rt_memheap_item
 {
     rt_uint32_t             magic;                      /**< magic number for memheap */
+    struct rt_memheap      *pool_ptr;                   /**< point of pool */
+
     struct rt_memheap_item *next;                       /**< next memheap item */
     struct rt_memheap_item *prev;                       /**< prev memheap item */
 
-    struct rt_memheap      *pool_ptr;                   /**< point of pool */
-
     struct rt_memheap_item *next_free;                  /**< next free memheap item */
     struct rt_memheap_item *prev_free;                  /**< prev free memheap item */
 };
@@ -679,6 +672,7 @@ enum rt_device_class_type
     RT_Device_Class_SPIDevice,                          /**< SPI device */
     RT_Device_Class_SDIO,                               /**< SDIO bus device */
     RT_Device_Class_PM,                                 /**< PM pseudo device */
+    RT_Device_Class_Miscellaneous,						/**< Miscellaneous device */
     RT_Device_Class_Unknown                             /**< unknown device */
 };
 
@@ -754,11 +748,6 @@ struct rt_device
     rt_size_t (*write)  (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size);
     rt_err_t  (*control)(rt_device_t dev, rt_uint8_t cmd, void *args);
 
-#ifdef RT_USING_DEVICE_SUSPEND
-    rt_err_t (*suspend) (rt_device_t dev);
-    rt_err_t (*resumed) (rt_device_t dev);
-#endif
-
     void                     *user_data;                /**< device private data */
 };