zara
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

modules: Update hal_wch 

Update hal_wch.

As the hal upstream changed name, there is now a name conflict.
Rename ch32fun.h to hal_ch32fun.h to fix this conflict.

Signed-off-by: Miguel Gazquez <miguel.gazquez@bootlin.com>
pull/90439/head
Miguel Gazquez 4 months ago committed by Benjamin Cabé
parent
265cfb45a8
commit
2b91c467f2
10 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      drivers/clock_control/clock_control_wch_rcc.c
  2. 2
      drivers/gpio/wch_gpio_ch32v00x.c
  3. 2
      drivers/interrupt_controller/intc_wch_pfic.c
  4. 2
      drivers/pinctrl/pinctrl_wch_20x_30x_afio.c
  5. 2
      drivers/pinctrl/pinctrl_wch_afio.c
  6. 2
      drivers/serial/uart_wch_usart.c
  7. 2
      drivers/timer/wch_systick_ch32v00x.c
  8. 2
      modules/hal_wch/CMakeLists.txt
  9. 8
      modules/hal_wch/hal_ch32fun.h
  10. 2
      west.yml

2
drivers/clock_control/clock_control_wch_rcc.c
Unescape View File

@ -14,7 +14,7 @@
#include <zephyr/drivers/clock_control.h> #include <zephyr/drivers/clock_control.h>
#include <zephyr/sys/util_macro.h> #include <zephyr/sys/util_macro.h>
#include <ch32fun.h> #include <hal_ch32fun.h>
#define WCH_RCC_CLOCK_ID_OFFSET(id) (((id) >> 5) & 0xFF) #define WCH_RCC_CLOCK_ID_OFFSET(id) (((id) >> 5) & 0xFF)
#define WCH_RCC_CLOCK_ID_BIT(id) ((id) & 0x1F) #define WCH_RCC_CLOCK_ID_BIT(id) ((id) & 0x1F)

2
drivers/gpio/wch_gpio_ch32v00x.c
Unescape View File

@ -10,7 +10,7 @@
#include <zephyr/dt-bindings/gpio/gpio.h> #include <zephyr/dt-bindings/gpio/gpio.h>
#include <zephyr/irq.h> #include <zephyr/irq.h>
#include <ch32fun.h> #include <hal_ch32fun.h>
#define DT_DRV_COMPAT wch_gpio #define DT_DRV_COMPAT wch_gpio

2
drivers/interrupt_controller/intc_wch_pfic.c
Unescape View File

@ -6,7 +6,7 @@
#define DT_DRV_COMPAT wch_pfic #define DT_DRV_COMPAT wch_pfic
#include <ch32fun.h> #include <hal_ch32fun.h>
#include <zephyr/arch/cpu.h> #include <zephyr/arch/cpu.h>
#include <zephyr/init.h> #include <zephyr/init.h>

2
drivers/pinctrl/pinctrl_wch_20x_30x_afio.c
Unescape View File

@ -10,7 +10,7 @@
#include <zephyr/drivers/pinctrl.h> #include <zephyr/drivers/pinctrl.h>
#include <zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h> #include <zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h>
#include <ch32fun.h> #include <hal_ch32fun.h>
static GPIO_TypeDef *const wch_afio_pinctrl_regs[] = { static GPIO_TypeDef *const wch_afio_pinctrl_regs[] = {
(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioa)), (GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioa)),

2
drivers/pinctrl/pinctrl_wch_afio.c
Unescape View File

@ -10,7 +10,7 @@
#include <zephyr/drivers/pinctrl.h> #include <zephyr/drivers/pinctrl.h>
#include <zephyr/dt-bindings/pinctrl/ch32v003-pinctrl.h> #include <zephyr/dt-bindings/pinctrl/ch32v003-pinctrl.h>
#include <ch32fun.h> #include <hal_ch32fun.h>
static GPIO_TypeDef *const wch_afio_pinctrl_regs[] = { static GPIO_TypeDef *const wch_afio_pinctrl_regs[] = {
(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioa)), (GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioa)),

2
drivers/serial/uart_wch_usart.c
Unescape View File

@ -12,7 +12,7 @@
#include <zephyr/drivers/pinctrl.h> #include <zephyr/drivers/pinctrl.h>
#include <zephyr/irq.h> #include <zephyr/irq.h>
#include <ch32fun.h> #include <hal_ch32fun.h>
struct usart_wch_config { struct usart_wch_config {
USART_TypeDef *regs; USART_TypeDef *regs;

2
drivers/timer/wch_systick_ch32v00x.c
Unescape View File

@ -12,7 +12,7 @@
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <zephyr/sys/util.h> #include <zephyr/sys/util.h>
#include <ch32fun.h> #include <hal_ch32fun.h>
#define STK_SWIE BIT(31) #define STK_SWIE BIT(31)
#define STK_STRE BIT(3) #define STK_STRE BIT(3)

2
modules/hal_wch/CMakeLists.txt
Unescape View File

@ -1,3 +1,3 @@
if(CONFIG_SOC_FAMILY_CH32V) if(CONFIG_SOC_FAMILY_CH32V)
zephyr_include_directories(${ZEPHYR_HAL_WCH_MODULE_DIR}/ch32v003fun .) zephyr_include_directories(${ZEPHYR_HAL_WCH_MODULE_DIR}/ch32fun .)
endif() endif()

8
modules/hal_wch/ch32fun.h → modules/hal_wch/hal_ch32fun.h
Unescape View File

@ -9,22 +9,22 @@
#if defined(CONFIG_SOC_CH32V003) #if defined(CONFIG_SOC_CH32V003)
#define CH32V003 1 #define CH32V003 1
#include <ch32v003fun.h> #include <ch32fun.h>
#endif #endif
#if defined(CONFIG_SOC_SERIES_CH32V00X) #if defined(CONFIG_SOC_SERIES_CH32V00X)
#define CH32V003 1 #define CH32V003 1
#include <ch32v003fun.h> #include <ch32fun.h>
#endif #endif
#if defined(CONFIG_SOC_SERIES_QINGKE_V4B) #if defined(CONFIG_SOC_SERIES_QINGKE_V4B)
#define CH32V20x 1 #define CH32V20x 1
#include <ch32v003fun.h> #include <ch32fun.h>
#endif #endif
#if defined(CONFIG_SOC_SERIES_QINGKE_V4C) #if defined(CONFIG_SOC_SERIES_QINGKE_V4C)
#define CH32V20x 1 #define CH32V20x 1
#include <ch32v003fun.h> #include <ch32fun.h>
#endif #endif
#endif #endif

2
west.yml
Unescape View File

@ -260,7 +260,7 @@ manifest:
groups: groups:
- hal - hal
- name: hal_wch - name: hal_wch
revision: 1de9d3e406726702ce7cfc504509a02ecc463554 revision: 941f5182b5577d168e0cbcc0c9dd26294c1806a5
path: modules/hal/wch path: modules/hal/wch
groups: groups:
- hal - hal

Write Preview
Loading…
Cancel
Save