gd32e10x: apply patches for hal

apply fllowing patches for hal: - drop I2CCLK_MAX/I2CCLK_MIN - add `gd32_` prefix for timer_init - add ifdef to BIT macro - remove nvic_vector_table_set function call Signed-off-by: YuLong Yao <feilongphone@gmail.com>
zephyrproject-rtos · Aug 28, 2022 · dd0e032 · dd0e032
1 parent 74ad25d
commit dd0e032
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/gd32e10x/cmsis/gd/gd32e10x/include/gd32e10x.h b/gd32e10x/cmsis/gd/gd32e10x/include/gd32e10x.h
@@ -195,7 +195,10 @@ typedef enum {ERROR = 0, SUCCESS = !ERROR} ErrStatus;
 #define REG32(addr)                  (*(volatile uint32_t *)(uint32_t)(addr))
 #define REG16(addr)                  (*(volatile uint16_t *)(uint32_t)(addr))
 #define REG8(addr)                   (*(volatile uint8_t *)(uint32_t)(addr))
+#ifndef BIT
 #define BIT(x)                       ((uint32_t)((uint32_t)0x01U<<(x)))
+#endif /* BIT */
+
 #define BITS(start, end)             ((0xFFFFFFFFUL << (start)) & (0xFFFFFFFFUL >> (31U - (uint32_t)(end)))) 
 #define GET_BITS(regval, start, end) (((regval) & BITS((start),(end))) >> (start))
 

diff --git a/gd32e10x/cmsis/gd/gd32e10x/source/system_gd32e10x.c b/gd32e10x/cmsis/gd/gd32e10x/source/system_gd32e10x.c
@@ -145,11 +145,6 @@ void SystemInit (void)
     /* configure the system clock source, PLL Multiplier, AHB/APBx prescalers and Flash settings */
     system_clock_config();
 
-#ifdef VECT_TAB_SRAM
-  nvic_vector_table_set(NVIC_VECTTAB_RAM,VECT_TAB_OFFSET);
-#else
-  nvic_vector_table_set(NVIC_VECTTAB_FLASH,VECT_TAB_OFFSET);
-#endif
 
 }
 

diff --git a/gd32e10x/standard_peripheral/include/gd32e10x_i2c.h b/gd32e10x/standard_peripheral/include/gd32e10x_i2c.h
@@ -309,6 +309,11 @@ typedef enum {
 #define I2C_ADDFORMAT_7BITS           ((uint32_t)0x00000000U)                  /*!< address format is 7 bits */
 #define I2C_ADDFORMAT_10BITS          I2C_SADDR0_ADDFORMAT                     /*!< address format is 10 bits */
 
+#define I2CCLK_MAX ((uint32_t)0x0000003FU)/*!< i2cclk maximum value */
+#define I2CCLK_MIN ((uint32_t)0x00000002U)/*!< i2cclk minimum value for standard mode */
+#define I2CCLK_FM_MIN ((uint32_t)0x00000008U)/*!< i2cclk minimum value for fast mode */
+#define I2CCLK_FM_PLUS_MIN ((uint32_t)0x00000018U)/*!< i2cclk minimum value for fast mode plus */
+
 /* function declarations */
 /* reset I2C */
 void i2c_deinit(uint32_t i2c_periph);

diff --git a/gd32e10x/standard_peripheral/include/gd32e10x_timer.h b/gd32e10x/standard_peripheral/include/gd32e10x_timer.h
@@ -591,7 +591,7 @@ void timer_deinit(uint32_t timer_periph);
 /* initialize TIMER init parameter struct */
 void timer_struct_para_init(timer_parameter_struct* initpara);
 /* initialize TIMER counter */
-void timer_init(uint32_t timer_periph, timer_parameter_struct* initpara);
+void gd32_timer_init(uint32_t timer_periph, timer_parameter_struct* initpara);
 /* enable a timer */
 void timer_enable(uint32_t timer_periph);
 /* disable a timer */

diff --git a/gd32e10x/standard_peripheral/source/gd32e10x_i2c.c b/gd32e10x/standard_peripheral/source/gd32e10x_i2c.c
@@ -39,8 +39,6 @@ OF SUCH DAMAGE.
 #include "gd32e10x_i2c.h"
 
 /* I2C register bit mask */
-#define I2CCLK_MAX                    ((uint32_t)0x0000003FU)             /*!< i2cclk maximum value */
-#define I2CCLK_MIN                    ((uint32_t)0x00000002U)             /*!< i2cclk minimum value */
 #define I2C_FLAG_MASK                 ((uint32_t)0x0000FFFFU)             /*!< i2c flag mask */
 #define I2C_ADDRESS_MASK              ((uint32_t)0x000003FFU)             /*!< i2c address mask */
 #define I2C_ADDRESS2_MASK             ((uint32_t)0x000000FEU)             /*!< the second i2c address mask */

diff --git a/gd32e10x/standard_peripheral/source/gd32e10x_timer.c b/gd32e10x/standard_peripheral/source/gd32e10x_timer.c
@@ -157,7 +157,7 @@ void timer_struct_para_init(timer_parameter_struct* initpara)
     \param[out] none
     \retval     none
 */
-void timer_init(uint32_t timer_periph, timer_parameter_struct* initpara)
+void gd32_timer_init(uint32_t timer_periph, timer_parameter_struct* initpara)
 {
     /* configure the counter prescaler value */
     TIMER_PSC(timer_periph) = (uint16_t)initpara->prescaler;