Skip to content

Commit 5b4ed5f

Browse files
authored
Merge pull request #4562 from mysterywolf/ringblk
[ringblk_buf.c] NULL -> RT_NULL
2 parents c3978ed + 75ae0a5 commit 5b4ed5f

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

components/drivers/src/ringblk_buf.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,34 +50,34 @@ RTM_EXPORT(rt_rbb_init);
5050
* @param buf_size buffer size
5151
* @param blk_max_num max block number
5252
*
53-
* @return != NULL: ring block buffer object
54-
* NULL: create failed
53+
* @return != RT_NULL: ring block buffer object
54+
* RT_NULL: create failed
5555
*/
5656
rt_rbb_t rt_rbb_create(rt_size_t buf_size, rt_size_t blk_max_num)
5757
{
58-
rt_rbb_t rbb = NULL;
58+
rt_rbb_t rbb = RT_NULL;
5959
rt_uint8_t *buf;
6060
rt_rbb_blk_t blk_set;
6161

6262
rbb = (rt_rbb_t)rt_malloc(sizeof(struct rt_rbb));
6363
if (!rbb)
6464
{
65-
return NULL;
65+
return RT_NULL;
6666
}
6767

6868
buf = (rt_uint8_t *)rt_malloc(buf_size);
6969
if (!buf)
7070
{
7171
rt_free(rbb);
72-
return NULL;
72+
return RT_NULL;
7373
}
7474

7575
blk_set = (rt_rbb_blk_t)rt_malloc(sizeof(struct rt_rbb_blk) * blk_max_num);
7676
if (!blk_set)
7777
{
7878
rt_free(buf);
7979
rt_free(rbb);
80-
return NULL;
80+
return RT_NULL;
8181
}
8282

8383
rt_rbb_init(rbb, buf, buf_size, blk_set, blk_max_num);
@@ -116,7 +116,7 @@ static rt_rbb_blk_t find_empty_blk_in_set(rt_rbb_t rbb)
116116
}
117117
}
118118

119-
return NULL;
119+
return RT_NULL;
120120
}
121121

122122
/**
@@ -127,14 +127,14 @@ static rt_rbb_blk_t find_empty_blk_in_set(rt_rbb_t rbb)
127127
*
128128
* @note When your application need align access, please make the blk_szie is aligned.
129129
*
130-
* @return != NULL: allocated block
131-
* NULL: allocate failed
130+
* @return != RT_NULL: allocated block
131+
* RT_NULL: allocate failed
132132
*/
133133
rt_rbb_blk_t rt_rbb_blk_alloc(rt_rbb_t rbb, rt_size_t blk_size)
134134
{
135135
rt_base_t level;
136136
rt_size_t empty1 = 0, empty2 = 0;
137-
rt_rbb_blk_t head, tail, new_rbb = NULL;
137+
rt_rbb_blk_t head, tail, new_rbb = RT_NULL;
138138

139139
RT_ASSERT(rbb);
140140
RT_ASSERT(blk_size < (1L << 24));
@@ -178,7 +178,7 @@ rt_rbb_blk_t rt_rbb_blk_alloc(rt_rbb_t rbb, rt_size_t blk_size)
178178
else
179179
{
180180
/* no space */
181-
new_rbb = NULL;
181+
new_rbb = RT_NULL;
182182
}
183183
}
184184
else
@@ -202,7 +202,7 @@ rt_rbb_blk_t rt_rbb_blk_alloc(rt_rbb_t rbb, rt_size_t blk_size)
202202
else
203203
{
204204
/* no space */
205-
new_rbb = NULL;
205+
new_rbb = RT_NULL;
206206
}
207207
}
208208
}
@@ -217,7 +217,7 @@ rt_rbb_blk_t rt_rbb_blk_alloc(rt_rbb_t rbb, rt_size_t blk_size)
217217
}
218218
else
219219
{
220-
new_rbb = NULL;
220+
new_rbb = RT_NULL;
221221
}
222222

223223
rt_hw_interrupt_enable(level);
@@ -245,13 +245,13 @@ RTM_EXPORT(rt_rbb_blk_put);
245245
*
246246
* @param rbb ring block buffer object
247247
*
248-
* @return != NULL: block
249-
* NULL: get failed
248+
* @return != RT_NULL: block
249+
* RT_NULL: get failed
250250
*/
251251
rt_rbb_blk_t rt_rbb_blk_get(rt_rbb_t rbb)
252252
{
253253
rt_base_t level;
254-
rt_rbb_blk_t block = NULL;
254+
rt_rbb_blk_t block = RT_NULL;
255255
rt_slist_t *node;
256256

257257
RT_ASSERT(rbb);
@@ -271,7 +271,7 @@ rt_rbb_blk_t rt_rbb_blk_get(rt_rbb_t rbb)
271271
}
272272
}
273273
/* not found */
274-
block = NULL;
274+
block = RT_NULL;
275275

276276
__exit:
277277

@@ -364,7 +364,7 @@ rt_size_t rt_rbb_blk_queue_get(rt_rbb_t rbb, rt_size_t queue_data_len, rt_rbb_bl
364364
rt_base_t level;
365365
rt_size_t data_total_size = 0;
366366
rt_slist_t *node;
367-
rt_rbb_blk_t last_block = NULL, block;
367+
rt_rbb_blk_t last_block = RT_NULL, block;
368368

369369
RT_ASSERT(rbb);
370370
RT_ASSERT(blk_queue);
@@ -388,7 +388,7 @@ rt_size_t rt_rbb_blk_queue_get(rt_rbb_t rbb, rt_size_t queue_data_len, rt_rbb_bl
388388
else
389389
{
390390
/* the first block must be put status */
391-
last_block = NULL;
391+
last_block = RT_NULL;
392392
continue;
393393
}
394394
}
@@ -493,7 +493,7 @@ rt_size_t rt_rbb_next_blk_queue_len(rt_rbb_t rbb)
493493
rt_base_t level;
494494
rt_size_t data_len = 0;
495495
rt_slist_t *node;
496-
rt_rbb_blk_t last_block = NULL, block;
496+
rt_rbb_blk_t last_block = RT_NULL, block;
497497

498498
RT_ASSERT(rbb);
499499

@@ -510,7 +510,7 @@ rt_size_t rt_rbb_next_blk_queue_len(rt_rbb_t rbb)
510510
if (last_block->status != RT_RBB_BLK_PUT)
511511
{
512512
/* the first block must be put status */
513-
last_block = NULL;
513+
last_block = RT_NULL;
514514
continue;
515515
}
516516
}

0 commit comments

Comments
 (0)