Skip to content

Commit f8c8eda

Browse files
committed
gd32f4xx: timer: Rename timer_init function
GD32 timer_init function name conflict with Zephyr. Rename it to __timer_init to temporarily solve the conflict. Signed-off-by: HaiLong Yang <[email protected]>
1 parent 77ab94c commit f8c8eda

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

GD32E10X/standard_peripheral/Include/gd32e10x_timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ void timer_deinit(uint32_t timer_periph);
590590
/* initialize TIMER init parameter struct */
591591
void timer_struct_para_init(timer_parameter_struct* initpara);
592592
/* initialize TIMER counter */
593-
void timer_initialize(uint32_t timer_periph, timer_parameter_struct* initpara);
593+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara);
594594
/* enable a timer */
595595
void timer_enable(uint32_t timer_periph);
596596
/* disable a timer */

GD32E10X/standard_peripheral/Source/gd32e10x_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void timer_struct_para_init(timer_parameter_struct* initpara)
156156
\param[out] none
157157
\retval none
158158
*/
159-
void timer_initialize(uint32_t timer_periph, timer_parameter_struct* initpara)
159+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara)
160160
{
161161
/* configure the counter prescaler value */
162162
TIMER_PSC(timer_periph) = (uint16_t)initpara->prescaler;

GD32F403/standard_peripheral/Include/gd32f403_timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ void timer_deinit(uint32_t timer_periph);
594594
/* initialize TIMER init parameter struct */
595595
void timer_struct_para_init(timer_parameter_struct* initpara);
596596
/* initialize TIMER counter */
597-
void timer_initialize(uint32_t timer_periph, timer_parameter_struct* initpara);
597+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara);
598598
/* enable a TIMER */
599599
void timer_enable(uint32_t timer_periph);
600600
/* disable a TIMER */

GD32F403/standard_peripheral/Source/gd32f403_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void timer_struct_para_init(timer_parameter_struct* initpara)
140140
\param[out] none
141141
\retval none
142142
*/
143-
void timer_initialize(uint32_t timer_periph, timer_parameter_struct* initpara)
143+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara)
144144
{
145145
/* configure the counter prescaler value */
146146
TIMER_PSC(timer_periph) = (uint16_t)initpara->prescaler;

GD32F4XX/standard_peripheral/Include/gd32f4xx_timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ void timer_deinit(uint32_t timer_periph);
624624
/* initialize TIMER init parameter struct */
625625
void timer_struct_para_init(timer_parameter_struct* initpara);
626626
/* initialize TIMER counter */
627-
void timer_init(uint32_t timer_periph, timer_parameter_struct* initpara);
627+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara);
628628
/* enable a TIMER */
629629
void timer_enable(uint32_t timer_periph);
630630
/* disable a TIMER */

GD32F4XX/standard_peripheral/Source/gd32f4xx_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void timer_struct_para_init(timer_parameter_struct* initpara)
151151
\param[out] none
152152
\retval none
153153
*/
154-
void timer_init(uint32_t timer_periph, timer_parameter_struct* initpara)
154+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara)
155155
{
156156
/* configure the counter prescaler value */
157157
TIMER_PSC(timer_periph) = (uint16_t)initpara->prescaler;

GD32VF103/standard_peripheral/Include/gd32vf103_timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ void timer_deinit(uint32_t timer_periph);
573573
/* initialize TIMER init parameter struct */
574574
void timer_struct_para_init(timer_parameter_struct* initpara);
575575
/* initialize TIMER counter */
576-
void timer_initialize(uint32_t timer_periph, timer_parameter_struct* initpara);
576+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara);
577577
/* enable a timer */
578578
void timer_enable(uint32_t timer_periph);
579579
/* disable a timer */

GD32VF103/standard_peripheral/Source/gd32vf103_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ void timer_struct_para_init(timer_parameter_struct* initpara)
120120
\param[out] none
121121
\retval none
122122
*/
123-
void timer_initialize(uint32_t timer_periph, timer_parameter_struct* initpara)
123+
void __timer_init(uint32_t timer_periph, timer_parameter_struct* initpara)
124124
{
125125
/* configure the counter prescaler value */
126126
TIMER_PSC(timer_periph) = (uint16_t)initpara->prescaler;

0 commit comments

Comments
 (0)