Skip to content

Commit ec9317f

Browse files
quytranpzzquytranpzz
committed
hal: renesas: rx: Remove static defines in LVD source
Remove static defines in LVD source to reuse that functions Signed-off-by: Quy Tran <[email protected]>
1 parent f0b7844 commit ec9317f

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

‎drivers/rx/README‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Patch List:
7777
Impacted files:
7878
drivers/rx/rdp/src/r_lvd_rx/src/r_lvd_rx_hw.c
7979
drivers/rx/rdp/src/r_lvd_rx/r_lvd_rx_if.h
80+
drivers/rx/rdp/src/r_lvd_rx/src/r_lvd_rx.c
8081

8182
* Fix the build warnings in LVD driver
8283
Impacted files:

‎drivers/rx/rdp/src/r_lvd_rx/src/r_lvd_rx.c‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ static bool b_lvd_open[LVD_CHANNEL_NUM] = {false};
9696
#endif
9797

9898
static void lvd_init_lvd (void);
99-
static void lvd_start_lvd (lvd_channel_t ch, lvd_trigger_t trigger);
100-
static void lvd_stop_lvd (lvd_channel_t ch);
101-
static void lvd_start_int (lvd_channel_t ch, void (*p_callback)(void *));
102-
static void lvd_stop_int (lvd_channel_t ch);
99+
void lvd_start_lvd (lvd_channel_t ch, lvd_trigger_t trigger);
100+
void lvd_stop_lvd (lvd_channel_t ch);
101+
void lvd_start_int (lvd_channel_t ch, void (*p_callback)(void *));
102+
void lvd_stop_int (lvd_channel_t ch);
103103

104104

