Skip to content

Commit 1e36db0

Browse files
authored
Merge pull request #4742 from mysterywolf/rtusingheap
[kernel] rtthread.h 增加#ifdef RT_USING_HEAP 预编译
2 parents 63c7419 + 7171205 commit 1e36db0

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

include/rtthread.h

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ void rt_object_init(struct rt_object *object,
4848
enum rt_object_class_type type,
4949
const char *name);
5050
void rt_object_detach(rt_object_t object);
51+
#ifdef RT_USING_HEAP
5152
rt_object_t rt_object_allocate(enum rt_object_class_type type,
5253
const char *name);
5354
void rt_object_delete(rt_object_t object);
55+
#endif
5456
rt_bool_t rt_object_is_systemobject(rt_object_t object);
5557
rt_uint8_t rt_object_get_type(rt_object_t object);
5658
rt_object_t rt_object_find(const char *name, rt_uint8_t type);
@@ -90,12 +92,14 @@ void rt_timer_init(rt_timer_t timer,
9092
rt_tick_t time,
9193
rt_uint8_t flag);
9294
rt_err_t rt_timer_detach(rt_timer_t timer);
95+
#ifdef RT_USING_HEAP
9396
rt_timer_t rt_timer_create(const char *name,
9497
void (*timeout)(void *parameter),
9598
void *parameter,
9699
rt_tick_t time,
97100
rt_uint8_t flag);
98101
rt_err_t rt_timer_delete(rt_timer_t timer);
102+
#endif
99103
rt_err_t rt_timer_start(rt_timer_t timer);
100104
rt_err_t rt_timer_stop(rt_timer_t timer);
101105
rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg);
@@ -128,17 +132,18 @@ rt_err_t rt_thread_init(struct rt_thread *thread,
128132
rt_uint8_t priority,
129133
rt_uint32_t tick);
130134
rt_err_t rt_thread_detach(rt_thread_t thread);
135+
#ifdef RT_USING_HEAP
131136
rt_thread_t rt_thread_create(const char *name,
132137
void (*entry)(void *parameter),
133138
void *parameter,
134139
rt_uint32_t stack_size,
135140
rt_uint8_t priority,
136141
rt_uint32_t tick);
142+
rt_err_t rt_thread_delete(rt_thread_t thread);
143+
#endif
137144
rt_thread_t rt_thread_self(void);
138145
rt_thread_t rt_thread_find(char *name);
139146
rt_err_t rt_thread_startup(rt_thread_t thread);
140-
rt_err_t rt_thread_delete(rt_thread_t thread);
141-
142147
rt_err_t rt_thread_yield(void);
143148
rt_err_t rt_thread_delay(rt_tick_t tick);
144149
rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick);
@@ -228,10 +233,12 @@ rt_err_t rt_mp_init(struct rt_mempool *mp,
228233
rt_size_t size,
229234
rt_size_t block_size);
230235
rt_err_t rt_mp_detach(struct rt_mempool *mp);
236+
#ifdef RT_USING_HEAP
231237
rt_mp_t rt_mp_create(const char *name,
232238
rt_size_t block_count,
233239
rt_size_t block_size);
234240
rt_err_t rt_mp_delete(rt_mp_t mp);
241+
#endif
235242

236243
void *rt_mp_alloc(rt_mp_t mp, rt_int32_t time);
237244
void rt_mp_free(void *block);
@@ -303,8 +310,10 @@ rt_err_t rt_sem_init(rt_sem_t sem,
303310
rt_uint32_t value,
304311
rt_uint8_t flag);
305312
rt_err_t rt_sem_detach(rt_sem_t sem);
313+
#ifdef RT_USING_HEAP
306314
rt_sem_t rt_sem_create(const char *name, rt_uint32_t value, rt_uint8_t flag);
307315
rt_err_t rt_sem_delete(rt_sem_t sem);
316+
#endif
308317

309318
rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t time);
310319
rt_err_t rt_sem_trytake(rt_sem_t sem);
@@ -318,8 +327,10 @@ rt_err_t rt_sem_control(rt_sem_t sem, int cmd, void *arg);
318327
*/
319328
rt_err_t rt_mutex_init(rt_mutex_t mutex, const char *name, rt_uint8_t flag);
320329
rt_err_t rt_mutex_detach(rt_mutex_t mutex);
330+
#ifdef RT_USING_HEAP
321331
rt_mutex_t rt_mutex_create(const char *name, rt_uint8_t flag);
322332
rt_err_t rt_mutex_delete(rt_mutex_t mutex);
333+
#endif
323334

324335
rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t time);
325336
rt_err_t rt_mutex_trytake(rt_mutex_t mutex);
@@ -333,8 +344,10 @@ rt_err_t rt_mutex_control(rt_mutex_t mutex, int cmd, void *arg);
333344
*/
334345
rt_err_t rt_event_init(rt_event_t event, const char *name, rt_uint8_t flag);
335346
rt_err_t rt_event_detach(rt_event_t event);
347+
#ifdef RT_USING_HEAP
336348
rt_event_t rt_event_create(const char *name, rt_uint8_t flag);
337349
rt_err_t rt_event_delete(rt_event_t event);
350+
#endif
338351

339352
rt_err_t rt_event_send(rt_event_t event, rt_uint32_t set);
340353
rt_err_t rt_event_recv(rt_event_t event,
@@ -355,8 +368,10 @@ rt_err_t rt_mb_init(rt_mailbox_t mb,
355368
rt_size_t size,
356369
rt_uint8_t flag);
357370
rt_err_t rt_mb_detach(rt_mailbox_t mb);
371+
#ifdef RT_USING_HEAP
358372
rt_mailbox_t rt_mb_create(const char *name, rt_size_t size, rt_uint8_t flag);
359373
rt_err_t rt_mb_delete(rt_mailbox_t mb);
374+
#endif
360375

361376
rt_err_t rt_mb_send(rt_mailbox_t mb, rt_ubase_t value);
362377
rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
@@ -377,11 +392,13 @@ rt_err_t rt_mq_init(rt_mq_t mq,
377392
rt_size_t pool_size,
378393
rt_uint8_t flag);
379394
rt_err_t rt_mq_detach(rt_mq_t mq);
395+
#ifdef RT_USING_HEAP
380396
rt_mq_t rt_mq_create(const char *name,
381397
rt_size_t msg_size,
382398
rt_size_t max_msgs,
383399
rt_uint8_t flag);
384400
rt_err_t rt_mq_delete(rt_mq_t mq);
401+
#endif
385402

386403
rt_err_t rt_mq_send(rt_mq_t mq, const void *buffer, rt_size_t size);
387404
rt_err_t rt_mq_send_wait(rt_mq_t mq,
@@ -440,8 +457,10 @@ rt_err_t rt_device_register(rt_device_t dev,
440457
rt_uint16_t flags);
441458
rt_err_t rt_device_unregister(rt_device_t dev);
442459

460+
#ifdef RT_USING_HEAP
443461
rt_device_t rt_device_create(int type, int attach_size);
444462
void rt_device_destroy(rt_device_t device);
463+
#endif
445464

446465
rt_err_t
447466
rt_device_set_rx_indicate(rt_device_t dev,

0 commit comments

Comments
 (0)