gd32f4xx: Patch firmware 3.0.3

Patch gd32f4xx HAL according to the requirements listed in the
repository README.md file.

Signed-off-by: HaiLong Yang <[email protected]>

Author: cameled

gd32f4xx/cmsis/gd/gd32f4xx/include/gd32f4xx.h

@@ -295,7 +295,9 @@ 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))
 

gd32f4xx/standard_peripheral/include/gd32f4xx_can.h

@@ -586,10 +586,10 @@ typedef enum {
 #define CAN_STATE_PENDING                  ((uint32_t)0x00000000U)      /*!< CAN pending */
 
 /* CAN communication mode */
-#define CAN_NORMAL_MODE                    ((uint8_t)0x00U)             /*!< normal communication mode */
-#define CAN_LOOPBACK_MODE                  ((uint8_t)0x01U)             /*!< loopback communication mode */
-#define CAN_SILENT_MODE                    ((uint8_t)0x02U)             /*!< silent communication mode */
-#define CAN_SILENT_LOOPBACK_MODE           ((uint8_t)0x03U)             /*!< loopback and silent communication mode */
+#define GD32_CAN_NORMAL_MODE               ((uint8_t)0x00U)             /*!< normal communication mode */
+#define GD32_CAN_LOOPBACK_MODE             ((uint8_t)0x01U)             /*!< loopback communication mode */
+#define GD32_CAN_SILENT_MODE               ((uint8_t)0x02U)             /*!< silent communication mode */
+#define GD32_CAN_SILENT_LOOPBACK_MODE      ((uint8_t)0x03U)             /*!< loopback and silent communication mode */
 
 /* CAN resynchronisation jump width */
 #define CAN_BT_SJW_1TQ                     ((uint8_t)0x00U)             /*!< 1 time quanta */
@@ -666,7 +666,7 @@ typedef enum {
 #define CAN_FT_REMOTE                      ((uint32_t)0x00000002U)      /*!< remote frame */
 
 /* CAN timeout */
-#define CAN_TIMEOUT                        ((uint32_t)0x0000FFFFU)      /*!< timeout value */
+#define GD32_CAN_TIMEOUT                   ((uint32_t)0x0000FFFFU)      /*!< timeout value */
 
 /* interrupt enable bits */
 #define CAN_INT_TME                        CAN_INTEN_TMEIE              /*!< transmit mailbox empty interrupt enable */

gd32f4xx/standard_peripheral/include/gd32f4xx_i2c.h

@@ -327,6 +327,12 @@ 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 */
 
+/* I2C clock frequency, MHz */
+#define I2CCLK_MAX                    ((uint32_t)0x0000003CU)           /*!< i2cclk maximum value */
+#define I2CCLK_MIN                    ((uint32_t)0x00000002U)           /*!< i2cclk minimum value */
+#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 */
 /* initialization functions */
 /* reset I2C */

gd32f4xx/standard_peripheral/include/gd32f4xx_timer.h

@@ -622,7 +622,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 */

gd32f4xx/standard_peripheral/source/gd32f4xx_can.c

@@ -94,7 +94,7 @@ void can_struct_para_init(can_struct_type_enum type, void *p_struct)
         ((can_parameter_struct *)p_struct)->time_segment_2 = CAN_BT_BS2_1TQ;
         ((can_parameter_struct *)p_struct)->time_triggered = DISABLE;
         ((can_parameter_struct *)p_struct)->trans_fifo_order = DISABLE;
-        ((can_parameter_struct *)p_struct)->working_mode = CAN_NORMAL_MODE;
+        ((can_parameter_struct *)p_struct)->working_mode = GD32_CAN_NORMAL_MODE;
 
         break;
     /* used for can_filter_init() */
@@ -148,7 +148,7 @@ void can_struct_para_init(can_struct_type_enum type, void *p_struct)
     \param[in]  can_periph
       \arg        CANx(x=0,1)
     \param[in]  can_parameter_init: parameters for CAN initializtion
-      \arg        working_mode: CAN_NORMAL_MODE, CAN_LOOPBACK_MODE, CAN_SILENT_MODE, CAN_SILENT_LOOPBACK_MODE
+      \arg        working_mode: GD32_CAN_NORMAL_MODE, GD32_CAN_LOOPBACK_MODE, GD32_CAN_SILENT_MODE, GD32_CAN_SILENT_LOOPBACK_MODE
       \arg        resync_jump_width: CAN_BT_SJW_xTQ(x=1, 2, 3, 4)
       \arg        time_segment_1: CAN_BT_BS1_xTQ(1..16)
       \arg        time_segment_2: CAN_BT_BS2_xTQ(1..8)

gd32f4xx/standard_peripheral/source/gd32f4xx_i2c.c

@@ -39,8 +39,6 @@ OF SUCH DAMAGE.
 #include "gd32f4xx_i2c.h"
 
 /* I2C register bit mask */
-#define I2CCLK_MAX                    ((uint32_t)0x0000003CU)             /*!< 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 */

gd32f4xx/standard_peripheral/source/gd32f4xx_timer.c

@@ -152,7 +152,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;