Skip to content

Commit aca51c8

Browse files
committed
remove trailing spaces
1 parent fd38cfe commit aca51c8

File tree

3 files changed

+70
-70
lines changed

3 files changed

+70
-70
lines changed

bsp/stm32f10x/applications/systick_count_asm.s

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@ SYSTICK_RELOAD EQU 0xE000E014 ;
1111
IMPORT clk_elapse
1212
IMPORT start_value
1313
IMPORT end_value
14-
14+
1515
;/*
1616
; * void start_count(void);
1717
; start_value = tick->VAL;
1818
; */
1919
start_count PROC
2020
EXPORT start_count
21-
22-
21+
22+
2323
LDR r1, =start_value
2424
LDR r0, =SYSTICK_CURRENT
2525
LDR r0, [r0]
26-
26+
2727
STR r0, [r1]
28-
28+
2929
BX lr
30-
30+
3131
ENDP
32-
33-
32+
33+
3434
stop_count PROC
3535
;EXPORT stop_count
36-
36+
3737
LDR r0, =SYSTICK_CURRENT
3838
LDR r0, [r0]
39-
39+
4040
LDR r1, =end_value
4141
STR r0, [r1]
42-
42+
4343
BX lr
44-
44+
4545
ENDP
4646

4747

4848
END ;end of this file
49-
49+

bsp/stm32f10x/applications/test_schedule.c

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,37 @@ void test_schedule_init(void)
2424
{
2525
rt_kprintf("create Mutex_Control failed\n");
2626
}
27-
27+
2828
sem_test = rt_sem_create("sem_test", 0, RT_TEST_IPC_TYPE);
2929
if (sem_test == RT_NULL)
3030
{
3131
rt_kprintf("create sem_test failed\n");
3232
}
33-
33+
3434
mutex_test = rt_mutex_create("mutex_test", RT_TEST_IPC_TYPE);
3535
if (mutex_test == RT_NULL)
3636
{
3737
rt_kprintf("create mutex_test failed\n");
3838
}
39-
39+
4040
event_test = rt_event_create("event_test", RT_TEST_IPC_TYPE);
4141
if (event_test == RT_NULL)
4242
{
4343
rt_kprintf("create event_test failed\n");
4444
}
45-
45+
4646
mailbox_test = rt_mb_create("mailbox_test", RT_TEST_IPC_SIZE, RT_TEST_IPC_TYPE);
4747
if (mailbox_test == RT_NULL)
4848
{
4949
rt_kprintf("create mailbox_test failed\n");
5050
}
51-
51+
5252
mq_test = rt_mq_create("mq_test",RT_TEST_SINGLE_IPC_SIZE,RT_TEST_IPC_SIZE, RT_TEST_IPC_TYPE);
5353
if (mq_test == RT_NULL)
5454
{
5555
rt_kprintf("create mq_test failed\n");
5656
}
57-
57+
5858
// //add for Thread_IPC
5959

6060
// //初始化线程
@@ -65,8 +65,8 @@ void test_schedule_init(void)
6565
// rt_thread_startup(thread_IPC_TCB);
6666
#endif
6767

68-
69-
68+
69+
7070
#ifdef RT_TEST_NEED_THREAD_A
7171
//add for Thread_A
7272

