Skip to content

Commit 6dabb62

Browse files
committed
gd32f4xx: timer: Rename time_init function
Zephyr define timer_init function which conflicts with GigaDevice timer driver API. This rename timer_init method to timer_initialize to solve conflict. Signed-off-by: HaiLong Yang <[email protected]>
1 parent 77ab94c commit 6dabb62

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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_initialize(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_initialize(uint32_t timer_periph, timer_parameter_struct* initpara)
155155
{
156156
/* configure the counter prescaler value */
157157
TIMER_PSC(timer_periph) = (uint16_t)initpara->prescaler;

0 commit comments

Comments
 (0)