105105
/***********************************************************************************************************************
@@ -160,7 +160,7 @@ lvd_err_t R_LVD_Open(lvd_channel_t channel, lvd_config_t const *p_cfg, void (*p_
160160
{
161161
goto RETURN_R_LVD_OPEN;
162162
}
163-
163+
164164
/* **** The main body of processing **** */
165165
lvd_hw_enable_reg_protect(false);
166166
lvd_stop_lvd(channel);
@@ -169,7 +169,7 @@ lvd_err_t R_LVD_Open(lvd_channel_t channel, lvd_config_t const *p_cfg, void (*p_
169169
lvd_start_lvd(channel, p_cfg->trigger);
170170
lvd_hw_enable_reg_protect(true);
171171
b_lvd_open[channel] = true;
172-
172+
173173
RETURN_R_LVD_OPEN:
174174
{
175175
return result_code;
@@ -199,14 +199,14 @@ lvd_err_t R_LVD_Close(lvd_channel_t channel)
199199
{
200200
goto RETURN_R_LVD_CLOSE;
201201
}
202-
202+
203203
/* **** The main body of processing **** */
204204
lvd_hw_enable_reg_protect(false);
205205
lvd_stop_lvd(channel);
206206
lvd_stop_int(channel);
207207
lvd_hw_enable_reg_protect(true);
208208
b_lvd_open[channel] = false;
209-
209+
210210
RETURN_R_LVD_CLOSE:
211211
{
212212
return result_code;
@@ -273,7 +273,7 @@ lvd_err_t R_LVD_GetStatus (lvd_channel_t channel,
273273

274274
/* **** The main body of processing **** */
275275
lvd_hw_get_lvd_status(channel, p_status_position, p_status_cross);
276-
276+
277277
RETURN_R_LVD_GETSTATUS:
278278
{
279279
return result_code;
@@ -299,7 +299,7 @@ lvd_err_t R_LVD_ClearStatus(lvd_channel_t channel)
299299
{
300300
lvd_err_t result_code = LVD_SUCCESS;
301301
bool b_enable_flag = false;
302-
302+
303303
/* **** Error check **** */
304304
result_code = lvd_hw_check_clearstatus();
305305
if (LVD_SUCCESS != result_code)
@@ -324,7 +324,7 @@ lvd_err_t R_LVD_ClearStatus(lvd_channel_t channel)
324324
lvd_hw_clear_lvd_status(channel);
325325
lvd_hw_enable_reset_int(channel, b_enable_flag);
326326
lvd_hw_enable_reg_protect(true);
327-
327+
328328
RETURN_R_LVD_CLEARSTATUS:
329329
{
330330
return result_code;
@@ -353,7 +353,7 @@ uint32_t R_LVD_GetVersion(void)
353353
/***********************************************************************************************************************
354354
* Outline : Initializes the voltage detection level and the monitored voltage.
355355
* Function Name: lvd_init_lvd
356-
* Description : This function is executed for each channel, however, the configuration option settings for the voltage
356+
* Description : This function is executed for each channel, however, the configuration option settings for the voltage
357357
* : detection level and the monitored voltage become effective only while all LVD circuits are stopped.
358358
* Arguments : none
359359
* Return Value : none
@@ -363,7 +363,7 @@ static void lvd_init_lvd(void)
363363
uint32_t i;
364364
bool b_init_flag = true;
365365
bool b_enable_flag = false;
366-
366+
367367
/* When all LVD circuits are stopping, it is targeted for initialization */
368368
/* WAIT_LOOP */
369369
for (i = 0; i < LVD_CHANNEL_NUM; i++)
@@ -375,7 +375,7 @@ static void lvd_init_lvd(void)
375375
b_init_flag = false;
376376
}
377377
}
378-
378+
379379
if (true == b_init_flag)
380380
{
381381
/* Initialize voltage detection level and target to monitored */
@@ -389,7 +389,7 @@ static void lvd_init_lvd(void)
389389
lvd_hw_set_target((lvd_channel_t)i, lvd_cfg_opt[i].lvd_target);
390390
}
391391
}
392-
392+
393393
return ;
394394
} /* End of function lvd_init_lvd() */
395395

@@ -402,7 +402,7 @@ static void lvd_init_lvd(void)
402402
* Return Value : none
403403
***********************************************************************************************************************/
404404
#if (LVD_GROUP_SETUP_LVDA_1 == LVD_GROUP_SETUP)
405-
static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
405+
void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
406406
{
407407
if (LVD_ENABLE == lvd_cfg_opt[ch].lvd_dfilter)
408408
{
@@ -412,7 +412,7 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
412412
{
413413
lvd_hw_enable_dfilter(ch, false);
414414
}
415-
415+
416416
if (LVD_ACTION_RESET == lvd_cfg_opt[ch].lvd_action)
417417
{
418418
lvd_hw_select_reset(ch);
@@ -422,7 +422,7 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
422422
{
423423
lvd_hw_select_int(ch);
424424
}
425-
425+
426426
lvd_hw_set_trigger(ch, trigger);
427427
lvd_hw_enable_output(ch, true);
428428

@@ -443,12 +443,12 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
443443
}
444444

445445
lvd_hw_enable_circuit(ch, true);
446-
446+
447447
return ;
448448
} /* End of function lvd_start_lvd() */
449449

450450
#elif (LVD_GROUP_SETUP_LVDA_2 == LVD_GROUP_SETUP)
451-
static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
451+
void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
452452
{
453453
lvd_hw_enable_circuit(ch, true);
454454
lvd_hw_dummy_read_circuit(ch);
@@ -461,7 +461,7 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
461461
lvd_hw_dummy_read_dfilter(ch);
462462
lvd_hw_wait_delay_loco(lvd_cfg_opt[ch].lvd_delay_dfilter_enable);
463463
}
464-
464+
465465
if (LVD_ACTION_RESET == lvd_cfg_opt[ch].lvd_action)
466466
{
467467
lvd_hw_select_reset(ch);
@@ -472,7 +472,7 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
472472
{
473473
lvd_hw_select_int(ch);
474474
lvd_hw_set_trigger(ch, trigger);
475-
475+
476476
if (LVD_ACTION_MI == lvd_cfg_opt[ch].lvd_action)
477477
{
478478
lvd_hw_select_mi(ch);
@@ -497,7 +497,7 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
497497

498498
#elif ((LVD_GROUP_SETUP_LVDAa_1 == LVD_GROUP_SETUP) \
499499
|| (LVD_GROUP_SETUP_LVDAb_1 == LVD_GROUP_SETUP))
500-
static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
500+
void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
501501
{
502502
if (LVD_ACTION_RESET == lvd_cfg_opt[ch].lvd_action)
503503
{
@@ -517,7 +517,7 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
517517
{
518518
lvd_hw_select_int(ch);
519519
lvd_hw_set_trigger(ch, trigger);
520-
520+
521521
if (LVD_ACTION_MI == lvd_cfg_opt[ch].lvd_action)
522522
{
523523
lvd_hw_select_mi(ch);
@@ -526,21 +526,21 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
526526
{
527527
lvd_hw_select_nmi(ch);
528528
}
529-
529+
530530
lvd_hw_enable_circuit(ch, true);
531531
lvd_hw_dummy_read_circuit(ch);
532532
lvd_hw_wait_delay(LVD_DELAY_CIRCUIT_ENABLE_USEC);
533533
lvd_hw_enable_output(ch, true);
534534
lvd_hw_dummy_read_output(ch);
535535
lvd_hw_wait_delay(LVD_DELAY_CLEAR_STATUS_USEC);
536-
lvd_hw_clear_lvd_status(ch);
536+
lvd_hw_clear_lvd_status(ch);
537537

538538
if (LVD_ACTION_NONE != lvd_cfg_opt[ch].lvd_action)
539539
{
540540
lvd_hw_enable_reset_int(ch, true);
541541
}
542542
}
543-
543+
544544
return ;
545545
} /* End of function lvd_start_lvd() */
546546

@@ -555,7 +555,7 @@ static void lvd_start_lvd(lvd_channel_t ch, lvd_trigger_t trigger)
555555
* Return Value : none
556556
***********************************************************************************************************************/
557557
#if (LVD_GROUP_SETUP_LVDA_1 == LVD_GROUP_SETUP)
558-
static void lvd_stop_lvd(lvd_channel_t ch)
558+
void lvd_stop_lvd(lvd_channel_t ch)
559559
{
560560
lvd_hw_enable_circuit(ch, false);
561561
lvd_hw_dummy_read_circuit(ch);
@@ -568,7 +568,7 @@ static void lvd_stop_lvd(lvd_channel_t ch)
568568
} /* End of function lvd_stop_lvd() */
569569

570570
#elif (LVD_GROUP_SETUP_LVDA_2 == LVD_GROUP_SETUP)
571-
static void lvd_stop_lvd(lvd_channel_t ch)
571+
void lvd_stop_lvd(lvd_channel_t ch)
572572
{
573573
uint32_t wait_loco_cycle = 0;
574574
bool b_enable_flag = false;
@@ -592,7 +592,7 @@ static void lvd_stop_lvd(lvd_channel_t ch)
592592

593593
#elif ((LVD_GROUP_SETUP_LVDAa_1 == LVD_GROUP_SETUP) \
594594
|| (LVD_GROUP_SETUP_LVDAb_1 == LVD_GROUP_SETUP))
595-
static void lvd_stop_lvd(lvd_channel_t ch)
595+
void lvd_stop_lvd(lvd_channel_t ch)
596596
{
597597
if (LVD_ACTION_RESET == lvd_cfg_opt[ch].lvd_action)
598598
{
@@ -620,7 +620,7 @@ static void lvd_stop_lvd(lvd_channel_t ch)
620620
* : void (*p_callback)(void *) ; Address of the callback function.
621621
* Return Value : none
622622
***********************************************************************************************************************/
623-
static void lvd_start_int(lvd_channel_t ch, void (*p_callback)(void *))
623+
void lvd_start_int(lvd_channel_t ch, void (*p_callback)(void *))
624624
{
625625
if (LVD_ACTION_MI == lvd_cfg_opt[ch].lvd_action)
626626
{
@@ -648,7 +648,7 @@ static void lvd_start_int(lvd_channel_t ch, void (*p_callback)(void *))
648648
* Arguments : lvd_channel_t ch ; Enumerated channel number to be stopped.
649649
* Return Value : none
650650
***********************************************************************************************************************/
651-
static void lvd_stop_int(lvd_channel_t ch)
651+
void lvd_stop_int(lvd_channel_t ch)
652652
{
653653
if (LVD_ACTION_MI == lvd_cfg_opt[ch].lvd_action)
654654
{

0 commit comments

Comments
 (0)