@@ -107,7 +107,7 @@ void test_schedule_init(void)
107107
int index;
108108
int priority=5;
109109
char name[16];
110-
110+
111111
thread_DUMMY_TCB = (rt_thread_t*)rt_malloc(sizeof(rt_thread_t)*RT_TEST_DUMMY_THREAD_NUM);
112112
for(index=0; index<RT_TEST_DUMMY_THREAD_NUM; index++)
113113
{
@@ -161,21 +161,21 @@ void thread_A_entry(void* parameter)
161161
sem_Rx_TCB = rt_thread_create("sem_Rx_TCB",
162162
thread_sem_RX_entry, RT_NULL,
163163
512, THREAD_IPC_RX_PRIORITY, THREAD_IPC_RX_TIME_SLICE);
164-
164+
165165

166166
rt_kprintf("\n");
167167
/* 先要开启收TCB */
168168
if(sem_Rx_TCB != RT_NULL)
169169
{
170170
rt_thread_startup(sem_Rx_TCB);
171171
}
172-
173-
172+
173+
174174
if(sem_Tx_TCB != RT_NULL)
175175
{
176176
rt_thread_startup(sem_Tx_TCB);
177177
}
178-
178+
179179
//for sem
180180
{
181181
rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
@@ -187,7 +187,7 @@ void thread_A_entry(void* parameter)
187187
//for mutex
188188
rt_sem_init(Mutex_Control, "Mutex_Control",0, RT_TEST_IPC_TYPE);
189189
rt_sem_release(Mutex_Control);
190-
rt_kprintf("\n");
190+
rt_kprintf("\n");
191191

192192
//for Mutex
193193
/* 首先创建2个mutex线程 */
@@ -196,7 +196,7 @@ void thread_A_entry(void* parameter)
196196
512, THREAD_IPC_RX_PRIORITY, THREAD_IPC_TX_TIME_SLICE);
197197
mutex_Rx_TCB = rt_thread_create("mutex_Rx_TCB",
198198
thread_mutex_RX_entry, RT_NULL,
199-
512, THREAD_IPC_TX_PRIORITY, THREAD_IPC_RX_TIME_SLICE);
199+
512, THREAD_IPC_TX_PRIORITY, THREAD_IPC_RX_TIME_SLICE);
200200
//对于mutex ,先启动Tx,占用资源
201201
if(mutex_Tx_TCB != RT_NULL)
202202
{
@@ -207,19 +207,19 @@ void thread_A_entry(void* parameter)
207207
{
208208
rt_thread_startup(mutex_Rx_TCB);
209209
}
210-
210+
211211
{
212212
rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
213213
rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
214214
}
215-
215+
216216
rt_kprintf("mutex test Done\n");
217217
rt_thread_delay(100);//等待删除退出的线程
218218
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
219219
//for event
220220
rt_sem_init(Mutex_Control, "Mutex_Control",0, RT_TEST_IPC_TYPE);
221221
rt_sem_release(Mutex_Control);
222-
rt_kprintf("\n");
222+
rt_kprintf("\n");
223223

224224
/* 首先创建2个event线程 */
225225
event_Tx_TCB = rt_thread_create("event_Tx_TCB",
@@ -228,11 +228,11 @@ void thread_A_entry(void* parameter)
228228
event_Rx_TCB = rt_thread_create("event_Rx_TCB",
229229
thread_event_RX_entry, RT_NULL,
230230
512, THREAD_IPC_RX_PRIORITY, THREAD_IPC_RX_TIME_SLICE);
231-
232231

233-
234-
235-
232+
233+
234+
235+
236236
if(event_Tx_TCB != RT_NULL)
237237
{
238238
rt_thread_startup(event_Tx_TCB);
@@ -242,15 +242,15 @@ void thread_A_entry(void* parameter)
242242
{
243243
rt_thread_startup(event_Rx_TCB);
244244
}
245-
245+
246246
{
247247
rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
248248
rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
249249
}
250-
250+
251251
rt_kprintf("event test Done\n");
252252
rt_thread_delay(100);
253-
253+
254254
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
255255

256256
// /* 首先创建2个event线程 */
@@ -260,9 +260,9 @@ void thread_A_entry(void* parameter)
260260
// event_Rx_TCB = rt_thread_create("event_Rx_TCB",
261261
// thread_event_RX_entry, RT_NULL,
262262
// 512, THREAD_IPC_RX_PRIORITY, THREAD_IPC_RX_TIME_SLICE);
263-
//
264-
// rt_kprintf("\n");
265-
//
263+
//
264+
// rt_kprintf("\n");
265+
//
266266
// if(event_Tx_TCB != RT_NULL)
267267
// {
268268
// rt_thread_startup(event_Tx_TCB);
@@ -272,20 +272,20 @@ void thread_A_entry(void* parameter)
272272
// {
273273
// rt_thread_startup(event_Rx_TCB);
274274
// }
275-
//
275+
//
276276
// {
277277
// rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
278278
// rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
279279
// }
280-
//
280+
//
281281
// rt_kprintf("event test Done\n");
282282
// rt_thread_delay(100);
283283

284284
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
285285

286286
rt_sem_init(Mutex_Control, "Mutex_Control",0, RT_TEST_IPC_TYPE);
287287
rt_sem_release(Mutex_Control);
288-
rt_kprintf("\n");
288+
rt_kprintf("\n");
289289

290290
/* 首先创建2个mailbox线程 */
291291
mb_Tx_TCB = rt_thread_create("mb_Tx_TCB",
@@ -294,9 +294,9 @@ void thread_A_entry(void* parameter)
294294
mb_Rx_TCB = rt_thread_create("mb_Rx_TCB",
295295
thread_mb_RX_entry, RT_NULL,
296296
512, THREAD_IPC_RX_PRIORITY, THREAD_IPC_RX_TIME_SLICE);
297-
298-
rt_kprintf("\n");
299-
297+
298+
rt_kprintf("\n");
299+
300300
if(mb_Tx_TCB != RT_NULL)
301301
{
302302
rt_thread_startup(mb_Tx_TCB);
@@ -306,16 +306,16 @@ void thread_A_entry(void* parameter)
306306
{
307307
rt_thread_startup(mb_Rx_TCB);
308308
}
309-
309+
310310
{
311311
rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
312312
rt_sem_take(IPC_Control, RT_WAITING_FOREVER);
313313
}
314-
314+
315315
rt_kprintf("mailbox test Done\n");
316316
rt_thread_delay(100);
317-
318-
317+
318+
319319
//============================================================
320320
//============================================================
321321
rt_thread_suspend(rt_thread_self());//只是做了suspend标记,并未切换,需要shedule调度
@@ -381,9 +381,9 @@ void thread_sem_TX_entry(void* parameter)
381381
rt_sem_release(sem_test);
382382
rt_thread_delay(50);
383383
}
384-
384+
385385
}
386-
386+
387387
rt_sem_release(IPC_Control);//跑完放出control信号量
388388
//rt_thread_suspend(rt_thread_self());//把自己挂起
389389
}
@@ -402,7 +402,7 @@ void thread_sem_RX_entry(void* parameter)
402402
calc_count();
403403
}
404404
}
405-
405+
406406
rt_sem_release(IPC_Control);//跑完放出control信号量
407407
//rt_thread_suspend(rt_thread_self());
408408
}
@@ -411,7 +411,7 @@ void thread_sem_RX_entry(void* parameter)
411411
void thread_mutex_TX_entry(void* parameter)
412412
{
413413
unsigned int loop_num = IPC_REPEAT_TIME;
414-
414+
415415
//need to take the mutex first to ensure that Rx Thread can not get it
416416
rt_mutex_take(mutex_test, RT_WAITING_FOREVER);
417417

@@ -423,7 +423,7 @@ void thread_mutex_TX_entry(void* parameter)
423423
start_count();
424424
rt_mutex_release(mutex_test);
425425
}
426-
426+
427427
rt_sem_release(IPC_Control);//跑完放出control信号量
428428
}
429429

@@ -436,12 +436,12 @@ void thread_mutex_RX_entry(void* parameter)
436436
rt_mutex_take(mutex_test, RT_WAITING_FOREVER);
437437
stop_count();
438438
calc_count();
439-
439+
440440
//we should start schedule to Thread TX
441441
//list_thread();
442442
rt_sem_release(Mutex_Control);
443443
}
444-
444+
445445
rt_sem_release(IPC_Control);//跑完放出control信号量
446446
}
447447

@@ -460,7 +460,7 @@ void thread_event_TX_entry(void* parameter)
460460
start_count();
461461
rt_event_send(event_test, IPC_EVENT);
462462
}
463-
463+
464464
rt_sem_release(IPC_Control);//跑完放出control信号量
465465
}
466466

@@ -480,10 +480,10 @@ void thread_event_RX_entry(void* parameter)
480480
//rt_kprintf("thread1: AND recv event 0x%x\n", e);
481481

482482
rt_sem_release(Mutex_Control);
483-
483+
484484
}
485485
}
486-
486+
487487
rt_sem_release(IPC_Control);//跑完放出control信号量
488488
}
489489

@@ -498,7 +498,7 @@ void thread_mb_TX_entry(void* parameter)
498498
start_count();
499499
rt_mb_send(mailbox_test,(rt_uint32_t)&mb_str[0]);
500500
}
501-
501+
502502
rt_sem_release(IPC_Control);//跑完放出control信号量
503503
}
504504

@@ -518,7 +518,7 @@ void thread_mb_RX_entry(void* parameter)
518518
rt_sem_release(Mutex_Control);
519519
}
520520
}
521-
521+
522522
rt_sem_release(IPC_Control);//跑完放出control信号量
523523
}
524524

0 commit comments

Comments
 (0)