Jelajahi Sumber

Merge branch 'master' of https://github.com/RT-Thread/rt-thread into step4-ev1

# Conflicts:
#	bsp/stm32/libraries/STM32MPxx_HAL/SConscript
thread-liu 4 tahun lalu
induk
melakukan
3ecf12b5b2
97 mengubah file dengan 12450 tambahan dan 1101 penghapusan
  1. 467 0
      .github/workflows/action.yml
  2. 0 145
      .travis.yml
  3. 2 2
      bsp/allwinner_tina/drivers/drv_uart.c
  4. 1 1
      bsp/allwinner_tina/drivers/spi/drv_spi.c
  5. 5 0
      bsp/lpc43xx/M0/applications/vbus_hw.h
  6. 5 0
      bsp/lpc43xx/M4/applications/vbus_hw.h
  7. 0 2
      bsp/nrf5x/libraries/drivers/drv_adc.c
  8. 2 0
      bsp/nrf5x/libraries/drivers/drv_adc.h
  9. 66 13
      bsp/raspberry-pi/raspi4-32/.config
  10. 6 0
      bsp/raspberry-pi/raspi4-32/README.md
  11. 61 4
      bsp/raspberry-pi/raspi4-32/driver/Kconfig
  12. 11 1
      bsp/raspberry-pi/raspi4-32/driver/SConscript
  13. 13 7
      bsp/raspberry-pi/raspi4-32/driver/board.c
  14. 885 0
      bsp/raspberry-pi/raspi4-32/driver/drv_bluetooth.c
  15. 28 0
      bsp/raspberry-pi/raspi4-32/driver/drv_bluetooth.h
  16. 113 0
      bsp/raspberry-pi/raspi4-32/driver/drv_dma.c
  17. 172 0
      bsp/raspberry-pi/raspi4-32/driver/drv_dma.h
  18. 192 122
      bsp/raspberry-pi/raspi4-32/driver/drv_eth.c
  19. 11 0
      bsp/raspberry-pi/raspi4-32/driver/drv_eth.h
  20. 368 0
      bsp/raspberry-pi/raspi4-32/driver/drv_i2c.c
  21. 59 0
      bsp/raspberry-pi/raspi4-32/driver/drv_i2c.h
  22. 6 12
      bsp/raspberry-pi/raspi4-32/driver/drv_sdio.c
  23. 43 42
      bsp/raspberry-pi/raspi4-32/driver/drv_spi.c
  24. 21 6
      bsp/raspberry-pi/raspi4-32/driver/drv_uart.c
  25. 18 0
      bsp/raspberry-pi/raspi4-32/driver/lcd/Sconscript
  26. 18 4
      bsp/raspberry-pi/raspi4-32/driver/lcd/drv_hdmi.c
  27. 0 0
      bsp/raspberry-pi/raspi4-32/driver/lcd/drv_hdmi.h
  28. 381 0
      bsp/raspberry-pi/raspi4-32/driver/lcd/drv_ili9486.c
  29. 13 0
      bsp/raspberry-pi/raspi4-32/driver/lcd/drv_ili9486.h
  30. 258 0
      bsp/raspberry-pi/raspi4-32/driver/lcd/lcd_console.c
  31. 59 0
      bsp/raspberry-pi/raspi4-32/driver/lcd/lcd_console.h
  32. 2299 0
      bsp/raspberry-pi/raspi4-32/driver/lcd/lcd_font_20.h
  33. 18 0
      bsp/raspberry-pi/raspi4-32/driver/mbox.c
  34. 18 0
      bsp/raspberry-pi/raspi4-32/driver/mbox.h
  35. 20 1
      bsp/raspberry-pi/raspi4-32/driver/raspi4.h
  36. 16 0
      bsp/raspberry-pi/raspi4-32/driver/touch/Sconscript
  37. 132 0
      bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.c
  38. 13 0
      bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.h
  39. 252 0
      bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.c
  40. 13 0
      bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.h
  41. 8 0
      bsp/raspberry-pi/raspi4-32/link.lds
  42. 31 6
      bsp/raspberry-pi/raspi4-32/rtconfig.h
  43. 15 1
      bsp/stm32/libraries/HAL_Drivers/Kconfig
  44. 42 0
      bsp/stm32/libraries/HAL_Drivers/config/l4/dac_config.h
  45. 60 52
      bsp/stm32/libraries/HAL_Drivers/config/mp1/dma_config.h
  46. 1 0
      bsp/stm32/libraries/HAL_Drivers/drv_config.h
  47. 396 19
      bsp/stm32/libraries/HAL_Drivers/drv_crypto.c
  48. 4 4
      bsp/stm32/libraries/HAL_Drivers/drv_dac.c
  49. 1 1
      bsp/stm32/libraries/HAL_Drivers/drv_lcd.c
  50. 4 4
      bsp/stm32/libraries/HAL_Drivers/drv_sdio.c
  51. 4 0
      bsp/stm32/libraries/STM32L4xx_HAL/SConscript
  52. 19 3
      bsp/stm32/libraries/STM32MPxx_HAL/SConscript
  53. 0 6
      bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/.mxproject
  54. 131 98
      bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Inc/stm32l4xx_hal_conf.h
  55. 1 1
      bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Inc/stm32l4xx_it.h
  56. 333 327
      bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/STM32L475VE.ioc
  57. 61 17
      bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Src/main.c
  58. 141 80
      bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Src/stm32l4xx_hal_msp.c
  59. 1 1
      bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Src/stm32l4xx_it.c
  60. 10 0
      bsp/stm32/stm32l475-atk-pandora/board/Kconfig
  61. 56 2
      bsp/stm32/stm32mp157a-st-discovery/.config
  62. 6 6
      bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Inc/stm32mp1xx_hal_conf.h
  63. 349 3
      bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c
  64. 46 1
      bsp/stm32/stm32mp157a-st-discovery/board/Kconfig
  65. 18 0
      bsp/stm32/stm32mp157a-st-discovery/board/SConscript
  66. 1 3
      bsp/stm32/stm32mp157a-st-discovery/board/board.h
  67. 1 6
      bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.icf
  68. 258 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/audio_play.c
  69. 531 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_cs42l51.c
  70. 198 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_cs42l51.h
  71. 390 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_mic.c
  72. 603 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_sound.c
  73. 449 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/crypto/crypto_sample.c
  74. 882 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.c
  75. 404 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.h
  76. 35 36
      bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_pmic.c
  77. 555 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c
  78. 117 0
      bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.h
  79. 1 1
      bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c
  80. 18 14
      bsp/thead-smart/.config
  81. 2 0
      bsp/thead-smart/Kconfig
  82. 8 5
      bsp/thead-smart/README.md
  83. 1 7
      bsp/thead-smart/rtconfig.h
  84. 1 1
      components/dfs/filesystems/devfs/devfs.c
  85. 1 1
      components/dfs/filesystems/romfs/dfs_romfs.c
  86. 2 0
      components/drivers/include/drivers/alarm.h
  87. 1 0
      components/drivers/include/ipc/ringbuffer.h
  88. 80 14
      components/drivers/rtc/alarm.c
  89. 55 8
      components/drivers/rtc/soft_rtc.c
  90. 3 3
      components/drivers/sdio/sdio.c
  91. 4 1
      components/drivers/serial/serial.c
  92. 34 0
      components/drivers/src/ringbuffer.c
  93. 1 1
      components/drivers/src/workqueue.c
  94. 2 0
      components/libc/compilers/common/termios.h
  95. 2 2
      libcpu/risc-v/common/context_gcc.S
  96. 2 2
      libcpu/risc-v/k210/interrupt_gcc.S
  97. 5 2
      libcpu/risc-v/k210/startup_gcc.S

+ 467 - 0
.github/workflows/action.yml

@@ -0,0 +1,467 @@
+name: RT-Thread
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  # Runs at 16:00 UTC (BeiJing 00:00) on the 1st of every month
+  schedule:
+    - cron:  '0 16 1 * *'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - documentation/**
+      - '**/README.md'
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - documentation/**
+      - '**/README.md'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+       include:
+         - action-version: "1.0"
+           RTT_BSP: "CME_M7"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "apollo2"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "asm9260t"
+           RTT_TOOL_CHAIN: "sourcery-arm"  
+
+         - action-version: "1.0"
+           RTT_BSP: "at91sam9260"
+           RTT_TOOL_CHAIN: "sourcery-arm"  
+
+         - action-version: "1.0"
+           RTT_BSP: "allwinner_tina"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "efm32"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "gd32e230k-start"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "gd32303e-eval"
+           RTT_TOOL_CHAIN: "sourcery-arm"           
+
+         - action-version: "1.0"
+           RTT_BSP: "gd32450z-eval"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "gkipc"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "imx6sx/cortex-a9"
+           RTT_TOOL_CHAIN: "sourcery-arm"            
+
+         - action-version: "1.0"
+           RTT_BSP: "imxrt/imxrt1052-atk-commander"
+           RTT_TOOL_CHAIN: "sourcery-arm"    
+
+         - action-version: "1.0"
+           RTT_BSP: "imxrt/imxrt1052-fire-pro"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "imxrt/imxrt1052-nxp-evk"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "lm3s8962"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "lm3s9b9x"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "lm4f232"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "tm4c123bsp"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "tm4c129x"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc43xx/M4"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc176x"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc178x"
+           RTT_TOOL_CHAIN: "sourcery-arm" 
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc408x"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc1114"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc2148"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc2478"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc5410x"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "lpc54114-lite"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "ls1bdev"
+           RTT_TOOL_CHAIN: "sourcery-mips"
+
+         - action-version: "1.0"
+           RTT_BSP: "ls1cdev"
+           RTT_TOOL_CHAIN: "sourcery-mips"
+
+         - action-version: "1.0"
+           RTT_BSP: "mb9bf500r"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "mb9bf506r"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "mb9bf618s"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "mb9bf568r"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "mini2440"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "qemu-vexpress-a9"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "qemu-vexpress-gemini"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "sam7x"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f072-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f091-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-atk-nano"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-atk-warshipv3"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-dofly-lyc8"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-dofly-M3S"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-fire-arbitrary"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-hw100k-ibox"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-mini-system"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-onenet-nbiot"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f103-yf-ufun"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f107-uc-eval"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f401-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f405-smdz-breadfruit"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f407-atk-explorer"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f407-st-discovery"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f410-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f411-atk-nano"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f411-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f411-weact-MiniF4"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f413-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f427-robomaster-a"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f429-armfly-v6"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f429-atk-apollo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f429-fire-challenger"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f429-st-disco"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f446-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f469-st-disco"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f746-st-disco"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f767-atk-apollo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f767-fire-challenger"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32f767-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32g070-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32g071-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32g431-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32h743-atk-apollo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32h743-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32h747-st-discovery"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l4r9-st-eval"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l010-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l053-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l412-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l432-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l433-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l475-atk-pandora"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l475-st-discovery"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l476-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l496-ali-developer"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32l496-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32mp157a-st-discovery"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32mp157a-st-ev1"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32/stm32wb55-st-nucleo"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "stm32f20x"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "swm320-lq100"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "beaglebone"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "zynq7000"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "frdm-k64f"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "fh8620"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "xplorer4330/M4"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "at32/at32f403a-start"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "at32/at32f407-start"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+         - action-version: "1.0"
+           RTT_BSP: "smartfusion2"
+           RTT_TOOL_CHAIN: "sourcery-arm"
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@master
+        with:
+          python-version: 3.8
+
+      - name: Install Tools
+        run: |
+          sudo apt-get -qq install gcc-multilib libsdl-dev scons
+          wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/arm-2017q2-v6/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 
+          sudo tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -C /opt  
+          /opt/gcc-arm-none-eabi-6-2017-q2-update/bin/arm-none-eabi-gcc --version
+
+          wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.1/mips-2016.05-7-mips-sde-elf-i686-pc-linux-gnu.tar.bz2 
+          sudo tar xjf mips-2016.05-7-mips-sde-elf-i686-pc-linux-gnu.tar.bz2 -C /opt  
+          /opt/mips-2016.05/bin/mips-sde-elf-gcc --version
+
+          echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV
+          echo "RTT_CC=gcc" >> $GITHUB_ENV
+
+      - name: ARM Scons Compile
+        if: ${{ matrix.RTT_TOOL_CHAIN == 'sourcery-arm' }}
+        env:
+          RTT_BSP: ${{ matrix.RTT_BSP }}
+          RTT_TOOL_CHAIN: ${{ matrix.RTT_TOOL_CHAIN }}
+        run: |
+          export RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-6-2017-q2-update/bin
+          scons -C bsp/$RTT_BSP
+
+      - name: MIPS Scons Compile
+        if: ${{ matrix.RTT_TOOL_CHAIN == 'sourcery-mips' }}
+        env:
+          RTT_BSP: ${{ matrix.RTT_BSP }}
+          RTT_TOOL_CHAIN: ${{ matrix.RTT_TOOL_CHAIN }}
+        run: |
+          export RTT_EXEC_PATH=/opt/mips-2016.05/bin
+          scons -C bsp/$RTT_BSP

+ 0 - 145
.travis.yml

@@ -1,145 +0,0 @@
-language: c
-
-notifications:
-  email: false
-
-before_script:
-# travis has changed to 64-bit and we require 32-bit compatibility libraries
-  - sudo apt-get update
-  # clang
-  - "sudo apt-get -qq install gcc-multilib libc6:i386 libgcc1:i386 libstdc++5:i386 libstdc++6:i386 libsdl-dev scons || true"
-  # - sudo apt-get -qq install gcc-arm-none-eabi
-  # - "[ $RTT_TOOL_CHAIN = 'sourcery-arm' ] && export RTT_EXEC_PATH=/usr/bin && arm-none-eabi-gcc --version || true"
-  # - "[ $RTT_TOOL_CHAIN = 'sourcery-arm' ] && curl -s https://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-2014.05-28-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 | sudo tar xjf - -C /opt && export RTT_EXEC_PATH=/opt/arm-2014.05/bin && /opt/arm-2014.05/bin/arm-none-eabi-gcc --version || true"
-  - "[ $RTT_TOOL_CHAIN = 'sourcery-arm' ] && wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/arm-2017q2-v6/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 && sudo tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -C /opt && export RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-6-2017-q2-update/bin && /opt/gcc-arm-none-eabi-6-2017-q2-update/bin/arm-none-eabi-gcc --version || true"
-  - "[ $RTT_TOOL_CHAIN = 'sourcery-mips' ] && wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.1/mips-2016.05-7-mips-sde-elf-i686-pc-linux-gnu.tar.bz2 && sudo tar xjf mips-2016.05-7-mips-sde-elf-i686-pc-linux-gnu.tar.bz2 -C /opt && export RTT_EXEC_PATH=/opt/mips-2016.05/bin && /opt/mips-2016.05/bin/mips-sde-elf-gcc --version || true"
-  # - "[ $RTT_TOOL_CHAIN = 'sourcery-ppc' ] && curl -s https://sourcery.mentor.com/public/gnu_toolchain/powerpc-eabi/freescale-2011.03-39-powerpc-eabi-i686-pc-linux-gnu.tar.bz2 | sudo tar xjf - -C /opt && export RTT_EXEC_PATH=/opt/freescale-2011.03/bin && /opt/freescale-2011.03/bin/powerpc-eabi-gcc --version || true"
-  # - "[ $RTT_TOOL_CHAIN = 'atmel-avr32' ] && curl -s http://www.atmel.com/images/avr32-gnu-toolchain-3.4.1.348-linux.any.x86.tar.gz | sudo tar xzf - -C /opt && export RTT_EXEC_PATH=/opt/avr32-gnu-toolchain-linux_x86/bin && /opt/avr32-gnu-toolchain-linux_x86/bin/avr32-gcc --version && curl -sO http://www.atmel.com/images/avr-headers-3.2.3.970.zip && unzip -qq avr-headers-3.2.3.970.zip -d bsp/$RTT_BSP || true"
-  - export RTT_ROOT=`pwd`
-  - "[ x$RTT_CC == x ] && export RTT_CC='gcc' || true"
-
-env:
-#  - RTT_BSP='simulator' RTT_CC='clang-analyze' RTT_EXEC_PATH=/usr/share/clang/scan-build
-  - RTT_BSP='CME_M7' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='apollo2' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='asm9260t' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='allwinner_tina' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='avr32uc3b0' RTT_TOOL_CHAIN='atmel-avr32'
-#  - RTT_BSP='bf533' # no scons
-  - RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='es32f0334' RTT_TOOL_CHAIN='sourcery-arm' # not support gcc
-#  - RTT_BSP='es32f0654' RTT_TOOL_CHAIN='sourcery-arm' # not support gcc
-  - RTT_BSP='gd32e230k-start' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='gd32303e-eval' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='gd32450z-eval' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='gkipc' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='imx6sx/cortex-a9' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='imxrt/imxrt1052-atk-commander' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='imxrt/imxrt1052-fire-pro' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='imxrt/imxrt1052-nxp-evk' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lm3s8962' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lm3s9b9x' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lm4f232' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='tm4c123bsp' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='tm4c129x' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc176x' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc178x' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc1114' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='lpc824' RTT_TOOL_CHAIN='sourcery-arm' # not support gcc
-  - RTT_BSP='lpc2148' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc2478' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc5410x' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='lpc54114-lite' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='lpc54608-LPCXpresso' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='ls1bdev' RTT_TOOL_CHAIN='sourcery-mips'
-  - RTT_BSP='ls1cdev' RTT_TOOL_CHAIN='sourcery-mips'
-#  - RTT_BSP='m16c62p' # m32c
-  - RTT_BSP='mb9bf500r' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='mb9bf506r' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='mb9bf618s' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='mb9bf568r' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='microblaze' # no scons
-  - RTT_BSP='mini2440' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='mini4020' # no scons
-#  - RTT_BSP='mm32l07x' # not support gcc
-#  - RTT_BSP='nios_ii' # no scons
-#  - RTT_BSP='nuvoton_nuc472' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='nuvoton_m05x' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='pic32ethernet' # no scons
-  - RTT_BSP='qemu-vexpress-a9' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='qemu-vexpress-gemini' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='sam7x' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='simulator' # x86
-  - RTT_BSP='stm32/stm32f072-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f091-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-atk-nano' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-atk-warshipv3' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-dofly-lyc8' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-dofly-M3S' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-fire-arbitrary' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-hw100k-ibox' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-mini-system' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-onenet-nbiot' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f103-yf-ufun' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f107-uc-eval' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f401-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f405-smdz-breadfruit' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f407-atk-explorer' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f407-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f410-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f411-atk-nano' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f411-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f411-weact-MiniF4' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f413-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f427-robomaster-a' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f429-armfly-v6' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f429-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f429-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f429-st-disco' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f446-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f469-st-disco' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f746-st-disco' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f767-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f767-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32f767-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32g070-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32g071-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32g431-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32h743-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32h743-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32h747-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l4r9-st-eval' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l010-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l053-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l412-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l432-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l433-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l475-atk-pandora' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l475-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l476-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l496-ali-developer' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32l496-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32mp157a-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32mp157a-st-ev1' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='swm320-lq100' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='stm32/stm32wb55-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'
-#  - RTT_BSP='upd70f3454' # iar
-#  - RTT_BSP='x86' # x86
-  - RTT_BSP='beaglebone' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='zynq7000' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='frdm-k64f' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='fh8620' RTT_TOOL_CHAIN='sourcery-arm'
-#  - RTT_BSP='x1000' RTT_TOOL_CHAIN='sourcery-mips'
-  - RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='at32/at32f403a-start' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='at32/at32f407-start' RTT_TOOL_CHAIN='sourcery-arm'
-  - RTT_BSP='smartfusion2' RTT_TOOL_CHAIN='sourcery-arm'
-
-stage: compile
-script:
-  - scons -C bsp/$RTT_BSP

+ 2 - 2
bsp/allwinner_tina/drivers/drv_uart.c

@@ -120,8 +120,8 @@ int rt_hw_uart_init(void)
         uart->irqno        = UART1_INTERRUPT; // IRQ_UART1;
         uart->gpio_rx_port = GPIO_PORT_A;
         uart->gpio_tx_port = GPIO_PORT_A;
-        uart->gpio_rx_pin  = GPIO_PIN_3;
-        uart->gpio_tx_pin  = GPIO_PIN_2;
+        uart->gpio_rx_pin  = GPIO_PIN_2;
+        uart->gpio_tx_pin  = GPIO_PIN_3;
         uart->gpio_rx_fun  = IO_FUN_4;
         uart->gpio_tx_fun  = IO_FUN_4;
 

+ 1 - 1
bsp/allwinner_tina/drivers/spi/drv_spi.c

@@ -483,7 +483,7 @@ static rt_err_t configure(struct rt_spi_device *device,
         SPI_SetFirstTransmitBit(spi, SPI_TCTRL_FBS_LSB);
     }
 
-    switch (configuration->mode)
+    switch (configuration->mode & RT_SPI_MODE_3)
     {
     case RT_SPI_MODE_0:
         SPI_SetSclkMode(spi, SPI_SCLK_Mode0);

+ 5 - 0
bsp/lpc43xx/M0/applications/vbus_hw.h

@@ -7,6 +7,9 @@
  * 2015-01-07     Grissiom     init commit
  */
 
+#ifndef __VBUS_HW_H__
+#define __VBUS_HW_H__
+
 #include <rtthread.h>
 #include <board.h>
 
@@ -32,3 +35,5 @@ rt_inline void rt_vbus_smp_mb(void)
 {
     __DSB();
 }
+
+#endif /* __VBUS_HW_H__ */

+ 5 - 0
bsp/lpc43xx/M4/applications/vbus_hw.h

@@ -7,6 +7,9 @@
  * 2015-01-07     Grissiom     init commit
  */
 
+#ifndef __VBUS_HW_H__
+#define __VBUS_HW_H__
+
 #include <rtthread.h>
 #include <board.h>
 
@@ -32,3 +35,5 @@ rt_inline void rt_vbus_smp_mb(void)
 {
     __DSB();
 }
+
+#endif /* __VBUS_HW_H__ */

+ 0 - 2
bsp/nrf5x/libraries/drivers/drv_adc.c

@@ -12,8 +12,6 @@
 
 #ifdef RT_USING_ADC
 
-#define ADC_NAME "adc"
-
 struct rt_adc_device nrf5x_adc_device;
 
 drv_nrfx_saadc_result_t results;

+ 2 - 0
bsp/nrf5x/libraries/drivers/drv_adc.h

@@ -16,6 +16,8 @@
 #include <hal/nrf_saadc.h>
 #include <drivers/include/nrfx_saadc.h>
 
+#define ADC_NAME "adc"
+
 /* 
     previous definition in application
     

+ 66 - 13
bsp/raspberry-pi/raspi4-32/.config

@@ -14,7 +14,7 @@ CONFIG_RT_ALIGN_SIZE=4
 CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 CONFIG_RT_THREAD_PRIORITY_MAX=32
-CONFIG_RT_TICK_PER_SECOND=100
+CONFIG_RT_TICK_PER_SECOND=1000
 CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_USING_IDLE_HOOK=y
@@ -54,6 +54,7 @@ CONFIG_RT_USING_MEMPOOL=y
 # CONFIG_RT_USING_NOHEAP is not set
 CONFIG_RT_USING_SMALL_MEM=y
 # CONFIG_RT_USING_SLAB is not set
+# CONFIG_RT_USING_USERHEAP is not set
 # CONFIG_RT_USING_MEMTRACE is not set
 CONFIG_RT_USING_HEAP=y
 
@@ -65,7 +66,7 @@ CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
-CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
+CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 CONFIG_RT_VER_NUM=0x40003
 # CONFIG_RT_USING_CPU_FFS is not set
 CONFIG_ARCH_ARMV8=y
@@ -141,14 +142,20 @@ CONFIG_RT_USING_DFS_DEVFS=y
 #
 CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_PIPE_BUFSZ=512
-# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
+CONFIG_RT_USING_SYSTEM_WORKQUEUE=y
+CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=2048
+CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=23
 CONFIG_RT_USING_SERIAL=y
 CONFIG_RT_SERIAL_USING_DMA=y
-CONFIG_RT_SERIAL_RB_BUFSZ=64
+CONFIG_RT_SERIAL_RB_BUFSZ=512
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set
-# CONFIG_RT_USING_I2C is not set
+CONFIG_RT_USING_I2C=y
+# CONFIG_RT_I2C_DEBUG is not set
+CONFIG_RT_USING_I2C_BITOPS=y
+# CONFIG_RT_I2C_BITOPS_DEBUG is not set
+# CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_DAC is not set
@@ -173,7 +180,7 @@ CONFIG_RT_USING_SPI=y
 CONFIG_RT_USING_WDT=y
 # CONFIG_RT_USING_AUDIO is not set
 # CONFIG_RT_USING_SENSOR is not set
-# CONFIG_RT_USING_TOUCH is not set
+CONFIG_RT_USING_TOUCH=y
 # CONFIG_RT_USING_HWCRYPTO is not set
 # CONFIG_RT_USING_PULSE_ENCODER is not set
 # CONFIG_RT_USING_INPUT_CAPTURE is not set
@@ -204,7 +211,13 @@ CONFIG_RT_USING_POSIX=y
 #
 # Socket abstraction layer
 #
-# CONFIG_RT_USING_SAL is not set
+CONFIG_RT_USING_SAL=y
+
+#
+# protocol stack implement
+#
+CONFIG_SAL_USING_LWIP=y
+CONFIG_SAL_USING_POSIX=y
 
 #
 # Network interface device
@@ -376,6 +389,7 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_AGILE_JSMN is not set
 # CONFIG_PKG_USING_PDULIB is not set
 # CONFIG_PKG_USING_BTSTACK is not set
+# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
 
 #
 # security packages
@@ -402,6 +416,8 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_WAVPLAYER is not set
 # CONFIG_PKG_USING_TJPGD is not set
 # CONFIG_PKG_USING_HELIX is not set
+# CONFIG_PKG_USING_AZUREGUIX is not set
+# CONFIG_PKG_USING_TOUCHGFX2RTT is not set
 
 #
 # tools packages
@@ -416,6 +432,7 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_ADBD is not set
 # CONFIG_PKG_USING_COREMARK is not set
 # CONFIG_PKG_USING_DHRYSTONE is not set
+# CONFIG_PKG_USING_MEMORYPERF is not set
 # CONFIG_PKG_USING_NR_MICRO_SHELL is not set
 # CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set
 # CONFIG_PKG_USING_LUNAR_CALENDAR is not set
@@ -423,6 +440,7 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_GPS_RMC is not set
 # CONFIG_PKG_USING_URLENCODE is not set
 # CONFIG_PKG_USING_UMCN is not set
+# CONFIG_PKG_USING_LWRB2RTT is not set
 
 #
 # system packages
@@ -449,7 +467,16 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_RAMDISK is not set
 # CONFIG_PKG_USING_MININI is not set
 # CONFIG_PKG_USING_QBOOT is not set
+
+#
+# Micrium: Micrium software products porting for RT-Thread
+#
 # CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
+# CONFIG_PKG_USING_UCOSII_WRAPPER is not set
+# CONFIG_PKG_USING_UC_CRC is not set
+# CONFIG_PKG_USING_UC_CLK is not set
+# CONFIG_PKG_USING_UC_COMMON is not set
+# CONFIG_PKG_USING_UC_MODBUS is not set
 # CONFIG_PKG_USING_PPOOL is not set
 
 #
@@ -505,6 +532,8 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_WK2124 is not set
 # CONFIG_PKG_USING_LY68L6400 is not set
 # CONFIG_PKG_USING_DM9051 is not set
+# CONFIG_PKG_USING_SSD1306 is not set
+# CONFIG_PKG_USING_QKEY is not set
 
 #
 # miscellaneous packages
@@ -534,6 +563,7 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
 # CONFIG_PKG_USING_HELLO is not set
 # CONFIG_PKG_USING_VI is not set
+# CONFIG_PKG_USING_KI is not set
 # CONFIG_PKG_USING_NNOM is not set
 # CONFIG_PKG_USING_LIBANN is not set
 # CONFIG_PKG_USING_ELAPACK is not set
@@ -542,8 +572,13 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_ULAPACK is not set
 # CONFIG_PKG_USING_UKAL is not set
 # CONFIG_PKG_USING_CRCLIB is not set
+
+#
+# games: games run on RT-Thread console
+#
 # CONFIG_PKG_USING_THREES is not set
 # CONFIG_PKG_USING_2048 is not set
+# CONFIG_PKG_USING_TETRIS is not set
 # CONFIG_PKG_USING_LWGPS is not set
 # CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
 
@@ -584,6 +619,9 @@ CONFIG_RT_LWIP_USING_PING=y
 # CONFIG_PKG_USING_DCM is not set
 # CONFIG_PKG_USING_EMQ is not set
 # CONFIG_PKG_USING_CFGM is not set
+# CONFIG_PKG_USING_RT_CMSIS_DAP is not set
+# CONFIG_PKG_USING_VIRTUAL_DEVICE is not set
+# CONFIG_PKG_USING_SMODULE is not set
 CONFIG_BCM2711_SOC=y
 # CONFIG_BSP_SUPPORT_FPU is not set
 
@@ -596,10 +634,10 @@ CONFIG_BCM2711_SOC=y
 #
 CONFIG_BSP_USING_UART=y
 CONFIG_RT_USING_UART0=y
-# CONFIG_RT_USING_UART1 is not set
+CONFIG_RT_USING_UART1=y
 CONFIG_RT_USING_UART3=y
-CONFIG_RT_USING_UART4=y
-# CONFIG_RT_USING_UART5 is not set
+# CONFIG_RT_USING_UART4 is not set
+CONFIG_RT_USING_UART5=y
 CONFIG_BSP_USING_GIC=y
 CONFIG_BSP_USING_GIC400=y
 # CONFIG_BSP_USING_GIC500 is not set
@@ -607,10 +645,19 @@ CONFIG_BSP_USING_PIN=y
 CONFIG_BSP_USING_SPI=y
 CONFIG_BSP_USING_SPI0_BUS=y
 CONFIG_BSP_USING_SPI0_DEVICE0=y
-# CONFIG_BSP_USING_SPI0_DEVICE1 is not set
+CONFIG_BSP_USING_SPI0_DEVICE1=y
+CONFIG_BSP_USING_I2C=y
+# CONFIG_BSP_USING_I2C0 is not set
+# CONFIG_BSP_USING_I2C1 is not set
+CONFIG_BSP_USING_I2C3=y
+# CONFIG_BSP_USING_I2C4 is not set
+# CONFIG_BSP_USING_I2C5 is not set
+# CONFIG_BSP_USING_I2C6 is not set
 CONFIG_BSP_USING_CORETIMER=y
 # CONFIG_BSP_USING_SYSTIMER is not set
 CONFIG_BSP_USING_WDT=y
+CONFIG_BSP_USING_ETH=y
+# CONFIG_BSP_USING_BULETOOTH is not set
 # CONFIG_BSP_USING_RTC is not set
 CONFIG_BSP_USING_SDIO=y
 CONFIG_BSP_USING_SDIO0=y
@@ -618,5 +665,11 @@ CONFIG_BSP_USING_SDIO0=y
 #
 # Board Peripheral Drivers
 #
-CONFIG_BSP_USING_HDMI=y
-CONFIG_BSP_USING_HDMI_DISPLAY=y
+CONFIG_BSP_USING_LCD=y
+# CONFIG_BSP_USING_HDMI_DISPLAY is not set
+CONFIG_BSP_USING_DSI_DISPLAY=y
+# CONFIG_BSP_USING_ILI9486 is not set
+CONFIG_BSP_USING_TOUCH=y
+CONFIG_BSP_USING_DSI_TOUCH_DEV=y
+# CONFIG_BSP_USING_XPT_TOUCH_DEV is not set
+# CONFIG_USING_LCD_CONSOLE is not set

+ 6 - 0
bsp/raspberry-pi/raspi4-32/README.md

@@ -129,6 +129,12 @@ msh />
 | HDMI | 支持 | - |
 | SDIO | 支持 | - |
 | ETH | 支持 | - |
+| BSC | 支持 | - |
+| DMA | 支持 | - |
+| DSI LCD/TOUCH | 支持     | DSI接口的LCD和TOUCH |
+| ILI9486 SPI LCD | 支持 | - |
+| XPT2046 TOUCH | 支持     | - |
+| BULETOOTH | 正在完善 | 支持reset,loadfirmware |
 
 ## 5. 注意事项
 

+ 61 - 4
bsp/raspberry-pi/raspi4-32/driver/Kconfig

@@ -50,7 +50,7 @@ menu "Hardware Drivers Config"
             select RT_USING_PIN
             default y
 
-            menuconfig BSP_USING_SPI
+        menuconfig BSP_USING_SPI
             bool "Enable SPI"
             select RT_USING_SPI
             default n
@@ -69,6 +69,32 @@ menu "Hardware Drivers Config"
                 default n
         endif
 
+        menuconfig BSP_USING_I2C
+            bool "Enable I2C"
+            select RT_USING_I2C
+            default n
+
+        if BSP_USING_I2C   
+            config BSP_USING_I2C0
+                bool "Enable I2C0 BUS"
+                default n
+            config BSP_USING_I2C1
+                bool "Enable I2C1 BUS"
+                default n
+            config BSP_USING_I2C3
+                bool "Enable I2C3 BUS"
+                default n
+            config BSP_USING_I2C4
+                bool "Enable I2C4 BUS"
+                default n
+            config BSP_USING_I2C5
+                bool "Enable I2C5 BUS"
+                default n
+            config BSP_USING_I2C6
+                bool "Enable I2C6 BUS"
+                default n
+        endif
+
         config BSP_USING_CORETIMER
             bool "Using core timer"
             select RT_USING_CORETIMER
@@ -93,6 +119,14 @@ menu "Hardware Drivers Config"
             select RT_USING_WDT
             default n
 
+        config BSP_USING_ETH
+            bool "Enable ETH"
+            default n
+
+        config BSP_USING_BULETOOTH
+            bool "Enable BULETOOTH"
+            default n
+
         menuconfig BSP_USING_RTC
             bool "Enable RTC"
             select RT_USING_RTC
@@ -119,14 +153,37 @@ menu "Hardware Drivers Config"
     endmenu
 
     menu "Board Peripheral Drivers"
-        menuconfig BSP_USING_HDMI
-            bool "Enable HDMI"
+        menuconfig BSP_USING_LCD
+            bool "Enable LCD"
             default n
 
-        if BSP_USING_HDMI
+        if BSP_USING_LCD
             config BSP_USING_HDMI_DISPLAY
                 bool "HDMI DISPLAY"
                 default n
+            config BSP_USING_DSI_DISPLAY
+                bool "DSI DISPLAY"
+                default n
+            config BSP_USING_ILI9486
+                bool "ILI9486 DISPLAY"
+                default n
+        endif
+
+        menuconfig BSP_USING_TOUCH
+            bool "Enable Touch"
+            default n
+
+        if BSP_USING_TOUCH
+            config BSP_USING_DSI_TOUCH_DEV
+                bool "DSI TOUCH"
+                default n
+            config BSP_USING_XPT_TOUCH_DEV
+                bool "XPT TOUCH"
+                default n
         endif
+
+        config USING_LCD_CONSOLE
+            bool "LCD CONSOLE"
+            default n
     endmenu
 endmenu

+ 11 - 1
bsp/raspberry-pi/raspi4-32/driver/SConscript

@@ -1,9 +1,19 @@
+# RT-Thread building script for component
 from building import *
 
 cwd     = GetCurrentDir()
-src     = Glob('*.c') + Glob('*.cpp')
+src     = Glob('*.c') + Glob('*.cpp') + Glob('*.a')
 CPPPATH = [cwd, str(Dir('#'))]
 
+if not GetDepend('BSP_USING_ETH'):
+    SrcRemove(src, ['drv_eth.c'])
+if not GetDepend('BSP_USING_SPI'):
+    SrcRemove(src, ['drv_spi.c'])
+if not GetDepend('BSP_USING_WDT'):
+    SrcRemove(src, ['drv_wdt.c'])
+if not GetDepend('BSP_USING_BULETOOTH'):
+    SrcRemove(src, ['drv_bluetooth.c'])
+
 group = DefineGroup('driver', src, depend = [''], CPPPATH = CPPPATH)
 
 # build for sub-directory

+ 13 - 7
bsp/raspberry-pi/raspi4-32/driver/board.c

@@ -16,13 +16,15 @@
 
 #include "cp15.h"
 #include "mmu.h"
+#include "mbox.h"
 
 struct mem_desc platform_mem_desc[] = {
     {0x0, 0x6400000, 0x0, NORMAL_MEM},
     {0x8000000, 0x8800000, 0x8000000, DEVICE_MEM},    //mbox msg
-    {0x0EA00000, 0x0EE00000, 0x0EA00000, DEVICE_MEM}, //framebuffer
+    {0x0E000000, 0x0EE00000, 0x0E000000, DEVICE_MEM}, //framebuffer
+    {0x0F400000, 0x0FA00000, 0x0F400000, DEVICE_MEM}, //dsi_touch 
     {0xFD500000, 0xFDA00000, 0xFD500000, DEVICE_MEM}, //gmac
-    {0xFE000000, 0xFE400000, 0xFE000000, DEVICE_MEM}, //peripheral
+    {0xFE000000, 0xFF000000, 0xFE000000, DEVICE_MEM}, //peripheral
     {0xFF800000, 0xFFA00000, 0xFF800000, DEVICE_MEM}  //gic
 };
 
@@ -36,21 +38,25 @@ void rt_hw_timer_isr(int vector, void *parameter)
 
 void rt_hw_timer_init(void)
 {
-    rt_hw_interrupt_install(ARM_TIMER_IRQ, rt_hw_timer_isr, RT_NULL, "tick");
-    rt_hw_interrupt_umask(ARM_TIMER_IRQ);
+    rt_uint32_t apb_clock = 0;
+    rt_uint32_t timer_clock = 1000000;
     /* timer_clock = apb_clock/(pre_divider + 1) */
-    ARM_TIMER_PREDIV = (250 - 1);
+    apb_clock = bcm271x_mbox_clock_get_rate(CORE_CLK_ID);
+    ARM_TIMER_PREDIV = (apb_clock/timer_clock - 1);
 
     ARM_TIMER_RELOAD = 0;
     ARM_TIMER_LOAD   = 0;
     ARM_TIMER_IRQCLR = 0;
     ARM_TIMER_CTRL   = 0;
 
-    ARM_TIMER_RELOAD = 10000;
-    ARM_TIMER_LOAD   = 10000;
+    ARM_TIMER_RELOAD = 1000000/RT_TICK_PER_SECOND;
+    ARM_TIMER_LOAD   = 1000000/RT_TICK_PER_SECOND;
 
     /* 23-bit counter, enable interrupt, enable timer */
     ARM_TIMER_CTRL   = (1 << 1) | (1 << 5) | (1 << 7);
+
+    rt_hw_interrupt_install(ARM_TIMER_IRQ, rt_hw_timer_isr, RT_NULL, "tick");
+    rt_hw_interrupt_umask(ARM_TIMER_IRQ);
 }
 
 void idle_wfi(void)

+ 885 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_bluetooth.c

@@ -0,0 +1,885 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-29     bigmagic       first version
+ */
+#include <rthw.h>
+#include <rtthread.h>
+
+#include "drv_bluetooth.h"
+#include "drv_uart.h"
+#include "raspi4.h"
+
+//https://github.com/RPi-Distro/bluez-firmware/tree/master/broadcom
+//arm-none-eabi-objcopy.exe -I binary -O elf32-littlearm -B arm driver\BCM4345C0.hcd driver\BCM4345C0.a
+
+#define BT_UART_NAME     "uart0"
+#define BT_TX_MAX        (256)
+#define BT_RX_MAX        (256)
+#define BT_HEAD_NUM      (4)
+#define BT_TRY_NUM_MAX   (3)
+#define BT_SEND_MIN_PACK (8)
+
+unsigned char lo(unsigned int val) { return (unsigned char)(val & 0xff); }
+unsigned char hi(unsigned int val) { return (unsigned char)((val & 0xff00) >> 8); }
+
+#define BT_THREAD_STACK_SIZE (2048)
+#define BT_THREAD_PRIORITY   (15)
+#define BT_THREAD_TICK       (10)
+
+enum
+{
+    LE_EVENT_CODE = 0x3e,
+    LE_CONNECT_CODE = 0x01,
+    LE_ADREPORT_CODE = 0x02,
+    HCI_ACL_PKT = 0x02,
+    HCI_EVENT_PKT = 0x04
+};
+
+static char ch;
+static rt_sem_t bt_rx_sem = RT_NULL;
+static rt_device_t bt_device;
+
+static rt_uint8_t tx_buff[BT_TX_MAX];
+static rt_uint8_t rx_buff[BT_RX_MAX];
+
+static rt_err_t bt_rx_ind(rt_device_t dev, rt_size_t size)
+{
+    rt_sem_release(bt_rx_sem);
+    return RT_EOK;
+}
+
+int bt_uart_send_data(rt_device_t dev, rt_uint32_t *buf, int len)
+{
+    return rt_device_write(dev, 0, buf, len);
+}
+
+
+void bt_uart_receive_flush(rt_device_t dev)
+{
+    rt_device_read(dev, RT_NULL, rx_buff, BT_RX_MAX);
+}
+
+int bt_uart_receive_data(rt_device_t dev, rt_uint8_t *buf, rt_uint32_t *len, rt_int32_t time)
+{
+    rt_uint16_t ii = 0;
+
+    ii = rt_device_read(dev, 0, buf, BT_RX_MAX);
+    *len = ii;
+    return ii;
+}
+
+void bt_data_pack(rt_uint8_t *tx_buff, rt_uint8_t ogf, rt_uint8_t ocf, rt_uint32_t data_len)
+{
+    tx_buff[0] = BT_HCI_COMMAND_PKT;
+    tx_buff[1] = ogf; //hi(ogf << 10 | ocf);//opcode hi
+    tx_buff[2] = ocf; //lo(ogf << 10 | ocf);//opcode lo
+    tx_buff[3] = data_len;
+}
+
+rt_uint32_t bt_reply_check(const rt_uint8_t *buff, rt_uint16_t ogf, rt_uint16_t ocf, int pack_len)
+{
+    //step 1
+    if (buff[0] != BT_HCI_EVENT_PKT)
+    {
+        return 1;
+    }
+
+    //step2
+    if (buff[1] == BT_CONNECT_COMPLETE_CODE)
+    {
+        if (buff[2] != 4)
+        {
+            return 2;
+        }
+
+        //err code
+        if (buff[3] != 0)
+        {
+            rt_kprintf("Saw HCI COMMAND STATUS error:%d", buff[3]);
+            return 12;
+        }
+
+        if (buff[4] == 0)
+        {
+            return 3;
+        }
+
+        if (buff[5] != ogf)
+        {
+            return 4;
+        }
+
+        if (buff[6] != ocf)
+        {
+            return 5;
+        }
+    }
+    else if (buff[1] == BT_COMMAND_COMPLETE_CODE)
+    {
+        if (buff[2] != 4)
+        {
+            return 6;
+        }
+
+        if (buff[3] == 0)
+        {
+            return 7;
+        }
+
+        if (buff[4] != ogf)
+        {
+            return 8;
+        }
+
+        if (buff[5] != ocf)
+        {
+            return 9;
+        }
+
+        if (buff[6] == 0)
+        {
+            return 10;
+        }
+    }
+    else
+    {
+        return 11;
+    }
+
+    return 0;
+}
+
+rt_err_t bt_loadfirmware(void)
+{
+
+    int ii = 0;
+    int ret = 0;
+    int recv_len = BT_RX_MAX;
+    int step = 0;
+    rt_uint8_t ogf, ocf;
+
+    rt_memset(tx_buff, 0, BT_TX_MAX);
+
+    ogf = hi(BT_OGF_VENDOR << 10 | BT_COMMAND_LOAD_FIRMWARE);
+    ocf = lo(BT_OGF_VENDOR << 10 | BT_COMMAND_LOAD_FIRMWARE);
+
+    bt_data_pack(tx_buff, ogf, ocf, 0);
+    int kk = 0;
+    for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+    {
+        recv_len = BT_RX_MAX;
+        bt_uart_receive_flush(bt_device);
+        bt_uart_send_data(bt_device, tx_buff, BT_SEND_MIN_PACK);
+        rt_thread_mdelay(5);
+
+        ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 2000);
+
+        if (ret > 0)
+        {
+            ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+            if (ret == 0)
+            {
+                step = 1;
+                break;
+            }
+            else
+            {
+                rt_kprintf("err code is %d\n", ret);
+            }
+        }
+    }
+
+    if (step == 1)
+    {
+        extern unsigned char _binary_driver_BCM4345C0_hcd_size[];
+        extern unsigned char _binary_driver_BCM4345C0_hcd_start[];
+        unsigned int c = 0;
+        unsigned int size = (long)&_binary_driver_BCM4345C0_hcd_size;
+        while (c < size)
+        {
+            //unsigned char opcodebytes[] = {_binary_BCM4345C0_hcd_start[c], _binary_BCM4345C0_hcd_start[c + 1]};
+            unsigned char length = _binary_driver_BCM4345C0_hcd_start[c + 2];
+            unsigned char *data = &(_binary_driver_BCM4345C0_hcd_start[c + 3]);
+            rt_memset(tx_buff, 0, BT_TX_MAX);
+
+            ogf = _binary_driver_BCM4345C0_hcd_start[c + 1];
+            ocf = _binary_driver_BCM4345C0_hcd_start[c];
+            bt_data_pack(tx_buff, ogf, ocf, length);
+
+            rt_memcpy(&tx_buff[BT_HEAD_NUM], data, length);
+            int kk = 0;
+            for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+            {
+                recv_len = BT_RX_MAX;
+                rt_memset(rx_buff, 0, BT_TX_MAX);
+                bt_uart_receive_flush(bt_device);
+                bt_uart_send_data(bt_device, tx_buff, length + BT_HEAD_NUM);
+                bt_uart_receive_flush(bt_device);
+                rt_thread_mdelay(5);
+                ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+
+                if (ret > 0)
+                {
+                    ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+                    if (ret == 0)
+                    {
+                        step = 2;
+                        break;
+                    }
+                    else
+                    {
+                        rt_kprintf("err code is %d\n", ret);
+                    }
+                }
+            }
+
+            if (ii >= 3)
+            {
+                step = 3;
+                break;
+            }
+            c += 3 + length;
+        }
+
+        if (step != 3)
+        {
+            return RT_EOK;
+        }
+    }
+    else
+    {
+        return RT_ERROR;
+    }
+
+    return RT_ERROR;
+}
+
+rt_err_t bt_setbaud(void)
+{
+    static unsigned char params[] = {0, 0, 0x00, 0xc2, 0x01, 0x00}; // little endian, 115200
+    int params_len = 6;
+    int ii = 0;
+    int ret = 0;
+
+    int recv_len = BT_RX_MAX;
+    rt_uint16_t ogf, ocf;
+
+    rt_memset(tx_buff, 0, BT_TX_MAX);
+
+    ogf = hi(BT_OGF_VENDOR << 10 | BT_COMMAND_SET_BAUD);
+    ocf = lo(BT_OGF_VENDOR << 10 | BT_COMMAND_SET_BAUD);
+
+    bt_data_pack(tx_buff, ogf, ocf, params_len);
+
+    //rt_memcpy(&tx_buff[BT_HEAD_NUM], params, params_len);
+    tx_buff[4] = 0x00;
+    tx_buff[5] = 0x01;
+    tx_buff[6] = 0xc2;
+    tx_buff[7] = 0x00;
+    tx_buff[8] = 0x00;
+    tx_buff[9] = 0x00;
+
+    for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+    {
+        recv_len = BT_RX_MAX;
+        bt_uart_receive_flush(bt_device);
+        bt_uart_send_data(bt_device, tx_buff, params_len + BT_HEAD_NUM);
+        rt_thread_mdelay(5);
+        ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+        if (ret > 0)
+        {
+            ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+            if (ret == 0)
+            {
+                return RT_EOK;
+            }
+            else
+            {
+                rt_kprintf("err code is %d\n", ret);
+            }
+        }
+    }
+    return RT_ERROR;
+}
+
+rt_err_t setLEeventmask(unsigned char mask)
+{
+    unsigned char params[] = {mask, 0, 0, 0, 0, 0, 0, 0};
+
+    //static unsigned char params[] = { 0xee, 0xff, 0xc0, 0xee, 0xff, 0xc0 }; // reversed
+    int params_len = 8;
+    int ii = 0;
+    int ret = 0;
+
+    int recv_len = BT_RX_MAX;
+    rt_uint16_t ogf, ocf;
+
+    rt_memset(tx_buff, 0, BT_TX_MAX);
+
+    ogf = hi(BT_OGF_LE_CONTROL << 10 | 0x01);
+    ocf = lo(BT_OGF_LE_CONTROL << 10 | 0x01);
+
+    bt_data_pack(tx_buff, ogf, ocf, params_len);
+
+    //rt_memcpy(&tx_buff[BT_HEAD_NUM], params, params_len);
+    tx_buff[4] = params[0];
+    tx_buff[5] = params[1];
+    tx_buff[6] = params[2];
+    tx_buff[7] = params[3];
+    tx_buff[8] = params[4];
+    tx_buff[9] = params[5];
+    tx_buff[10] = params[6];
+    tx_buff[11] = params[7];
+
+
+    for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+    {
+        recv_len = BT_RX_MAX;
+        bt_uart_receive_flush(bt_device);
+        bt_uart_send_data(bt_device, tx_buff, params_len + BT_HEAD_NUM);
+        rt_thread_mdelay(5);
+        ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+        if (ret > 0)
+        {
+            ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+            if (ret == 0)
+            {
+                return RT_EOK;
+            }
+            else
+            {
+                rt_kprintf("err code is %d\n", ret);
+            }
+        }
+    }
+    return RT_ERROR;
+
+    //if (hciCommand(OGF_LE_CONTROL, 0x01, params, 8)) uart_writeText("setLEeventmask failed\n");
+}
+
+rt_err_t bt_getbdaddr(unsigned char *bdaddr)
+{
+    static unsigned char params[] = {0x00, 0x10, 0x09, BT_HCI_COMMAND_PKT}; //get bdaddr
+    int params_len = 4;
+    int recv_len = BT_RX_MAX;
+
+    // rt_memcpy(tx_buff, params, 4);
+    tx_buff[0] = BT_HCI_COMMAND_PKT;
+    tx_buff[1] = 0x09;
+    tx_buff[2] = 0x10;
+    tx_buff[3] = 0x00;
+
+    bt_uart_receive_flush(bt_device);
+    bt_uart_send_data(bt_device, tx_buff, 4);
+    rt_thread_mdelay(100);
+    bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+    if (recv_len > 0)
+    {
+        if ((rx_buff[0] != BT_HCI_EVENT_PKT) || (rx_buff[1] != BT_COMMAND_COMPLETE_CODE))
+        {
+            return RT_ERROR;
+        }
+
+        if ((rx_buff[2] != 0x0a) || (rx_buff[3] != 0x01))
+        {
+            return RT_ERROR;
+        }
+
+        if ((rx_buff[4] != 0x09) || (rx_buff[5] != 0x10))
+        {
+            return RT_ERROR;
+        }
+        bdaddr[0] = rx_buff[7];
+        bdaddr[1] = rx_buff[8];
+        bdaddr[2] = rx_buff[9];
+
+        bdaddr[3] = rx_buff[10];
+        bdaddr[4] = rx_buff[11];
+        bdaddr[5] = rx_buff[12];
+
+    }
+    else
+    {
+        return RT_ERROR;
+    }
+
+    return RT_EOK;
+}
+
+rt_err_t setLEscanenable(unsigned char state, unsigned char duplicates)
+{
+    unsigned char params[] = {state, duplicates};
+
+    //static unsigned char params[] = { 0xee, 0xff, 0xc0, 0xee, 0xff, 0xc0 }; // reversed
+    int params_len = 2;
+    int ii = 0;
+    int ret = 0;
+
+    int recv_len = BT_RX_MAX;
+    rt_uint16_t ogf, ocf;
+
+    rt_memset(tx_buff, 0, BT_TX_MAX);
+
+    ogf = hi(BT_OGF_LE_CONTROL << 10 | 0x0c);
+    ocf = lo(BT_OGF_LE_CONTROL << 10 | 0x0c);
+
+    bt_data_pack(tx_buff, ogf, ocf, params_len);
+    tx_buff[4] = params[0];
+    tx_buff[5] = params[1];
+
+    //rt_memcpy(&tx_buff[BT_HEAD_NUM], params, params_len);
+
+    for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+    {
+        recv_len = BT_RX_MAX;
+        bt_uart_receive_flush(bt_device);
+        bt_uart_send_data(bt_device, tx_buff, params_len + BT_HEAD_NUM);
+        rt_thread_mdelay(5);
+        ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+        if (ret > 0)
+        {
+            ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+            if (ret == 0)
+            {
+                return RT_EOK;
+            }
+            else
+            {
+                rt_kprintf("err code is %d\n", ret);
+            }
+        }
+    }
+    return RT_ERROR;
+}
+
+rt_err_t setLEscanparameters(unsigned char type, unsigned char linterval, unsigned char hinterval, unsigned char lwindow, unsigned char hwindow, unsigned char own_address_type, unsigned char filter_policy)
+{
+    unsigned char params[] = {type, linterval, hinterval, lwindow, hwindow, own_address_type, filter_policy};
+
+    int params_len = 7;
+    int ii = 0;
+    int ret = 0;
+
+    int recv_len = BT_RX_MAX;
+    rt_uint16_t ogf, ocf;
+
+    rt_memset(tx_buff, 0, BT_TX_MAX);
+
+    ogf = hi(BT_OGF_LE_CONTROL << 10 | 0x0b);
+    ocf = lo(BT_OGF_LE_CONTROL << 10 | 0x0b);
+
+    bt_data_pack(tx_buff, ogf, ocf, params_len);
+    tx_buff[4] = params[0];
+    tx_buff[5] = params[1];
+    tx_buff[6] = params[2];
+    tx_buff[7] = params[3];
+    tx_buff[8] = params[4];
+    tx_buff[9] = params[5];
+    tx_buff[10] = params[6];
+    //rt_memcpy(&tx_buff[BT_HEAD_NUM], params, params_len);
+
+    for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+    {
+        recv_len = BT_RX_MAX;
+        bt_uart_receive_flush(bt_device);
+        bt_uart_send_data(bt_device, tx_buff, params_len + BT_HEAD_NUM);
+        rt_thread_mdelay(5);
+        ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+        if (ret > 0)
+        {
+            ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+            if (ret == 0)
+            {
+                return RT_EOK;
+            }
+            else
+            {
+                rt_kprintf("err code is %d\n", ret);
+            }
+        }
+    }
+    return RT_ERROR;
+}
+
+rt_err_t startActiveScanning()
+{
+    float BleScanInterval = 60; // every 60ms
+    float BleScanWindow = 60;
+    float BleScanDivisor = 0.625;
+
+    unsigned int p = BleScanInterval / BleScanDivisor;
+    unsigned int q = BleScanWindow / BleScanDivisor;
+
+    if (setLEscanparameters(BT_LL_SCAN_ACTIVE, lo(p), hi(p), lo(q), hi(q), 0, 0) == RT_EOK)
+    {
+        rt_kprintf("setLEscanparameters ok!\n");
+    }
+    if (setLEscanenable(1, 0) == RT_EOK)
+    {
+        rt_kprintf("setLEscanenable ok!\n");
+    }
+}
+
+rt_err_t bt_setbdaddr(void)
+{
+    static unsigned char params[] = {0xee, 0xff, 0xc0, 0xee, 0xff, 0xc0}; // reversed
+    int params_len = 6;
+    int ii = 0;
+    int ret = 0;
+
+    int recv_len = BT_RX_MAX;
+    rt_uint16_t ogf, ocf;
+
+    rt_memset(tx_buff, 0, BT_TX_MAX);
+
+    ogf = hi(BT_OGF_VENDOR << 10 | BT_COMMAND_SET_BDADDR);
+    ocf = lo(BT_OGF_VENDOR << 10 | BT_COMMAND_SET_BDADDR);
+
+    bt_data_pack(tx_buff, ogf, ocf, params_len);
+
+    tx_buff[4] = 0xc0;
+    tx_buff[5] = 0xff;
+    tx_buff[6] = 0xee;
+    tx_buff[7] = 0xc0;
+    tx_buff[8] = 0xff;
+    tx_buff[9] = 0xee;
+
+    //rt_memcpy(&tx_buff[BT_HEAD_NUM], params, params_len);
+
+    for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+    {
+        recv_len = BT_RX_MAX;
+        bt_uart_receive_flush(bt_device);
+        bt_uart_send_data(bt_device, tx_buff, params_len + BT_HEAD_NUM);
+        rt_thread_mdelay(5);
+        ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+        if (ret > 0)
+        {
+            ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+            if (ret == 0)
+            {
+                return RT_EOK;
+            }
+            else
+            {
+                rt_kprintf("err code is %d\n", ret);
+            }
+        }
+    }
+    return RT_ERROR;
+}
+rt_err_t bt_reset(void)
+{
+    int ii = 0;
+    int ret = 0;
+    int recv_len = BT_RX_MAX;
+    rt_uint16_t ogf, ocf;
+
+    rt_memset(tx_buff, 0, BT_TX_MAX);
+
+    ogf = hi(BT_OGF_HOST_CONTROL << 10 | BT_COMMAND_RESET_CHIP);
+    ocf = lo(BT_OGF_HOST_CONTROL << 10 | BT_COMMAND_RESET_CHIP);
+
+    bt_data_pack(tx_buff, ogf, ocf, 0);
+    for (ii = 0; ii < BT_TRY_NUM_MAX; ii++)
+    {
+        recv_len = BT_RX_MAX;
+        bt_uart_receive_flush(bt_device);
+        bt_uart_send_data(bt_device, tx_buff, 8);
+        rt_thread_mdelay(5);
+        ret = bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+        //rt_kprintf("recv_len is %d\n", recv_len);
+        if (ret > 0)
+        {
+            ret = bt_reply_check(rx_buff, ogf, ocf, RT_NULL);
+            if (ret == 0)
+            {
+                return RT_EOK;
+            }
+            else
+            {
+                rt_kprintf("err code is %d\n", ret);
+            }
+        }
+    }
+    return RT_ERROR;
+}
+
+rt_device_t bt_uart_init(const char *uartname)
+{
+    rt_device_t dev = RT_NULL;
+    if (strcmp(uartname, BT_UART_NAME) == 0)
+    {
+        bt_rx_sem = rt_sem_create("btbuf", 0, RT_IPC_FLAG_FIFO);
+        dev = rt_device_find(uartname);
+        if (dev == RT_NULL)
+        {
+            rt_kprintf("can no find dev %s\n", uartname);
+            return dev;
+        }
+
+        if (rt_device_open(dev, RT_DEVICE_OFLAG_RDWR) == RT_EOK)
+        {
+            rt_device_set_rx_indicate(dev, bt_rx_ind);
+        }
+        return dev;
+    }
+    return dev;
+}
+
+static void bt_task_entry(void *param)
+{
+    while (1)
+    {
+        rt_thread_delay(1000);
+    }
+}
+
+#define MAX_MSG_LEN 50
+#define MAX_READ_RUN 100
+
+unsigned char data_buf[MAX_MSG_LEN];
+unsigned int data_len;
+unsigned int messages_received = 0;
+unsigned int poll_state = 0;
+
+unsigned int got_echo_sid = 0;
+unsigned int got_echo_name = 0;
+unsigned char echo_addr[6];
+
+void hci_poll2(unsigned char byte)
+{
+    switch (poll_state)
+    {
+    case 0:
+        if (byte != HCI_EVENT_PKT)
+            poll_state = 0;
+        else
+            poll_state = 1;
+        break;
+    case 1:
+        if (byte != LE_EVENT_CODE)
+            poll_state = 0;
+        else
+            poll_state = 2;
+        break;
+    case 2:
+        if (byte > MAX_MSG_LEN)
+            poll_state = 0;
+        else
+        {
+            poll_state = 3;
+            data_len = byte;
+        }
+        break;
+    default:
+        data_buf[poll_state - 3] = byte;
+        if (poll_state == data_len + 3 - 1)
+        {
+            messages_received++;
+            poll_state = 0;
+        }
+        else
+            poll_state++;
+    }
+}
+
+unsigned char *hci_poll()
+{
+    int recv_len = 256;
+    unsigned int goal = messages_received + 1;
+    bt_uart_receive_data(bt_device, rx_buff, &recv_len, 1000);
+    rt_thread_mdelay(10);
+    if (recv_len > 0)
+    {
+        unsigned int run = 0;
+        while (run < MAX_READ_RUN && messages_received < goal)
+        {
+
+            recv_len = recv_len - 1;
+            hci_poll2(rx_buff[recv_len]);
+            run++;
+
+            if (recv_len == 0)
+            {
+                break;
+            }
+        }
+        if (run == MAX_READ_RUN)
+            return 0;
+        else
+            return data_buf;
+    }
+    return 0;
+}
+
+void bt_search()
+{
+    unsigned char *buf;
+
+    while ((buf = hci_poll()))
+    {
+        if (data_len >= 2)
+        {
+            if (buf[0] == LE_ADREPORT_CODE)
+            {
+                unsigned char numreports = buf[1];
+
+                if (numreports == 1)
+                {
+                    unsigned char event_type = buf[2];
+
+                    if (event_type == 0x00)
+                    {
+                        unsigned char buf_len = buf[10];
+                        unsigned char ad_len = buf[11];
+
+                        if (ad_len < data_len && buf_len + 11 == data_len - 1)
+                        {
+                            for (int c = 9; c >= 4; c--)
+                                echo_addr[9 - c] = buf[c];
+                            buf += 11;
+
+                            got_echo_sid = 0;
+                            got_echo_name = 0; // Reset the search state machine
+                            do
+                            {
+                                ad_len = buf[0];
+                                unsigned char ad_type = buf[1];
+                                buf += 2;
+
+                                if (ad_len >= 2)
+                                {
+                                    if (ad_type == 0x03)
+                                    {
+                                        unsigned int sid = 0;
+
+                                        for (int d = 0; d < ad_len - 1; d += 2)
+                                        {
+                                            sid = buf[d] | (buf[d + 1] << 8);
+                                            if (sid == 0xEC00)
+                                            {
+                                                rt_kprintf("sid is %d\n", sid);
+                                                //uart_hex(sid); uart_writeText(" ");
+                                                got_echo_sid = 1;
+                                            }
+                                        }
+                                    }
+                                    else if (ad_type == 0x09)
+                                    {
+                                        char remote_name[ad_len - 1];
+                                        unsigned int d = 0;
+
+                                        while (d < ad_len - 1)
+                                        {
+                                            remote_name[d] = buf[d];
+                                            d++;
+                                        }
+                                        if (!memcmp(remote_name, "echo", 4))
+                                        {
+                                            rt_kprintf("remote_name is %s\n", remote_name);
+                                            got_echo_name = 1;
+                                        }
+                                    }
+                                }
+
+                                buf += ad_len - 1;
+                            } while (buf[1]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+void bt_uart_protocol_init()
+{
+    rt_thread_t bt_tid = RT_NULL;
+    bt_device = bt_uart_init(BT_UART_NAME);
+    bt_tid = rt_thread_create("bt_task", bt_task_entry, RT_NULL, BT_THREAD_STACK_SIZE, BT_THREAD_PRIORITY, BT_THREAD_TICK);
+    if (bt_tid == RT_NULL)
+    {
+        rt_kprintf("bt_task create err!\n");
+        return 0;
+    }
+    rt_thread_startup(bt_tid);
+}
+
+int rt_hw_bluetooth_init(void)
+{
+    bt_uart_protocol_init();
+    if (bt_reset() == RT_EOK)
+    {
+        rt_kprintf("bluetooth reset ok!\n");
+    }
+    else
+    {
+        rt_kprintf("bluetooth reset err!\n");
+    }
+
+    rt_thread_delay(10);
+    if (bt_loadfirmware() == RT_EOK)
+    {
+        rt_kprintf("loadfirmware ok!\n");
+    }
+    else
+    {
+        rt_kprintf("loadfirmware err!\n");
+    }
+    rt_thread_delay(10);
+    if (bt_setbaud() == RT_EOK)
+    {
+        rt_kprintf("setbaud ok!\n");
+    }
+    else
+    {
+        rt_kprintf("setbaud err!\n");
+    }
+
+    rt_thread_delay(10);
+    if (bt_setbdaddr() == RT_EOK)
+    {
+        rt_kprintf("setbdaddr ok!\n");
+    }
+    else
+    {
+        rt_kprintf("setbdaddr err!\n");
+    }
+    rt_thread_delay(100);
+    rt_uint8_t bdaddr[6];
+    if (bt_getbdaddr(bdaddr) == RT_EOK)
+    {
+        rt_kprintf("bdaddr :%02x:%02x:%02x:%02x:%02x:%02x\n", bdaddr[0], bdaddr[1], bdaddr[2], bdaddr[3], bdaddr[4], bdaddr[5]);
+    }
+    else
+    {
+        rt_kprintf("getbdaddr err!\n");
+    }
+
+    rt_thread_delay(100);
+
+    if (setLEeventmask(0xff) == RT_EOK)
+    {
+        rt_kprintf("setLEeventmask ok!\n");
+    }
+    rt_thread_delay(100);
+    startActiveScanning();
+    rt_thread_delay(500);
+    rt_kprintf("start!\n");
+    while (1)
+    {
+        bt_search();
+        if (got_echo_sid && got_echo_name)
+        {
+            break;
+        }
+        rt_thread_mdelay(10);
+    }
+    rt_kprintf("stop scan!\n");
+}

+ 28 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_bluetooth.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-29     bigmagic       first version
+ */
+#ifndef __DRV_BT_H__
+#define __DRV_BT_H__
+
+#define     BT_HCI_COMMAND_PKT          (0x01)
+#define     BT_OGF_HOST_CONTROL         (0x03)
+#define     BT_OGF_LE_CONTROL           (0x08)
+#define     BT_OGF_VENDOR               (0x3f)
+#define     BT_COMMAND_SET_BDADDR       (0x01)
+#define     BT_COMMAND_RESET_CHIP       (0x03)
+#define     BT_COMMAND_SET_BAUD         (0x18)
+#define     BT_COMMAND_LOAD_FIRMWARE    (0x2e)
+#define     BT_HCI_ACL_PKT              (0x02)
+#define     BT_HCI_EVENT_PKT            (0x04)
+#define     BT_COMMAND_COMPLETE_CODE    (0x0e)
+#define     BT_CONNECT_COMPLETE_CODE    (0x0f)
+#define     BT_LL_SCAN_ACTIVE           (0x01)
+#define     BT_LL_ADV_NONCONN_IND       (0x03)
+
+#endif

+ 113 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_dma.c

@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-12-02     bigmagic       first version
+ */
+#include "drv_dma.h"
+#include "raspi4.h"
+
+volatile unsigned int __attribute__((aligned(256))) dma_disc[32];
+//https://www.raspberrypi.org/forums/viewtopic.php?f=72&t=10276
+static struct rt_semaphore dma_sem;
+
+//DMA 0 1 2 3 4 5 6
+typedef struct _dma_ctrl_block
+{
+    unsigned int TI;                   // Transfer information
+    unsigned int SOURCE_AD;            // source address
+    unsigned int DEST_AD;              // destination address
+    unsigned int TXFR_LEN;             // transfer length
+    unsigned int STRIDE;               // 2D mode stride
+    struct _dma_ctrl_block *NEXTCONBK; // Next control block address
+    unsigned int DEBUG;
+    unsigned int reserved1;
+
+} dma_ctrl_block_t;
+
+//DMA 7 8 9 10
+typedef struct _dma_lite_ctrl_block
+{
+    unsigned int TI;                        // Transfer information
+    unsigned int SOURCE_AD;                 // source address
+    unsigned int DEST_AD;                   // destination address
+    unsigned int TXFR_LEN;                  // transfer length
+    struct _dma_lite_ctrl_block *NEXTCONBK; // Next control block address
+    unsigned int DEBUG;
+    unsigned int reserved1;
+    unsigned int reserved2;
+
+} dma_lite_ctrl_block_t;
+
+//DMA 11 12 13 14 15
+typedef struct _dma4_ctrl_block
+{
+    unsigned int TI;                    // Transfer information
+    unsigned int SOURCE_AD0;            // source address0
+    unsigned int SOURCE_AD1;            // source address1
+    unsigned int DEST_AD0;              // destination address0
+    unsigned int DEST_AD1;              // destination address1
+    unsigned int TXFR_LEN;              // transfer length
+    unsigned int STRIDE;                // 2D mode stride
+    struct _dma4_ctrl_block *NEXTCONBK; // Next control block address
+} dma4_ctrl_block_t;
+
+static dma_lite_ctrl_block_t *ctr_blocks;
+
+static void dma_irq(int irq, void *param)
+{
+    if (DMA_INT_STATUS_REG & DMA_INT7)
+    {
+        DMA_CS(7) = DMA_CS_INT;
+        rt_sem_release(&dma_sem);
+    }
+}
+
+//dma 7 8 9 10:XLENGTH
+rt_err_t dma_memcpy(void *src, void *dst, unsigned int size, unsigned int dch, unsigned int timeout)
+{
+    rt_hw_cpu_dcache_ops(RT_HW_CACHE_INVALIDATE, dst, size);
+
+    /* Stop DMA, if it was already started */
+    DMA_CS(dch) = DMA_CS_RESET;
+
+    /* Clear DMA status flags */
+    DMA_CS(dch) = DMA_CS_INT | DMA_CS_END; /* Interrupted flag & Transmission ended flag*/
+    //cb info
+    ctr_blocks->TI = DMA_TI_SRC_INC | DMA_TI_DEST_INC | DMA_TI_INTEN;
+    ctr_blocks->SOURCE_AD = (unsigned int)src;
+    ctr_blocks->DEST_AD = (unsigned int)dst;
+    ctr_blocks->TXFR_LEN = size;
+    ctr_blocks->NEXTCONBK = 0;
+    ctr_blocks->reserved1 = 0;
+    ctr_blocks->reserved2 = 0;
+
+    rt_hw_cpu_dcache_ops(RT_HW_CACHE_INVALIDATE, ctr_blocks, sizeof(dma_lite_ctrl_block_t) * 8);
+
+    DMA_CONBLK_AD(dch) = (rt_uint32_t)ctr_blocks;
+    DMA_CS(dch) = DMA_CS_INT | DMA_CS_END | DMA_CS_ACTIVE;
+
+    if(rt_sem_take(&dma_sem, timeout) != RT_EOK)
+    {
+        rt_kprintf("dma transfer timeout!\n");
+        return RT_ERROR;
+    }
+
+    return RT_EOK;
+}
+
+void dma_init(unsigned char dch)
+{
+    rt_sem_init(&dma_sem, "dma_sem", 0, RT_IPC_FLAG_FIFO);
+
+    ctr_blocks = (dma_lite_ctrl_block_t *)&dma_disc[0]; //rt_malloc(sizeof(DMA_Lite_Control_Block));
+    //Make sure DMA channel is enabled by
+    //writing the corresponding bit in DMA_ENABLE in the DMA register to 1
+    DMA_ENABLE_REG = (1 << dch);
+
+    rt_hw_interrupt_install(IRQ_DMA7_DMA8, dma_irq, RT_NULL, "dma_irq");
+    rt_hw_interrupt_umask(IRQ_DMA7_DMA8);
+}

+ 172 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_dma.h

@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-12-02    bigmagic       first version
+ */
+#ifndef __DRV_DMA_H__
+#define __DRV_DMA_H__
+
+#include <rthw.h>
+
+#define DMA_PER_BASE                    (0xFE000000)
+
+//DMA
+#define DMA_BASE        (DMA_PER_BASE+0x7000)
+#define DMA_INT_STATUS  (DMA_BASE + 0xFE0)          //Interrupt Status of each DMA Channel
+#define DMA_ENABLE      (DMA_BASE + 0xFF0)          //Global Enable bits for each DMA Channel */
+#define DMA15_BASE      (DMA_PER_BASE+0xE05000)     //DMA Channel 15 Register Set */
+
+
+#define DMA_INT_STATUS_REG          __REG32(DMA_INT_STATUS)
+#define DMA_ENABLE_REG              __REG32(DMA_ENABLE)
+//DMA dch 1~14
+#define DMA_CS(dch)                 __REG32(DMA_BASE + dch*0x100 + 0x000)    /* Control and Status */
+#define DMA_CONBLK_AD(dch)          __REG32(DMA_BASE + dch*0x100 + 0x004)    /* Control Block Address */
+#define DMA_TI(dch)                 __REG32(DMA_BASE + dch*0x100 + 0x008)    /* CB Word 0(Transfer Information) */
+#define DMA_SOURCE_AD(dch)          __REG32(DMA_BASE + dch*0x100 + 0x00c)    /* CB Word 1(Source Address) */
+#define DMA_DEST_AD(dch)            __REG32(DMA_BASE + dch*0x100 + 0x010)    /* CB Word 2(Destination Address) */
+#define DMA_TXFR_LEN(dch)           __REG32(DMA_BASE + dch*0x100 + 0x014)    /* CB Word 3(Transfer Length) */
+#define DMA_STRIDE(dch)             __REG32(DMA_BASE + dch*0x100 + 0x018)    /* CB Word 4(2D Stride) */
+#define DMA_NEXTCONBK(dch)          __REG32(DMA_BASE + dch*0x100 + 0x01c)    /* CB Word 5(Next CB Address) */
+#define DMA_DEBUG(dch)              __REG32(DMA_BASE + dch*0x100 + 0x01c)    /* Debug */
+
+//DMA dch 15
+#define DMA15_CS                    __REG32(DMA15_BASE + 0x000)    /* Control and Status */
+#define DMA15_CONBLK_AD             __REG32(DMA15_BASE + 0x004)    /* Control Block Address */
+#define DMA15_TI                    __REG32(DMA15_BASE + 0x008)    /* CB Word 0(Transfer Information) */
+#define DMA15_SOURCE_AD             __REG32(DMA15_BASE + 0x00c)    /* CB Word 1(Source Address) */
+#define DMA15_DEST_AD               __REG32(DMA15_BASE + 0x010)    /* CB Word 2(Destination Address) */
+#define DMA15_TXFR_LEN              __REG32(DMA15_BASE + 0x014)    /* CB Word 3(Transfer Length) */
+#define DMA15_STRIDE                __REG32(DMA15_BASE + 0x018)    /* CB Word 4(2D Stride) */
+#define DMA15_NEXTCONBK             __REG32(DMA15_BASE + 0x01c)    /* CB Word 5(Next CB Address) */
+#define DMA15_DEBUG                 __REG32(DMA15_BASE + 0x01c)    /* Debug */
+
+#define DMA15_ENABLE             (1 << 15)
+#define DMA14_ENABLE             (1 << 14)
+#define DMA13_ENABLE             (1 << 13)
+#define DMA12_ENABLE             (1 << 12)
+#define DMA11_ENABLE             (1 << 11)
+#define DMA10_ENABLE             (1 << 10)
+#define DMA9_ENABLE              (1 << 9)
+#define DMA8_ENABLE              (1 << 8)
+#define DMA7_ENABLE              (1 << 7)
+#define DMA6_ENABLE              (1 << 6)
+#define DMA5_ENABLE              (1 << 5)
+#define DMA4_ENABLE              (1 << 4)
+#define DMA3_ENABLE              (1 << 3)
+#define DMA2_ENABLE              (1 << 2)
+#define DMA1_ENABLE              (1 << 1)
+#define DMA0_ENABLE              (1 << 0)
+
+//Peripheral DREQ Signals
+#define DREQ_DSI0_PWM1        (1)
+#define DREQ_PCM_TX           (2)
+#define DREQ_PCM_RX           (3)
+#define DREQ_SMI              (4)
+#define DREQ_PWM0             (5)
+#define DREQ_SPI0_TX          (6)
+#define DREQ_SPI0_RX          (7)
+#define DREQ_BSC_SPI_SLAVE_TX (8)
+#define DREQ_BSC_SPI_SLAVE_RX (9)
+#define DREQ_HSMI0            (10)
+#define DREQ_EMMC             (11)
+#define DREQ_UART0_TX         (12)
+#define DREQ_SD_HOST          (13)
+#define DREQ_UART0_RX         (14)
+#define DREQ_DSI1             (15)
+#define DREQ_SPI1_TX          (16)
+#define DREQ_HDMI1            (17)
+#define DREQ_SPI1_RX          (18)
+#define DREQ_UART3_TX_SPI4_TX (19)
+#define DREQ_UART3_RX_SPI4_RX (20)
+#define DREQ_UART5_TX_SPI5_TX (21)
+#define DREQ_UART5_RX_SPI5_RX (22)
+#define DREQ_SPI6_TX          (23)
+#define DREQ_SCALER_FIFO0_SMI (24)
+#define DREQ_SCALER_FIFO1_SMI (25)
+#define DREQ_SCALER_FIFO2_SMI (26)
+#define DREQ_SPI6_RX          (27)
+#define DREQ_UART2_TX         (28)
+#define DREQ_UART2_RX         (29)
+#define DREQ_UART4_TX         (30)
+#define DREQ_UART4_RX         (31)
+
+//IRQ
+#define DMA_INT15           (1 << 15)
+#define DMA_INT14           (1 << 14)
+#define DMA_INT13           (1 << 13)
+#define DMA_INT12           (1 << 12)
+#define DMA_INT11           (1 << 11)
+#define DMA_INT10           (1 << 10)
+#define DMA_INT9            (1 << 9)
+#define DMA_INT8            (1 << 8)
+#define DMA_INT7            (1 << 7)
+#define DMA_INT6            (1 << 6)
+#define DMA_INT5            (1 << 5)
+#define DMA_INT4            (1 << 4)
+#define DMA_INT3            (1 << 3)
+#define DMA_INT2            (1 << 2)
+#define DMA_INT1            (1 << 1)
+#define DMA_INT0            (1 << 0)
+
+//IRQ_NUMBER
+#define IRQ_DMA0            (96 + 16)
+#define IRQ_DMA1            (96 + 17)
+#define IRQ_DMA2            (96 + 18)
+#define IRQ_DMA3            (96 + 19)
+#define IRQ_DMA4            (96 + 20)
+#define IRQ_DMA5            (96 + 21)
+#define IRQ_DMA6            (96 + 22)
+#define IRQ_DMA7_DMA8       (96 + 23)
+#define IRQ_DMA9_DMA10      (96 + 24)
+#define IRQ_DMA11           (96 + 25)
+#define IRQ_DMA12           (96 + 26)
+#define IRQ_DMA13           (96 + 27)
+#define IRQ_DMA14           (96 + 28)
+#define IRQ_DMA15           (96 + 31)
+
+//CS
+#define DMA_CS_RESET            (1 << 31)
+#define DMA_CS_ABORT            (1 << 30)
+#define DMA_CS_DISDEBUG         (1 << 29)
+#define DMA_CS_DREQ_STOPS_DMA   (1 << 5)
+#define DMA_CS_PAUSED           (1 << 4)
+#define DMA_CS_DREQ             (1 << 3)
+#define DMA_CS_INT              (1 << 2)
+#define DMA_CS_END              (1 << 1)
+#define DMA_CS_ACTIVE           (1 << 0)
+
+//CONBLK_AD
+//The address must be256-bit aligned, so the bottom 5 bits of the address mustbe zero.
+
+//TI
+//DMA Transfer Information.
+#define DMA_TI_SRC_IGNORE       (1 << 11)
+#define DMA_TI_SRC_DREQ         (1 << 10)
+#define DMA_TI_SRC_WIDTH        (1 << 9)
+#define DMA_TI_SRC_INC          (1 << 8)
+#define DMA_TI_DEST_IGNORE      (1 << 7)
+#define DMA_TI_DEST_DREQ        (1 << 6)
+#define DMA_TI_DEST_WIDTH       (1 << 5)
+#define DMA_TI_DEST_INC         (1 << 4)
+#define DMA_TI_WAIT_RESP        (1 << 3)
+#define DMA_TI_TDMODE           (1 << 1)
+#define DMA_TI_INTEN            (1 << 0)
+
+//SOURCE_AD
+//DMA Source Address
+
+//DEST_AD
+//DMA Destination Address
+
+//TXFR_LEN
+//DMA Transfer Length
+
+void dma_init(unsigned char dch);
+rt_err_t dma_memcpy(void *src, void *dst, unsigned int size, unsigned int dch, unsigned int timeout);
+
+#endif

+ 192 - 122
bsp/raspberry-pi/raspi4-32/driver/drv_eth.c

@@ -19,6 +19,15 @@
 #include "raspi4.h"
 #include "drv_eth.h"
 
+//#define ETH_RX_POLL
+
+#define DBG_LEVEL   DBG_LOG
+#include <rtdbg.h>
+#define LOG_TAG                "drv.eth"
+
+static int link_speed = 0;
+static int link_flag = 0;
+
 #define RECV_CACHE_BUF          (1024)
 #define SEND_DATA_NO_CACHE      (0x08200000)
 #define RECV_DATA_NO_CACHE      (0x08400000)
@@ -34,6 +43,11 @@
 
 #define BIT(nr)                 (1UL << (nr))
 
+static rt_thread_t link_thread_tid = RT_NULL;
+#define LINK_THREAD_STACK_SIZE   (1024)
+#define LINK_THREAD_PRIORITY     (20)
+#define LINK_THREAD_TIMESLICE    (10)
+
 static rt_uint32_t tx_index = 0;
 static rt_uint32_t rx_index = 0;
 static rt_uint32_t index_flag = 0;
@@ -54,6 +68,7 @@ struct rt_eth_dev
 };
 static struct rt_eth_dev eth_dev;
 static struct rt_semaphore sem_lock;
+static struct rt_semaphore link_ack;
 
 static inline rt_uint32_t read32(void *addr)
 {
@@ -65,19 +80,36 @@ static inline void write32(void *addr, rt_uint32_t value)
     (*((volatile unsigned int*)(addr))) = value;
 }
 
-void eth_rx_irq(void *param)
+static void eth_rx_irq(int irq, void *param)
 {
+#ifndef ETH_RX_POLL
+    rt_uint32_t val = 0;
+    val = read32(MAC_REG + GENET_INTRL2_CPU_STAT);
+    val &= ~read32(MAC_REG + GENET_INTRL2_CPU_STAT_MASK);
+    write32(MAC_REG + GENET_INTRL2_CPU_CLEAR, val);
+    if (val & GENET_IRQ_RXDMA_DONE)
+    {
+        eth_device_ready(&eth_dev.parent);
+    }
+
+    if (val & GENET_IRQ_TXDMA_DONE)
+    {
+        //todo
+    }
+#else
     eth_device_ready(&eth_dev.parent);
+#endif
 }
 
 /* We only support RGMII (as used on the RPi4). */
 static int bcmgenet_interface_set(void)
 {
     int phy_mode = PHY_INTERFACE_MODE_RGMII;
-    switch (phy_mode) {
+    switch (phy_mode)
+    {
     case PHY_INTERFACE_MODE_RGMII:
     case PHY_INTERFACE_MODE_RGMII_RXID:
-        write32(MAC_REG + SYS_PORT_CTRL,PORT_MODE_EXT_GPHY);
+        write32(MAC_REG + SYS_PORT_CTRL, PORT_MODE_EXT_GPHY);
         break;
     default:
         rt_kprintf("unknown phy mode: %d\n", MAC_REG);
@@ -94,10 +126,10 @@ static void bcmgenet_umac_reset(void)
     write32((MAC_REG + SYS_RBUF_FLUSH_CTRL), reg);
 
     reg &= ~BIT(1);
-    write32((MAC_REG + SYS_RBUF_FLUSH_CTRL),reg);
+    write32((MAC_REG + SYS_RBUF_FLUSH_CTRL), reg);
 
     DELAY_MICROS(10);
-    write32((MAC_REG + SYS_RBUF_FLUSH_CTRL),0);
+    write32((MAC_REG + SYS_RBUF_FLUSH_CTRL), 0);
     DELAY_MICROS(10);
     write32(MAC_REG + UMAC_CMD, 0);
     write32(MAC_REG + UMAC_CMD, (CMD_SW_RESET | CMD_LCL_LOOP_EN));
@@ -145,7 +177,7 @@ static int bcmgenet_mdio_write(rt_uint32_t addr, rt_uint32_t reg, rt_uint32_t va
 {
     int count = 10000;
     rt_uint32_t val;
-    val = MDIO_WR | (addr << MDIO_PMD_SHIFT) |(reg << MDIO_REG_SHIFT) | (0xffff & value);
+    val = MDIO_WR | (addr << MDIO_PMD_SHIFT) | (reg << MDIO_REG_SHIFT) | (0xffff & value);
     write32(MAC_REG + MDIO_CMD, val);
 
     rt_uint32_t reg_val = read32(MAC_REG + MDIO_CMD);
@@ -158,7 +190,6 @@ static int bcmgenet_mdio_write(rt_uint32_t addr, rt_uint32_t reg, rt_uint32_t va
     reg_val = read32(MAC_REG + MDIO_CMD);
 
     return reg_val & 0xffff;
-    
 }
 
 static int bcmgenet_mdio_read(rt_uint32_t addr, rt_uint32_t reg)
@@ -179,7 +210,7 @@ static int bcmgenet_mdio_read(rt_uint32_t addr, rt_uint32_t reg)
 
     reg_val = read32(MAC_REG + MDIO_CMD);
 
-    return reg_val & 0xffff;    
+    return reg_val & 0xffff;
 }
 
 static int bcmgenet_gmac_write_hwaddr(void)
@@ -207,9 +238,9 @@ static int get_ethernet_uid(void)
     uid_low = bcmgenet_mdio_read(1, BCM54213PE_PHY_IDENTIFIER_LOW);
     uid = (uid_high << 16 | uid_low);
 
-    if(BCM54213PE_VERSION_B1 == uid)
+    if (BCM54213PE_VERSION_B1 == uid)
     {
-        rt_kprintf("version is B1\n");
+        LOG_I("version is B1\n");
     }
     return uid;
 }
@@ -219,7 +250,7 @@ static void bcmgenet_mdio_init(void)
     rt_uint32_t ret = 0;
     /*get ethernet uid*/
     ret = get_ethernet_uid();
-    if(ret == 0)
+    if (ret == 0)
     {
         return;
     }
@@ -236,19 +267,21 @@ static void bcmgenet_mdio_init(void)
     /* read status reg */
     bcmgenet_mdio_read(1, BCM54213PE_IEEE_EXTENDED_STATUS);
     bcmgenet_mdio_read(1, BCM54213PE_AUTO_NEGOTIATION_ADV);
+
     bcmgenet_mdio_read(1, BCM54213PE_MII_STATUS);
     bcmgenet_mdio_read(1, BCM54213PE_CONTROL);
     /* half full duplex capability */
     bcmgenet_mdio_write(1, BCM54213PE_CONTROL, (CONTROL_HALF_DUPLEX_CAPABILITY | CONTROL_FULL_DUPLEX_CAPABILITY));
     bcmgenet_mdio_read(1, BCM54213PE_MII_CONTROL);
+
     /* set mii control */
-    bcmgenet_mdio_write(1,BCM54213PE_MII_CONTROL,(MII_CONTROL_AUTO_NEGOTIATION_ENABLED | MII_CONTROL_AUTO_NEGOTIATION_RESTART| MII_CONTROL_PHY_FULL_DUPLEX| MII_CONTROL_SPEED_SELECTION));
+    bcmgenet_mdio_write(1, BCM54213PE_MII_CONTROL, (MII_CONTROL_AUTO_NEGOTIATION_ENABLED | MII_CONTROL_AUTO_NEGOTIATION_RESTART | MII_CONTROL_PHY_FULL_DUPLEX | MII_CONTROL_SPEED_SELECTION));
 }
 
 static void rx_ring_init(void)
 {
     write32(MAC_REG + RDMA_REG_BASE + DMA_SCB_BURST_SIZE, DMA_MAX_BURST_LENGTH);
-    write32(MAC_REG + RDMA_RING_REG_BASE + DMA_START_ADDR,0x0 );
+    write32(MAC_REG + RDMA_RING_REG_BASE + DMA_START_ADDR, 0x0);
     write32(MAC_REG + RDMA_READ_PTR, 0x0);
     write32(MAC_REG + RDMA_WRITE_PTR, 0x0);
     write32(MAC_REG + RDMA_RING_REG_BASE + DMA_END_ADDR, RX_DESCS * DMA_DESC_SIZE / 4 - 1);
@@ -257,7 +290,7 @@ static void rx_ring_init(void)
     write32(MAC_REG + RDMA_CONS_INDEX, 0x0);
     write32(MAC_REG + RDMA_RING_REG_BASE + DMA_RING_BUF_SIZE, (RX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH);
     write32(MAC_REG + RDMA_XON_XOFF_THRESH, DMA_FC_THRESH_VALUE);
-    write32(MAC_REG + RDMA_REG_BASE + DMA_RING_CFG,1 << DEFAULT_Q);
+    write32(MAC_REG + RDMA_REG_BASE + DMA_RING_CFG, 1 << DEFAULT_Q);
 }
 
 static void tx_ring_init(void)
@@ -268,13 +301,13 @@ static void tx_ring_init(void)
     write32(MAC_REG + TDMA_READ_PTR, 0x0);
     write32(MAC_REG + TDMA_READ_PTR, 0x0);
     write32(MAC_REG + TDMA_WRITE_PTR, 0x0);
-    write32(MAC_REG + TDMA_RING_REG_BASE + DMA_END_ADDR,TX_DESCS * DMA_DESC_SIZE / 4 - 1);
+    write32(MAC_REG + TDMA_RING_REG_BASE + DMA_END_ADDR, TX_DESCS * DMA_DESC_SIZE / 4 - 1);
     write32(MAC_REG + TDMA_PROD_INDEX, 0x0);
     write32(MAC_REG + TDMA_CONS_INDEX, 0x0);
-    write32(MAC_REG + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH,0x1);
-    write32(MAC_REG + TDMA_FLOW_PERIOD,0x0);
+    write32(MAC_REG + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH, 0x1);
+    write32(MAC_REG + TDMA_FLOW_PERIOD, 0x0);
     write32(MAC_REG + TDMA_RING_REG_BASE + DMA_RING_BUF_SIZE, (TX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH);
-    write32(MAC_REG + TDMA_REG_BASE + DMA_RING_CFG,1 << DEFAULT_Q);
+    write32(MAC_REG + TDMA_REG_BASE + DMA_RING_CFG, 1 << DEFAULT_Q);
 }
 
 static void rx_descs_init(void)
@@ -284,55 +317,21 @@ static void rx_descs_init(void)
     void *desc_base = (void *)RX_DESC_BASE;
 
     len_stat = (RX_BUF_LENGTH << DMA_BUFLENGTH_SHIFT) | DMA_OWN;
-    for (i = 0; i < RX_DESCS; i++) {
-        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_LO), lower_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]));
-        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI),upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]));
-        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS),len_stat);
-    }
-}
-
-static int phy_startup(void)
-{
-    int count = 1000000;
-    while ((bcmgenet_mdio_read(1, BCM54213PE_MII_STATUS) & MII_STATUS_LINK_UP) && (--count))
-    DELAY_MICROS(1);
-    if(count > 0)
-    {
-        rt_kprintf("bcmgenet: PHY startup ok!\n");
-    }
-    else
+    for (i = 0; i < RX_DESCS; i++)
     {
-        rt_kprintf("bcmgenet: PHY startup err!\n");
-        return 1;
-    }
-
-    if(bcmgenet_mdio_read(1, BCM54213PE_STATUS) == 0)
-    {
-        //todo
-    }
-    else
-    {
-        rt_kprintf("bcmgenet: BCM54213PE_STATUS err!\n");
-    }
-
-    if(bcmgenet_mdio_read(1, BCM54213PE_CONTROL) == (CONTROL_FULL_DUPLEX_CAPABILITY| CONTROL_HALF_DUPLEX_CAPABILITY))
-    {
-        //todo
-    }
-    else
-    {
-        rt_kprintf("bcmgenet: BCM54213PE_CONTROL err!\n");
+        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_LO), lower_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]));
+        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI), upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]));
+        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS), len_stat);
     }
-
-    return 0;
 }
 
 static int bcmgenet_adjust_link(void)
 {
     rt_uint32_t speed;
-    rt_uint32_t phy_dev_speed = SPEED_100;
-    
-    switch (phy_dev_speed) {
+    rt_uint32_t phy_dev_speed = link_speed;
+
+    switch (phy_dev_speed)
+    {
     case SPEED_1000:
         speed = UMAC_SPEED_1000;
         break;
@@ -358,6 +357,14 @@ static int bcmgenet_adjust_link(void)
     return 0;
 }
 
+void link_irq(void *param)
+{
+    if ((bcmgenet_mdio_read(1, BCM54213PE_MII_STATUS) & MII_STATUS_LINK_UP) != 0)
+    {
+        rt_sem_release(&link_ack);
+    }
+}
+
 static int bcmgenet_gmac_eth_start(void)
 {
     rt_uint32_t ret;
@@ -375,23 +382,17 @@ static int bcmgenet_gmac_eth_start(void)
     /* Enable RX/TX DMA */
     bcmgenet_enable_dma();
 
-    /* read PHY properties over the wire from generic PHY set-up */
-    ret = phy_startup();
-    if (ret) {
-        rt_kprintf("bcmgenet: PHY startup failed: %d\n", ret);
-        return ret;
-    }
-
     /* Update MAC registers based on PHY property */
     ret = bcmgenet_adjust_link();
-    if (ret) {
+    if(ret)
+    {
         rt_kprintf("bcmgenet: adjust PHY link failed: %d\n", ret);
         return ret;
     }
 
     /* wait tx index clear */
     while ((read32(MAC_REG + TDMA_CONS_INDEX) != 0) && (--count))
-    DELAY_MICROS(1);
+        DELAY_MICROS(1);
 
     tx_index = read32(MAC_REG + TDMA_CONS_INDEX);
     write32(MAC_REG + TDMA_PROD_INDEX, tx_index);
@@ -410,6 +411,8 @@ static int bcmgenet_gmac_eth_start(void)
     rx_tx_en |= (CMD_TX_EN | CMD_RX_EN);
 
     write32(MAC_REG + UMAC_CMD, rx_tx_en);
+    //IRQ
+    write32(MAC_REG + GENET_INTRL2_CPU_CLEAR_MASK, GENET_IRQ_TXDMA_DONE | GENET_IRQ_RXDMA_DONE);
     return 0;
 }
 
@@ -424,6 +427,7 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
     if(prod_index == index_flag)
     {
         cur_recv_cnt = index_flag;
+        index_flag = 0x7fffffff;
         //no buff
         return 0;
     }
@@ -433,7 +437,7 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
         {
             return 0;
         }
-        
+
         desc_base = RX_DESC_BASE + rx_index * DMA_DESC_SIZE;
         length = read32(desc_base + DMA_DESC_LENGTH_STATUS);
         length = (length >> DMA_BUFLENGTH_SHIFT) & DMA_BUFLENGTH_MASK;
@@ -452,6 +456,11 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
         write32(MAC_REG + RDMA_CONS_INDEX, cur_recv_cnt);
 
         cur_recv_cnt = cur_recv_cnt + 1;
+
+        if(cur_recv_cnt > 0xffff)
+        {
+            cur_recv_cnt = 0;
+        }
         prev_recv_cnt = cur_recv_cnt;
 
         return length;
@@ -460,52 +469,120 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
 
 static int bcmgenet_gmac_eth_send(void *packet, int length)
 {
-    void* desc_base = (TX_DESC_BASE + tx_index * DMA_DESC_SIZE);
+    void *desc_base = (TX_DESC_BASE + tx_index * DMA_DESC_SIZE);
     rt_uint32_t len_stat = length << DMA_BUFLENGTH_SHIFT;
 
     rt_uint32_t prod_index, cons;
     rt_uint32_t tries = 100;
-    
+
     prod_index = read32(MAC_REG + TDMA_PROD_INDEX);
 
     len_stat |= 0x3F << DMA_TX_QTAG_SHIFT;
     len_stat |= DMA_TX_APPEND_CRC | DMA_SOP | DMA_EOP;
 
-    write32((desc_base + DMA_DESC_ADDRESS_LO),SEND_DATA_NO_CACHE);
-    write32((desc_base + DMA_DESC_ADDRESS_HI),0);
-    write32((desc_base + DMA_DESC_LENGTH_STATUS),len_stat);
+    write32((desc_base + DMA_DESC_ADDRESS_LO), SEND_DATA_NO_CACHE);
+    write32((desc_base + DMA_DESC_ADDRESS_HI), 0);
+    write32((desc_base + DMA_DESC_LENGTH_STATUS), len_stat);
+
+    tx_index = tx_index + 1;
+    prod_index = prod_index + 1;
+
+    if (prod_index == 0xe000)
+    {
+        write32(MAC_REG + TDMA_PROD_INDEX, 0);
+        prod_index = 0;
+    }
 
-    if(++tx_index>= TX_DESCS)
+    if (tx_index == 256)
     {
         tx_index = 0;
     }
-    prod_index++;
+
     /* Start Transmisson */
-    write32(MAC_REG + TDMA_PROD_INDEX,prod_index);
+    write32(MAC_REG + TDMA_PROD_INDEX, prod_index);
 
-    do {
+    do
+    {
         cons = read32(MAC_REG + TDMA_CONS_INDEX);
     } while ((cons & 0xffff) < prod_index && --tries);
+
     if (!tries)
     {
+        rt_kprintf("send err! tries is %d\n", tries);
         return -1;
     }
     return 0;
 }
 
-static rt_err_t bcmgenet_eth_init(rt_device_t device)
+static void link_task_entry(void *param)
 {
-    struct eth_device *eth_device = (struct eth_device *)device;
+    struct eth_device *eth_device = (struct eth_device *)param;
     RT_ASSERT(eth_device != RT_NULL);
+    struct rt_eth_dev *dev = &eth_dev;
+    //start mdio
+    bcmgenet_mdio_init();
+    //start timer link
+    rt_timer_init(&dev->link_timer, "link_timer",
+                  link_irq,
+                  NULL,
+                  100,
+                  RT_TIMER_FLAG_PERIODIC);
+    rt_timer_start(&dev->link_timer);
+
+    //link wait forever
+    rt_sem_take(&link_ack, RT_WAITING_FOREVER);
+    eth_device_linkchange(&eth_dev.parent, RT_TRUE); //link up
+    rt_timer_stop(&dev->link_timer);
+
+    //set mac
+    bcmgenet_gmac_write_hwaddr();
+    bcmgenet_gmac_write_hwaddr();
+
+    //check link speed
+    if ((bcmgenet_mdio_read(1, BCM54213PE_STATUS) & (1 << 10)) || (bcmgenet_mdio_read(1, BCM54213PE_STATUS) & (1 << 11)))
+    {
+        link_speed = 1000;
+        rt_kprintf("Support link mode Speed 1000M\n");
+    }
+    else if ((bcmgenet_mdio_read(1, 0x05) & (1 << 7)) || (bcmgenet_mdio_read(1, 0x05) & (1 << 8)) || (bcmgenet_mdio_read(1, 0x05) & (1 << 9)))
+    {
+        link_speed = 100;
+        rt_kprintf("Support link mode Speed 100M\n");
+    }
+    else
+    {
+        link_speed = 10;
+        rt_kprintf("Support link mode Speed 10M\n");
+    }
+
+    bcmgenet_gmac_eth_start();
+    //irq or poll
+#ifdef ETH_RX_POLL
+    rt_timer_init(&dev->rx_poll_timer, "rx_poll_timer",
+                  eth_rx_irq,
+                  NULL,
+                  1,
+                  RT_TIMER_FLAG_PERIODIC);
+
+    rt_timer_start(&dev->rx_poll_timer);
+#else
+    rt_hw_interrupt_install(ETH_IRQ, eth_rx_irq, NULL, "eth_irq");
+    rt_hw_interrupt_umask(ETH_IRQ);
+#endif
+    link_flag = 1;
+}
+
+static rt_err_t bcmgenet_eth_init(rt_device_t device)
+{
     rt_uint32_t ret = 0;
     rt_uint32_t hw_reg = 0;
-    struct rt_eth_dev *dev = &eth_dev;
-    
+
     /* Read GENET HW version */
     rt_uint8_t major = 0;
     hw_reg = read32(MAC_REG + SYS_REV_CTRL);
     major = (hw_reg >> 24) & 0x0f;
-    if (major != 6) {
+    if (major != 6)
+    {
         if (major == 5)
             major = 4;
         else if (major == 0)
@@ -514,13 +591,12 @@ static rt_err_t bcmgenet_eth_init(rt_device_t device)
         rt_kprintf("Uns upported GENETv%d.%d\n", major, (hw_reg >> 16) & 0x0f);
         return RT_ERROR;
     }
-
     /* set interface */
     ret = bcmgenet_interface_set();
     if (ret)
     {
         return ret;
-    }    
+    }
 
     /* rbuf clear */
     write32(MAC_REG + SYS_RBUF_FLUSH_CTRL, 0);
@@ -530,21 +606,11 @@ static rt_err_t bcmgenet_eth_init(rt_device_t device)
     /* issue soft reset with (rg)mii loopback to ensure a stable rxclk */
     write32(MAC_REG + UMAC_CMD, CMD_SW_RESET | CMD_LCL_LOOP_EN);
 
-    bcmgenet_mdio_init();
-
-    bcmgenet_gmac_write_hwaddr();
-    bcmgenet_gmac_write_hwaddr();
-
-    bcmgenet_gmac_eth_start();
-
-    //irq or poll
-    rt_timer_init(&dev->rx_poll_timer, "rx_poll_timer",
-                  eth_rx_irq,
-                  NULL,
-                  1,
-                  RT_TIMER_FLAG_PERIODIC);
-
-    rt_timer_start(&dev->rx_poll_timer);
+    link_thread_tid = rt_thread_create("link", link_task_entry, (void *)device,
+                                       LINK_THREAD_STACK_SIZE,
+                                       LINK_THREAD_PRIORITY, LINK_THREAD_TIMESLICE);
+    if (link_thread_tid != RT_NULL)
+        rt_thread_startup(link_thread_tid);
 
     return RT_EOK;
 }
@@ -554,10 +620,12 @@ static rt_err_t bcmgenet_eth_control(rt_device_t dev, int cmd, void *args)
     switch (cmd)
     {
     case NIOCTL_GADDR:
-        if (args) rt_memcpy(args, eth_dev.dev_addr, 6);
-        else return -RT_ERROR;
+        if (args)
+            rt_memcpy(args, eth_dev.dev_addr, 6);
+        else
+            return -RT_ERROR;
         break;
-    default :
+    default:
         break;
     }
     return RT_EOK;
@@ -565,15 +633,17 @@ static rt_err_t bcmgenet_eth_control(rt_device_t dev, int cmd, void *args)
 
 rt_err_t rt_eth_tx(rt_device_t device, struct pbuf *p)
 {
-    rt_uint32_t sendbuf = SEND_DATA_NO_CACHE;
+    rt_uint32_t sendbuf = (rt_uint32_t)SEND_DATA_NO_CACHE;
     /* lock eth device */
-    rt_sem_take(&sem_lock, RT_WAITING_FOREVER);
-    //struct rt_eth_dev *dev = (struct rt_eth_dev *) device;
-    pbuf_copy_partial(p, (void *)&send_cache_pbuf[0], p->tot_len, 0);
-    rt_memcpy((void *)sendbuf, send_cache_pbuf, p->tot_len);
+    if (link_flag == 1)
+    {
+        rt_sem_take(&sem_lock, RT_WAITING_FOREVER);
+        pbuf_copy_partial(p, (void *)&send_cache_pbuf[0], p->tot_len, 0);
+        rt_memcpy((void *)sendbuf, send_cache_pbuf, p->tot_len);
 
-    bcmgenet_gmac_eth_send((void *)sendbuf, p->tot_len);
-    rt_sem_release(&sem_lock);
+        bcmgenet_gmac_eth_send((void *)sendbuf, p->tot_len);
+        rt_sem_release(&sem_lock);
+    }
     return RT_EOK;
 }
 
@@ -583,16 +653,17 @@ struct pbuf *rt_eth_rx(rt_device_t device)
     int recv_len = 0;
     rt_uint32_t addr_point[8];
     struct pbuf *pbuf = RT_NULL;
-    rt_sem_take(&sem_lock, RT_WAITING_FOREVER);
-
-    recv_len = bcmgenet_gmac_eth_recv((rt_uint8_t **)&addr_point[0]);
-
-    if(recv_len > 0)
+    if (link_flag == 1)
     {
-        pbuf = pbuf_alloc(PBUF_LINK, recv_len, PBUF_RAM);
-        rt_memcpy(pbuf->payload, (char *)addr_point[0], recv_len);
+        rt_sem_take(&sem_lock, RT_WAITING_FOREVER);
+        recv_len = bcmgenet_gmac_eth_recv((rt_uint8_t **)&addr_point[0]);
+        if (recv_len > 0)
+        {
+            pbuf = pbuf_alloc(PBUF_LINK, recv_len, PBUF_RAM);
+            rt_memcpy(pbuf->payload, (char *)addr_point[0], recv_len);
+        }
+        rt_sem_release(&sem_lock);
     }
-    rt_sem_release(&sem_lock);
     return pbuf;
 }
 
@@ -601,11 +672,11 @@ int rt_hw_eth_init(void)
     rt_uint8_t mac_addr[6];
     
     rt_sem_init(&sem_lock, "eth_lock", 1, RT_IPC_FLAG_FIFO);
+    rt_sem_init(&link_ack, "link_ack", 0, RT_IPC_FLAG_FIFO);
 
     memset(&eth_dev, 0, sizeof(eth_dev));
     memset((void *)SEND_DATA_NO_CACHE, 0, sizeof(DMA_DISC_ADDR_SIZE));
     memset((void *)RECV_DATA_NO_CACHE, 0, sizeof(DMA_DISC_ADDR_SIZE));
-
     bcm271x_mbox_hardware_get_mac_address(&mac_addr[0]);
 
     eth_dev.iobase = MAC_REG;
@@ -629,9 +700,8 @@ int rt_hw_eth_init(void)
     eth_dev.parent.eth_tx            = rt_eth_tx;
     eth_dev.parent.eth_rx            = rt_eth_rx;
 
-
     eth_device_init(&(eth_dev.parent), "e0");
-    eth_device_linkchange(&eth_dev.parent, RT_TRUE);   //linkup the e0 for lwip to check
+    eth_device_linkchange(&eth_dev.parent, RT_FALSE);   //link down
     return 0;
 }
 INIT_COMPONENT_EXPORT(rt_hw_eth_init);

+ 11 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_eth.h

@@ -53,6 +53,17 @@
 #define MDIO_REG_SHIFT              (16)
 #define MDIO_REG_MASK               (0x1f)
 
+#define  GENET_INTRL2_OFF               (0x0200)
+#define  GENET_INTRL2_CPU_STAT          (GENET_INTRL2_OFF + 0x00)
+#define  GENET_INTRL2_CPU_CLEAR         (GENET_INTRL2_OFF + 0x08)
+#define  GENET_INTRL2_CPU_STAT_MASK     (GENET_INTRL2_OFF + 0x0c)
+#define  GENET_INTRL2_CPU_SET_MASK      (GENET_INTRL2_OFF + 0x10)
+#define  GENET_INTRL2_CPU_CLEAR_MASK    (GENET_INTRL2_OFF + 0x14)
+#define  GENET_IRQ_MDIO_ERROR           BIT(24)
+#define  GENET_IRQ_MDIO_DONE            BIT(23)
+#define  GENET_IRQ_TXDMA_DONE           BIT(16)
+#define  GENET_IRQ_RXDMA_DONE           BIT(13)
+
 #define CMD_TX_EN                   BIT(0)
 #define CMD_RX_EN                   BIT(1)
 #define UMAC_SPEED_10               (0)

+ 368 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_i2c.c

@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-28     bigmagic       first version
+ */
+
+#include "drv_i2c.h"
+#include "drv_gpio.h"
+#include "raspi4.h"
+#include "mbox.h"
+
+/*
+* (3.3v)          -1   2-
+* (SDA1/SDA3)     -3   4-
+* (SCL1/SCL3)     -5   6-  
+* (SDA3)          -7   8-
+*                 -9  10-
+*                 -11 12-
+*                 -13 14-
+*                 -15 16-
+*                 -17 18-
+*                 -19 20-
+* (SCL4)          -21 22-
+*                 -23 24-    (SDA4)
+*                 -25 26-    (SCL4)
+*                 -27 28-
+* (SCL3)          -29 30-
+* (SDA4)          -31 32-
+*/
+
+#define DBG_TAG               "drv.i2c"
+#define DBG_LVL               DBG_INFO
+#include <rtdbg.h>
+
+struct raspi_i2c_hw_config
+{
+    rt_uint32_t bsc_num;
+    rt_uint32_t bsc_rate;
+    rt_uint32_t bsc_address;
+    rt_uint32_t sda_pin;
+    rt_uint32_t scl_pin;
+    rt_uint32_t sda_mode;
+    rt_uint32_t scl_mode;
+};
+
+rt_uint8_t i2c_read_or_write(volatile rt_uint32_t base, rt_uint8_t* buf, rt_uint32_t len, rt_uint8_t flag)
+{
+    rt_uint32_t status;
+    rt_uint32_t remaining = len;
+    rt_uint32_t i = 0;
+    rt_uint8_t reason = I2C_REASON_OK;
+
+    /* Clear FIFO */
+    BSC_C(base) |= (BSC_C_CLEAR_1 & BSC_C_CLEAR_1);
+    /* Clear Status */
+    BSC_S(base) = BSC_S_CLKT | BSC_S_ERR | BSC_S_DONE;
+    /* Set Data Length */
+    BSC_DLEN(base) = len;
+    if (flag)
+    {
+        /* Start read */
+        BSC_C(base) = BSC_C_I2CEN | BSC_C_ST | BSC_C_READ;
+        /* wait for transfer to complete */
+        while (!(BSC_S(base) & BSC_S_DONE))
+        {
+            /* we must empty the FIFO as it is populated and not use any delay */
+            while (remaining && (BSC_S(base) & BSC_S_RXD))
+            {
+                /* Read from FIFO, no barrier */
+                buf[i] = BSC_FIFO(base);
+                i++;
+                remaining--;
+            }
+        }
+        /* transfer has finished - grab any remaining stuff in FIFO */
+        while (remaining && (BSC_S(base) & BSC_S_RXD))
+        {
+            /* Read from FIFO, no barrier */
+            buf[i] = BSC_FIFO(base);
+            i++;
+            remaining--;
+        }
+    }
+    else
+    {
+        LOG_D("i2c%d write start", flag);
+        /* pre populate FIFO with max buffer */
+        while (remaining && (i < BSC_FIFO_SIZE))
+        {
+            BSC_FIFO(base) = buf[i];
+            i++;
+            remaining--;
+        }
+
+        /* Enable device and start transfer */
+        BSC_C(base) = BSC_C_I2CEN | BSC_C_ST;
+
+        /* Transfer is over when BCM2835_BSC_S_DONE */
+        while (!(BSC_S(base) & BSC_S_DONE))
+        {
+            while (remaining && (BSC_S(base) & BSC_S_TXD))
+            {
+                /* Write to FIFO */
+                BSC_FIFO(base) = buf[i];
+                i++;
+                remaining--;
+            }
+        }
+        LOG_D("i2c%d write end", flag);
+    }
+
+    status = BSC_S(base);
+    if (status & BSC_S_ERR)
+    {
+        reason = I2C_REASON_ERROR_NACK;
+    }
+    else if (status & BSC_S_CLKT)
+    {
+        reason = I2C_REASON_ERROR_CLKT;
+    }
+    else if (remaining)
+    {
+        reason = I2C_REASON_ERROR_DATA;
+    }
+    BSC_C(base) |= (BSC_S_DONE & BSC_S_DONE);
+
+    return reason;
+}
+
+static rt_size_t raspi_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
+                                    struct rt_i2c_msg msgs[],
+                                    rt_uint32_t num)
+{
+    rt_size_t i;
+    rt_uint8_t reason;
+    RT_ASSERT(bus != RT_NULL);
+
+    struct raspi_i2c_hw_config *i2c_hw_config = (struct raspi_i2c_hw_config*)(bus->priv);
+
+    //Slave Address
+    BSC_A(i2c_hw_config->bsc_address) = msgs->addr;
+
+    for (i = 0; i < num; i++)
+    {
+        if (msgs[i].flags & RT_I2C_RD)
+            reason = i2c_read_or_write(i2c_hw_config->bsc_address, msgs->buf, msgs->len, 1);
+        else
+            reason = i2c_read_or_write(i2c_hw_config->bsc_address, msgs->buf, msgs->len, 0);
+    }
+    return (reason == 0)? i : 0;
+}
+
+static rt_size_t raspi_i2c_slv_xfer(struct rt_i2c_bus_device *bus,
+                                    struct rt_i2c_msg msgs[],
+                                    rt_uint32_t num)
+{
+    return 0;
+}
+
+static rt_err_t raspi_i2c_bus_control(struct rt_i2c_bus_device *bus,
+                                      rt_uint32_t cmd,
+                                      rt_uint32_t arg)
+{
+    return RT_EOK;
+}
+
+
+static rt_err_t raspi_i2c_configure(struct raspi_i2c_hw_config *cfg)
+{
+    RT_ASSERT(cfg != RT_NULL);
+    rt_uint32_t apb_clock = 0;
+    prev_raspi_pin_mode(cfg->sda_pin, cfg->sda_mode);//sda
+    prev_raspi_pin_mode(cfg->scl_pin, cfg->scl_mode);//scl
+    /* use 0xFFFE mask to limit a max value and round down any odd number */
+    apb_clock = bcm271x_mbox_clock_get_rate(CORE_CLK_ID);
+    rt_uint32_t divider = (apb_clock / cfg->bsc_rate) & 0xFFFE;
+
+    BSC_DIV(cfg->bsc_address) = (rt_uint16_t)divider;
+
+    return RT_EOK;
+}
+
+static const struct rt_i2c_bus_device_ops raspi_i2c_ops =
+{
+    .master_xfer = raspi_i2c_mst_xfer,
+    .slave_xfer = raspi_i2c_slv_xfer,
+    .i2c_bus_control = raspi_i2c_bus_control,
+};
+
+#if defined (BSP_USING_I2C0)
+#define I2C0_BUS_NAME    "i2c0"
+static struct raspi_i2c_hw_config hw_device0 =
+{
+    .bsc_num = 0,
+    .bsc_rate = 100000,//100k
+    .bsc_address = BSC0_BASE,
+    .sda_pin = GPIO_PIN_0,
+    .scl_pin = GPIO_PIN_1,
+    .sda_mode = ALT0,
+    .scl_mode = ALT0,
+};
+
+struct rt_i2c_bus_device device0 =
+{
+    .ops = &raspi_i2c_ops,
+    .priv =  (void *)&hw_device0,
+};
+#endif
+
+#if defined (BSP_USING_I2C1)
+#define I2C1_BUS_NAME    "i2c1"
+static struct raspi_i2c_hw_config hw_device1 =
+{
+    .bsc_num = 1,
+    .bsc_rate = 100000,//100k
+    .bsc_address = BSC1_BASE,
+    .sda_pin = GPIO_PIN_2,
+    .scl_pin = GPIO_PIN_3,
+    .sda_mode = ALT0,
+    .scl_mode = ALT0,
+};
+
+struct rt_i2c_bus_device device1 =
+{
+    .ops = &raspi_i2c_ops,
+    .priv =  (void *)&hw_device1,
+};
+#endif
+
+#if defined (BSP_USING_I2C3)
+#define I2C3_BUS_NAME    "i2c3"
+static struct raspi_i2c_hw_config hw_device3 =
+{
+    .bsc_num = 3,
+    .bsc_rate = 100000,//100k
+    .bsc_address = BSC3_BASE,
+#ifndef BSP_USING_I2C3_0
+    .sda_pin = GPIO_PIN_2,
+    .scl_pin = GPIO_PIN_3,
+#else
+    .sda_pin = GPIO_PIN_4,
+    .scl_pin = GPIO_PIN_5,
+#endif
+    .sda_mode = ALT5,
+    .scl_mode = ALT5,
+};
+
+struct rt_i2c_bus_device device3 =
+{
+    .ops = &raspi_i2c_ops,
+    .priv =  (void *)&hw_device3,
+};
+#endif
+
+#if defined (BSP_USING_I2C4)
+#define I2C4_BUS_NAME    "i2c4"
+static struct raspi_i2c_hw_config hw_device4 =
+{
+    .bsc_num = 4,
+    .bsc_rate = 100000,//100k
+    .bsc_address = BSC4_BASE,
+#ifdef BSP_USING_I2C4_0
+    .sda_pin = GPIO_PIN_6,
+    .scl_pin = GPIO_PIN_7,
+#else
+    .sda_pin = GPIO_PIN_8,
+    .scl_pin = GPIO_PIN_9, 
+#endif
+    .sda_mode = ALT5,
+    .scl_mode = ALT5,
+};
+
+struct rt_i2c_bus_device device4 =
+{
+    .ops = &raspi_i2c_ops,
+    .priv =  (void *)&hw_device4,
+};
+#endif
+
+#if defined (BSP_USING_I2C5)
+#define I2C5_BUS_NAME    "i2c5"
+static struct raspi_i2c_hw_config hw_device5 =
+{
+    .bsc_num = 5,
+    .bsc_rate = 100000,//100k
+    .bsc_address = BSC5_BASE,
+#ifdef BSP_USING_I2C5_0
+    .sda_pin = GPIO_PIN_10,
+    .scl_pin = GPIO_PIN_11,
+#else
+    .sda_pin = GPIO_PIN_12,
+    .scl_pin = GPIO_PIN_13,
+#endif
+    .sda_mode = ALT5,
+    .scl_mode = ALT5,
+};
+
+struct rt_i2c_bus_device device5 =
+{
+    .ops = &raspi_i2c_ops,
+    .priv =  (void *)&hw_device5,
+};
+#endif
+
+#if defined (BSP_USING_I2C6)
+#define I2C6_BUS_NAME    "i2c6"
+static struct raspi_i2c_hw_config hw_device6 =
+{
+    .bsc_num = 6,
+    .bsc_rate = 100000,//100k
+    .bsc_address = BSC6_BASE,
+#ifdef BSP_USING_I2C5_0
+    .sda_pin = GPIO_PIN_0,
+    .scl_pin = GPIO_PIN_1,
+#else
+    .sda_pin = GPIO_PIN_22,
+    .scl_pin = GPIO_PIN_23,
+#endif
+    .sda_mode = ALT5,
+    .scl_mode = ALT5,
+};
+
+struct rt_i2c_bus_device device6 =
+{
+    .ops = &raspi_i2c_ops,
+    .priv =  (void *)&hw_device6,
+};
+#endif
+
+int rt_hw_i2c_init(void)
+{
+#if defined(BSP_USING_I2C0)
+    raspi_i2c_configure(&hw_device0);
+    rt_i2c_bus_device_register(&device0, I2C0_BUS_NAME);
+#endif
+
+#if defined(BSP_USING_I2C1)
+    raspi_i2c_configure(&hw_device1);
+    rt_i2c_bus_device_register(&device1, I2C1_BUS_NAME);
+#endif
+
+#if defined(BSP_USING_I2C3)
+    raspi_i2c_configure(&hw_device3);
+    rt_i2c_bus_device_register(&device3, I2C3_BUS_NAME);
+#endif
+
+#if defined(BSP_USING_I2C4)
+    raspi_i2c_configure(&hw_device4);
+    rt_i2c_bus_device_register(&device4, I2C4_BUS_NAME);
+#endif
+
+#if defined(BSP_USING_I2C5)
+    raspi_i2c_configure(&hw_device5);
+    rt_i2c_bus_device_register(&device5, I2C5_BUS_NAME);
+#endif
+
+#if defined(BSP_USING_I2C6)
+    raspi_i2c_configure(&hw_device6);
+    rt_i2c_bus_device_register(&device6, I2C6_BUS_NAME);
+#endif
+    return 0;
+}
+
+INIT_DEVICE_EXPORT(rt_hw_i2c_init);

+ 59 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_i2c.h

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-28     bigmagic       first version
+ */
+
+#ifndef __DRV_I2C_H__
+#define __DRV_I2C_H__
+
+#include <rthw.h>
+
+#define BSC_C(BASE)         __REG32(BASE + 0x0000)    /* BSC Master Control */
+#define BSC_S(BASE)         __REG32(BASE + 0x0004)    /* BSC Master Status */
+#define BSC_DLEN(BASE)      __REG32(BASE + 0x0008)    /* BSC Master Data Length */
+#define BSC_A(BASE)         __REG32(BASE + 0x000c)    /* BSC Master Slave Address */
+#define BSC_FIFO(BASE)      __REG32(BASE + 0x0010)    /* BSC Master Data FIFO */
+#define BSC_DIV(BASE)       __REG32(BASE + 0x0014)    /* BSC Master Clock Divider */
+#define BSC_DEL(BASE)       __REG32(BASE + 0x0018)    /* BSC Master Data Delay */
+#define BSC_CLKT(BASE)      __REG32(BASE + 0x001c)    /* BSC Master Clock Stretch Timeout */
+
+/* Register masks for C Register */
+#define BSC_C_I2CEN         (0x00008000) /* I2C Enable, 0 = disabled, 1 = enabled */
+#define BSC_C_INTR          (0x00000400) /* Interrupt on RX */
+#define BSC_C_INTT          (0x00000200) /* Interrupt on TX */
+#define BSC_C_INTD          (0x00000100) /* Interrupt on DONE */
+#define BSC_C_ST            (0x00000080) /* Start transfer, 1 = Start a new transfer */
+#define BSC_C_CLEAR_1       (0x00000020) /* Clear FIFO Clear */
+#define BSC_C_CLEAR_2       (0x00000010) /* Clear FIFO Clear */
+#define BSC_C_READ          (0x00000001) /* Read transfer */
+
+/* Register masks for S Register */
+#define BSC_S_CLKT          (0x00000200) /* Clock stretch timeout */
+#define BSC_S_ERR           (0x00000100) /* ACK error */
+#define BSC_S_RXF           (0x00000080) /* RXF FIFO full, 0 = FIFO is not full, 1 = FIFO is full */
+#define BSC_S_TXE           (0x00000040) /* TXE FIFO full, 0 = FIFO is not full, 1 = FIFO is full */
+#define BSC_S_RXD           (0x00000020) /* RXD FIFO contains data */
+#define BSC_S_TXD           (0x00000010) /* TXD FIFO can accept data */
+#define BSC_S_RXR           (0x00000008) /* RXR FIFO needs reading (full) */
+#define BSC_S_TXW           (0x00000004) /* TXW FIFO needs writing (full) */
+#define BSC_S_DONE          (0x00000002) /* Transfer DONE */
+#define BSC_S_TA            (0x00000001) /* Transfer Active */
+
+#define BSC_FIFO_SIZE  (16)  /* BSC FIFO size */
+
+typedef enum
+{
+    I2C_REASON_OK           = 0x00,      /* Success */
+    I2C_REASON_ERROR_NACK   = 0x01,      /* Received a NACK */
+    I2C_REASON_ERROR_CLKT   = 0x02,      /* Received Clock Stretch Timeout */
+    I2C_REASON_ERROR_DATA   = 0x04       /* Not all data is sent / received */
+} i2c_reason_codes;
+
+int rt_hw_i2c_init(void);
+
+#endif

+ 6 - 12
bsp/raspberry-pi/raspi4-32/driver/drv_sdio.c

@@ -103,8 +103,8 @@ rt_err_t sd_int(struct sdhci_pdata_t * pdat, rt_uint32_t mask)
     {
         write32(pdat->virt + EMMC_INTERRUPT, r);
         //qemu maybe can not use sdcard
-        //rt_kprintf("send cmd/data timeout wait for %x int: %x, status: %x\n",mask, r, read32(pdat->virt + EMMC_STATUS));
-        //return -RT_ETIMEOUT;
+        rt_kprintf("send cmd/data timeout wait for %x int: %x, status: %x\n",mask, r, read32(pdat->virt + EMMC_STATUS));
+        return -RT_ETIMEOUT;
     }
     else if (r & INT_ERROR_MASK)
     {
@@ -552,9 +552,8 @@ static rt_err_t reset_emmc(struct sdhci_pdata_t * pdat)
 
     // Clear control2
     write32(pdat->virt + EMMC_CONTROL2, 0);
-
-    // Get the base clock rate
-    mmc_base_clock = bcm271x_mbox_clock_get_rate(12);
+    // Get the base clock rate //12
+    mmc_base_clock = bcm271x_mbox_clock_get_rate(EMMC_CLK_ID);
     if(mmc_base_clock == 0)
     {
         rt_kprintf("EMMC: assuming clock rate to be 100MHz\n");
@@ -590,7 +589,6 @@ int raspi_sdmmc_init(void)
     struct rt_mmcsd_host * host = RT_NULL;
     struct sdhci_pdata_t * pdat = RT_NULL;
     struct sdhci_t * sdhci = RT_NULL;
-
 #ifdef BSP_USING_SDIO0
     host = mmcsd_alloc_host();
     if (!host)
@@ -598,7 +596,6 @@ int raspi_sdmmc_init(void)
         rt_kprintf("alloc host failed");
         goto err;
     }
-
     sdhci = rt_malloc(sizeof(struct sdhci_t));
     if (!sdhci)
     {
@@ -608,17 +605,15 @@ int raspi_sdmmc_init(void)
     rt_memset(sdhci, 0, sizeof(struct sdhci_t));
 
     virt = MMC2_BASE_ADDR;
-
     pdat = (struct sdhci_pdata_t *)rt_malloc(sizeof(struct sdhci_pdata_t));
     RT_ASSERT(pdat != RT_NULL);
 
     pdat->virt = (rt_uint32_t)virt;
     reset_emmc(pdat);
-
     sdhci->name = "sd0";
     sdhci->voltages = VDD_33_34;
     sdhci->width = MMCSD_BUSWIDTH_4;
-    sdhci->clock = 250 * 1000 * 1000;
+    sdhci->clock = 1000 * 1000 * 1000;
     sdhci->removeable = RT_TRUE;
 
     sdhci->detect = sdhci_detect;
@@ -634,10 +629,9 @@ int raspi_sdmmc_init(void)
     host->max_seg_size = 2048;
     host->max_dma_segs = 10;
     host->max_blk_size = 512;
-    host->max_blk_count = 4096;
+    host->max_blk_count = 1;
 
     host->private_data = sdhci;
-
     write32((pdat->virt + EMMC_IRPT_EN),0xffffffff);
     write32((pdat->virt + EMMC_IRPT_MASK),0xffffffff);
 #ifdef RT_MMCSD_DBG

+ 43 - 42
bsp/raspberry-pi/raspi4-32/driver/drv_spi.c

@@ -16,8 +16,7 @@
 
 #ifdef RT_USING_SPI
 
-#define RPI_CORE_CLK_HZ        (250000000)
-#define BSP_SPI_MAX_HZ         (30* 1000 *1000)
+#define RPI_CORE_CLK_HZ        (500 * 1000 * 1000)
 #define SPITIMEOUT             0x0FFF
 
 static rt_uint8_t raspi_byte_reverse_table[] =
@@ -76,35 +75,35 @@ static rt_err_t raspi_spi_configure(struct rt_spi_device *device, struct rt_spi_
 {
     RT_ASSERT(cfg != RT_NULL);
     RT_ASSERT(device != RT_NULL);
-    rt_uint16_t divider;
     struct raspi_spi_device* hw_config = (struct raspi_spi_device *)(device->parent.user_data);
     struct raspi_spi_hw_config *hwcfg = (struct raspi_spi_hw_config *)hw_config->spi_hw_config;
     // spi clear fifo
-    SPI_REG_CS(hwcfg->hw_base) = (SPI_CS_CLEAR_TX | SPI_CS_CLEAR_RX);
+    SPI_REG_CS(hwcfg->hw_base) |= (SPI_CS_CLEAR_TX | SPI_CS_CLEAR_RX);
     if(cfg->mode & RT_SPI_CPOL)
     {
         SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_CPOL;
     }
+    else
+    {
+        SPI_REG_CS(hwcfg->hw_base) &= ~SPI_CS_CPOL;
+    }
 
     if(cfg->mode & RT_SPI_CPHA)
     {
         SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_CPHA;
+    }else
+    {
+        SPI_REG_CS(hwcfg->hw_base) &= ~SPI_CS_CPHA;
     }
 
     if(cfg->mode & RT_SPI_CS_HIGH)
     {
         SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_CSPOL_HIGH;   
     }
-
-    //set clk
-    if (cfg->max_hz > BSP_SPI_MAX_HZ)
-        cfg->max_hz = BSP_SPI_MAX_HZ;
-
-    divider = (rt_uint16_t) ((rt_uint32_t) RPI_CORE_CLK_HZ / cfg->max_hz);
-    divider &= 0xFFFE;
-
-    SPI_REG_CLK(hwcfg->hw_base) = divider;
-
+    else
+    {
+        SPI_REG_CS(hwcfg->hw_base) &= ~SPI_CS_CSPOL_HIGH;   
+    }
     return RT_EOK;
 }
 
@@ -120,13 +119,6 @@ static rt_err_t spi_transfernb(struct raspi_spi_hw_config *hwcfg, rt_uint8_t* tb
 {
     rt_uint32_t TXCnt=0;
     rt_uint32_t RXCnt=0;
-    
-    /* Clear TX and RX fifos */
-    SPI_REG_CS(hwcfg->hw_base) |= (SPI_CS_CLEAR_TX | SPI_CS_CLEAR_RX);
-
-    /* Set TA = 1 */
-    SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_TA;
-
     /* Use the FIFO's to reduce the interbyte times */
     while ((TXCnt < len) || (RXCnt < len))
     {
@@ -145,9 +137,6 @@ static rt_err_t spi_transfernb(struct raspi_spi_hw_config *hwcfg, rt_uint8_t* tb
     }
     /* Wait for DONE to be set */
     while (!(SPI_REG_CS(hwcfg->hw_base) & SPI_CS_DONE));
-    /* Set TA = 0, and also set the barrier */
-    SPI_REG_CS(hwcfg->hw_base) |= (0 & SPI_CS_TA);
-
     return RT_EOK;
 }
 
@@ -159,31 +148,54 @@ static rt_uint32_t raspi_spi_xfer(struct rt_spi_device *device, struct rt_spi_me
     RT_ASSERT(device->bus != RT_NULL);
     RT_ASSERT(device->parent.user_data != RT_NULL);
     RT_ASSERT(message->send_buf != RT_NULL || message->recv_buf != RT_NULL);
-
     struct rt_spi_configuration config = device->config;
     struct raspi_spi_device * hw_config = (struct raspi_spi_device *)device->parent.user_data;
     GPIO_PIN cs_pin = (GPIO_PIN)hw_config->cs_pin;
     struct raspi_spi_hw_config *hwcfg = (struct raspi_spi_hw_config *)hw_config->spi_hw_config;
 
+    //mode MSB
     if (config.mode & RT_SPI_MSB)
     {
-        flag = 0;
+        flag = 1;
     }   
     else
     {
-        flag = 1;
+        flag = 0;
     }
 
-    if (message->cs_take)
+    //max_hz
+    if(config.max_hz == 0)
+    {
+        SPI_REG_CLK(hwcfg->hw_base) = 0;
+    }
+    else
     {
-        (config.mode & RT_SPI_CS_HIGH)?prev_raspi_pin_write(cs_pin, 1):prev_raspi_pin_write(cs_pin, 0);
+        SPI_REG_CLK(hwcfg->hw_base) = (RPI_CORE_CLK_HZ / (config.max_hz));
+    }
+    
+    //cs_pin spi0.0
+    if(cs_pin == GPIO_PIN_8)
+    {
+        SPI_REG_CS(hwcfg->hw_base) &= (~(3 << 0));
+    }
+    else if(cs_pin == GPIO_PIN_7)//spi0.1
+    {
+        SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_CHIP_SELECT_1;
     }
 
+    //Clear TX and RX fifos
+    SPI_REG_CS(hwcfg->hw_base) |= (SPI_CS_CLEAR_TX | SPI_CS_CLEAR_RX);
+    if (message->cs_take)
+    {
+        SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_TA;
+    }
     res = spi_transfernb(hwcfg, (rt_uint8_t *)message->send_buf, (rt_uint8_t *)message->recv_buf, (rt_int32_t)message->length, flag);
     if (message->cs_release)
     {
-        (config.mode & RT_SPI_CS_HIGH)?prev_raspi_pin_write(cs_pin, 0):prev_raspi_pin_write(cs_pin, 1);
+        //Set TA = 0, and also set the barrier
+        SPI_REG_CS(hwcfg->hw_base) &= (~SPI_CS_TA);
     }
+
     if (res != RT_EOK)
            return RT_ERROR;
 
@@ -212,18 +224,6 @@ rt_err_t raspi_spi_hw_init(struct raspi_spi_hw_config *hwcfg)
 #endif
     //clear rx and tx
     SPI_REG_CS(hwcfg->hw_base) = (SPI_CS_CLEAR_TX | SPI_CS_CLEAR_RX);
-    //enable chip select
-#if defined (BSP_USING_SPI0_DEVICE0)
-    SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_CHIP_SELECT_0;
-#endif
-
-#if defined (BSP_USING_SPI0_DEVICE1)
-    SPI_REG_CS(hwcfg->hw_base) |= SPI_CS_CHIP_SELECT_1;
-#endif
-    
-#if defined (BSP_USING_SPI0_DEVICE0) && defined (BSP_USING_SPI0_DEVICE1)
-    HWREG32(SPI_REG_CS(hwcfg->hw_base)) |= (SPI_CS_CHIP_SELECT_0 | SPI_CS_CHIP_SELECT_1);
-#endif
     return RT_EOK;
 }
 
@@ -273,6 +273,7 @@ struct raspi_spi_device raspi_spi0_device1 =
     .device_name = SPI0_DEVICE1_NAME,
     .spi_bus = &spi0_bus,
     .spi_device = &spi0_device1,
+    .spi_hw_config = &raspi_spi0_hw,
     .cs_pin = GPIO_PIN_7,
 };
 #endif

+ 21 - 6
bsp/raspberry-pi/raspi4-32/driver/drv_uart.c

@@ -63,15 +63,22 @@ static rt_err_t uart_configure(struct rt_serial_device *serial, struct serial_co
         AUX_MU_LCR_REG(uart->hw_base)   = 3;    /* Works in 8-bit mode */
         AUX_MU_MCR_REG(uart->hw_base)   = 0;    /* Disable RTS */
         AUX_MU_IIR_REG(uart->hw_base)   = 0xC6; /* Enable FIFO, Clear FIFO */
-        AUX_MU_BAUD_REG(uart->hw_base)  = 270;  /* 115200 = system clock 250MHz / (8 * (baud + 1)), baud = 270 */
+        AUX_MU_BAUD_REG(uart->hw_base)  = 541;  /* 115200 = system clock 500MHz / (8 * (baud + 1)), baud = 541 */
         AUX_MU_CNTL_REG(uart->hw_base)  = 3;    /* Enable Transmitter and Receiver */
         return RT_EOK;
     }
 
     if(uart->hw_base == UART0_BASE)
     {
+#ifndef BSP_USING_BULETOOTH
         prev_raspi_pin_mode(GPIO_PIN_14, ALT0);
         prev_raspi_pin_mode(GPIO_PIN_15, ALT0);
+#else
+        prev_raspi_pin_mode(GPIO_PIN_30, ALT3);
+        prev_raspi_pin_mode(GPIO_PIN_31, ALT3);
+        prev_raspi_pin_mode(GPIO_PIN_32, ALT3);
+        prev_raspi_pin_mode(GPIO_PIN_33, ALT3);
+#endif
     }
 
     if(uart->hw_base == UART3_BASE)
@@ -92,13 +99,21 @@ static rt_err_t uart_configure(struct rt_serial_device *serial, struct serial_co
         prev_raspi_pin_mode(GPIO_PIN_13, ALT4);
     }
 
-    PL011_REG_CR(uart->hw_base) = 0;/*Clear UART setting*/
-    PL011_REG_LCRH(uart->hw_base) = 0;/*disable FIFO*/
+    PL011_REG_IMSC(uart->hw_base) = 0;     /* mask all interrupt */
+    PL011_REG_ICR(uart->hw_base) = 0x7ff;  /* clear all interrupt */
+    //PL011 clock 480MHz 480x10^6/baudrate/16
     PL011_REG_IBRD(uart->hw_base) = ibrd;
     PL011_REG_FBRD(uart->hw_base) = (((bauddiv - ibrd * 1000) * 64 + 500) / 1000);
-    PL011_REG_LCRH(uart->hw_base) = PL011_LCRH_WLEN_8;/*FIFO*/
-    PL011_REG_CR(uart->hw_base) = PL011_CR_UARTEN | PL011_CR_TXE | PL011_CR_RXE;/*art enable, TX/RX enable*/
-
+#ifdef BSP_USING_BULETOOTH
+    PL011_REG_IFLS(uart->hw_base) = 0x08;
+    PL011_REG_LCRH(uart->hw_base) = 0x70;
+    PL011_REG_CR(uart->hw_base) = PL011_CR_UARTEN | PL011_CR_TXE | PL011_CR_RXE | PL011_CR_RTS;
+#else
+    PL011_REG_IFLS(uart->hw_base) = 0x0;
+    PL011_REG_LCRH(uart->hw_base) = PL011_LCRH_WLEN_8;
+    PL011_REG_CR(uart->hw_base) = PL011_CR_UARTEN | PL011_CR_TXE | PL011_CR_RXE;
+#endif
+    PL011_REG_IMSC(uart->hw_base) = 0;
     return RT_EOK;
 }
 

+ 18 - 0
bsp/raspberry-pi/raspi4-32/driver/lcd/Sconscript

@@ -0,0 +1,18 @@
+# RT-Thread building script for component
+
+from building import *
+
+cwd = GetCurrentDir()
+src = Glob('*.c') + Glob('*.cpp')
+CPPPATH = [cwd]
+
+if not (GetDepend('BSP_USING_HDMI_DISPLAY') or GetDepend('BSP_USING_DSI_DISPLAY')):
+    SrcRemove(src, ['drv_hdmi.c'])
+if not GetDepend('BSP_USING_ILI9486'):
+    SrcRemove(src, ['drv_ili9486.c'])
+if not GetDepend('USING_LCD_CONSOLE'):
+    SrcRemove(src, ['lcd_console.c'])
+
+group = DefineGroup('drv_lcd', src, depend = ['BSP_USING_LCD'], CPPPATH = CPPPATH)
+
+Return('group')

+ 18 - 4
bsp/raspberry-pi/raspi4-32/driver/drv_hdmi.c → bsp/raspberry-pi/raspi4-32/driver/lcd/drv_hdmi.c

@@ -13,10 +13,14 @@
 #include "mbox.h"
 #include "drv_hdmi.h"
 
-#ifdef BSP_USING_HDMI
+#ifdef USING_LCD_CONSOLE
+#include "lcd_console.h"
+#endif
+
+#if defined(BSP_USING_HDMI_DISPLAY) || defined(BSP_USING_DSI_DISPLAY)
 #define LCD_WIDTH     (800)
 #define LCD_HEIGHT    (480)
-#define LCD_DEPTH     (32)
+#define LCD_DEPTH     (4)
 #define LCD_BPP       (32)
 
 #define TAG_ALLOCATE_BUFFER         0x00040001
@@ -84,6 +88,9 @@ rt_size_t hdmi_fb_read(rt_device_t dev, rt_off_t pos, void *buf, rt_size_t size)
 
 rt_size_t hdmi_fb_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
 {
+#ifdef USING_LCD_CONSOLE
+    fb_print((char*)buffer);
+#endif
     return size;
 }
 
@@ -105,7 +112,7 @@ rt_err_t hdmi_fb_control(rt_device_t dev, int cmd, void *args)
 
             RT_ASSERT(info != RT_NULL);
             info->pixel_format  = RTGRAPHIC_PIXEL_FORMAT_RGB888;
-            info->bits_per_pixel= LCD_DEPTH;
+            info->bits_per_pixel= 32;
             info->width         = lcd->width;
             info->height        = lcd->height;
             info->framebuffer   = lcd->fb;
@@ -285,12 +292,18 @@ void *bcm271x_mbox_fb_alloc(int width, int height, int bpp, int nrender)
     mbox[34] = TAG_END;
 
     mbox_call(8, MMU_DISABLE);
+
     return (void *)((rt_uint32_t)(mbox[5] & 0x3fffffff));
 }
 
 int hdmi_fb_init(void)
 {
     _hdmi.fb = (rt_uint8_t *)bcm271x_mbox_fb_alloc(LCD_WIDTH, LCD_HEIGHT, LCD_BPP, 1);
+    if(_hdmi.fb == RT_NULL)
+    {
+        rt_kprintf("init dsi or hdmi err!\n");
+        return 0;
+    }
     bcm271x_mbox_fb_setoffset(0, 0);
     bcm271x_mbox_fb_set_porder(0);
     _hdmi.width = LCD_WIDTH;
@@ -299,8 +312,9 @@ int hdmi_fb_init(void)
     _hdmi.pitch = 0;
     _hdmi.pixel_format = RTGRAPHIC_PIXEL_FORMAT_RGB888;
 
+    rt_memset(_hdmi.fb, 0, LCD_WIDTH*LCD_HEIGHT*(LCD_BPP/8));
     //rt_kprintf("_hdmi.fb is %p\n", _hdmi.fb);
-    rt_hdmi_fb_device_init(&_hdmi, "lcd");
+    rt_hdmi_fb_device_init(&_hdmi, "hdmi");
 
     return 0;
 }

+ 0 - 0
bsp/raspberry-pi/raspi4-32/driver/drv_hdmi.h → bsp/raspberry-pi/raspi4-32/driver/lcd/drv_hdmi.h


+ 381 - 0
bsp/raspberry-pi/raspi4-32/driver/lcd/drv_ili9486.c

@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-08     bigmagic       first version
+ */
+#include <rtthread.h>
+#include <rtdevice.h>
+
+#include <raspi4.h>
+#include <drv_spi.h>
+#include "drv_ili9486.h"
+
+#ifdef USING_LCD_CONSOLE
+#include "lcd_console.h"
+#endif
+
+//http://www.lcdwiki.com/MHS-3.5inch_RPi_Display
+#define LCD_DEVICE_NAME       ("spi0.0")
+
+#define LCD_SPI_SEND_FAST
+//waveshare
+#define LCD_SCREEN_WIDTH      (320)
+#define LCD_SCREEN_HEIGHT     (480)
+
+#define LCD_RESET_PIN         (25)
+#define LCD_RS_PIN            (24)
+
+#define LCD_SPI_FREQ_MAX      (125*1000*1000)
+
+uint16_t LCD_HEIGHT = LCD_SCREEN_HEIGHT;
+uint16_t LCD_WIDTH  = LCD_SCREEN_WIDTH;
+
+#define SCREEN_VERTICAL_1           (0)
+#define SCREEN_HORIZONTAL_1         (1)
+#define SCREEN_VERTICAL_2           (2)
+#define SCREEN_HORIZONTAL_2         (3)
+
+struct rt_semaphore lcd_spi_lock;
+struct rt_semaphore lcd_lock;
+
+//rgb565 lcd buffer
+uint16_t _lcd_buffer[LCD_SCREEN_WIDTH * LCD_SCREEN_HEIGHT];
+uint16_t send_buffer[LCD_SCREEN_WIDTH * LCD_SCREEN_HEIGHT];
+
+static struct rt_spi_device *lcd_dev;
+
+static inline void send_cmd(void)
+{
+    rt_pin_write(LCD_RS_PIN, PIN_LOW);
+}
+
+static inline void send_data(void)
+{
+    rt_pin_write(LCD_RS_PIN, PIN_HIGH);
+}
+
+void writeData16(rt_uint16_t data)
+{
+    rt_uint8_t send_data[2];
+    send_data[1] = data & 0x00FF;
+    send_data[0] = ((data >> 8) & 0x00FF);
+    rt_spi_transfer(lcd_dev, &send_data[0], RT_NULL, 2);
+}
+
+void writeData(void* dev,rt_uint8_t data)
+{
+    writeData16((rt_uint16_t)(data));
+}
+
+void writeCommand(void* dev, rt_uint8_t cmd)
+{
+    send_cmd();
+    writeData16((rt_uint16_t)(cmd));
+    send_data();
+}
+
+void lcd_write_commmand(rt_uint8_t cmd)
+{
+    writeCommand(lcd_dev, cmd);
+}
+
+void lcd_write_data(rt_uint8_t data)
+{
+    writeData(lcd_dev, data);
+}
+
+/*Ser rotation of the screen - changes x0 and y0*/
+static inline void lcd_set_rotation(uint8_t rotation) 
+{
+    writeCommand(lcd_dev, 0x36);
+    rt_thread_mdelay(100);
+
+    switch(rotation) {
+        case SCREEN_VERTICAL_1:
+            writeData(lcd_dev, 0x48);
+            LCD_WIDTH  = 320;
+            LCD_HEIGHT = 480;
+            break;
+        case SCREEN_HORIZONTAL_1:
+            writeData(lcd_dev, 0x28);
+            LCD_WIDTH  = 480;
+            LCD_HEIGHT = 320;
+            break;
+        case SCREEN_VERTICAL_2:
+            writeData(lcd_dev, 0x98);
+            LCD_WIDTH  = 320;
+            LCD_HEIGHT = 480;
+            break;
+        case SCREEN_HORIZONTAL_2:
+            writeData(lcd_dev, 0xF8);
+            LCD_WIDTH  = 480;
+            LCD_HEIGHT = 320;
+            break;
+        default:
+            //EXIT IF SCREEN ROTATION NOT VALID!
+            break;
+    }
+
+    if((rotation == SCREEN_VERTICAL_1) || (rotation == SCREEN_VERTICAL_2))
+    {
+        lcd_write_commmand(0x2A);
+        lcd_write_data(0x00);
+        lcd_write_data(0x00);
+        lcd_write_data(0x01);
+        lcd_write_data(0x3F);
+
+        lcd_write_commmand(0x2B);
+        lcd_write_data(0x00);
+        lcd_write_data(0x00);
+        lcd_write_data(0x01);
+        lcd_write_data(0xE0);
+    }
+    
+    if((rotation == SCREEN_HORIZONTAL_1) || (rotation == SCREEN_HORIZONTAL_2))
+    {
+        lcd_write_commmand(0x2B);
+        lcd_write_data(0x00);
+        lcd_write_data(0x00);
+        lcd_write_data(0x01);
+        lcd_write_data(0x3F);
+
+        lcd_write_commmand(0x2A);
+        lcd_write_data(0x00);
+        lcd_write_data(0x00);
+        lcd_write_data(0x01);
+        lcd_write_data(0xE0);
+    }
+}
+
+static inline void fast_send_data(void)
+{
+    rt_uint32_t ii = 0;
+    rt_uint32_t tx_index = 0;
+    char *tx_data = (char *)send_buffer;
+    rt_sem_take(&lcd_spi_lock, RT_WAITING_FOREVER);
+
+    SPI_REG_CS(SPI_0_BASE) &= (~(3 << 0));
+    SPI_REG_CLK(SPI_0_BASE) = 4;
+    SPI_REG_CS(SPI_0_BASE) |= SPI_CS_TA;
+    for(tx_index=0;tx_index<(LCD_SCREEN_WIDTH * LCD_SCREEN_HEIGHT) * 2;tx_index++)
+    {
+        for(ii = 0; ii < 32; ii = ii + 2)
+        {
+            SPI_REG_FIFO(SPI_0_BASE) = tx_data[tx_index + ii + 1];
+            SPI_REG_FIFO(SPI_0_BASE) = tx_data[tx_index + ii];
+        }
+        while (!(SPI_REG_CS(SPI_0_BASE) & SPI_CS_DONE));
+        SPI_REG_CS(SPI_0_BASE) |= (SPI_CS_CLEAR_TX) | (SPI_CS_CLEAR_RX);
+        tx_index = tx_index + 31;
+    }
+    SPI_REG_CS(SPI_0_BASE) |= (SPI_CS_CLEAR_TX) | (SPI_CS_CLEAR_RX);
+    SPI_REG_CS(SPI_0_BASE) &= (~SPI_CS_TA);
+    rt_sem_release(&lcd_spi_lock);
+}
+
+static inline void lcd_show(void) 
+{
+
+    lcd_write_commmand(0x2C); // Memory write?
+
+    //rt_thread_mdelay(150);
+
+#ifdef LCD_SPI_SEND_FAST
+    fast_send_data();
+#else
+    int i, j;
+    for (i = 0 ; i < 30  ; i ++) 
+    {
+        uint16_t *tx_data = (uint16_t*)&send_buffer[5120* i];
+        int32_t data_sz = 5120;
+        for( j=0; j<data_sz; j++)  
+        {
+            writeData16(tx_data[j]);
+        }
+    }
+#endif
+
+}
+
+static void lcd_init(void)
+{
+    writeCommand(lcd_dev, 0x28);
+    rt_thread_mdelay(150);
+
+    writeCommand(lcd_dev, 0x3A);    // Interface Pixel Format
+    writeData(lcd_dev, 0x55);       // 16 bit/pixe
+
+    writeCommand(lcd_dev, 0xC2);    // Interface Pixel Format
+    writeData(lcd_dev, 0x44);
+
+    writeCommand(lcd_dev, 0xC5);     // VCOM Control
+    writeData(lcd_dev, 0x00);
+    writeData(lcd_dev, 0x00);
+    writeData(lcd_dev, 0x00);
+    writeData(lcd_dev, 0x00);
+
+    writeCommand(lcd_dev, 0xE0);     // PGAMCTRL(Positive Gamma Control)
+    writeData(lcd_dev, 0x0F);
+    writeData(lcd_dev, 0x1F);
+    writeData(lcd_dev, 0x1C);
+    writeData(lcd_dev, 0x0C);
+    writeData(lcd_dev, 0x0F);
+    writeData(lcd_dev, 0x08);
+    writeData(lcd_dev, 0x48);
+    writeData(lcd_dev, 0x98);
+    writeData(lcd_dev, 0x37);
+    writeData(lcd_dev, 0x0A);
+    writeData(lcd_dev, 0x13);
+    writeData(lcd_dev, 0x04);
+    writeData(lcd_dev, 0x11);
+    writeData(lcd_dev, 0x0D);
+    writeData(lcd_dev, 0x00);
+
+    writeCommand(lcd_dev, 0xE1);     // NGAMCTRL (Negative Gamma Correction)
+    writeData(lcd_dev, 0x0F);
+    writeData(lcd_dev, 0x32);
+    writeData(lcd_dev, 0x2E);
+    writeData(lcd_dev, 0x0B);
+    writeData(lcd_dev, 0x0D);
+    writeData(lcd_dev, 0x05);
+    writeData(lcd_dev, 0x47);
+    writeData(lcd_dev, 0x75);
+    writeData(lcd_dev, 0x37);
+    writeData(lcd_dev, 0x06);
+    writeData(lcd_dev, 0x10);
+    writeData(lcd_dev, 0x03);
+    writeData(lcd_dev, 0x24);
+    writeData(lcd_dev, 0x20);
+    writeData(lcd_dev, 0x00);
+
+    writeCommand(lcd_dev, 0x11); // Sleep out, also SW reset
+    rt_thread_mdelay(150);
+
+    writeCommand(lcd_dev, 0x20);   // Display Inversion OFF   RPi LCD (A)
+    //writeCommand(lcd_dev, 0x21); // Display Inversion ON    RPi LCD (B)
+
+    lcd_set_rotation(SCREEN_VERTICAL_2);
+    writeCommand(lcd_dev, 0x29);   // Display ON
+    rt_thread_mdelay(150);
+}
+
+static inline void lcd_reset(void)
+{
+    //Reset signal, low reset (pin22)
+    rt_pin_mode(LCD_RESET_PIN,PIN_MODE_OUTPUT);
+
+    rt_pin_write(LCD_RESET_PIN, PIN_HIGH);
+    rt_thread_mdelay(100);
+    rt_pin_write(LCD_RESET_PIN, PIN_LOW);
+    rt_thread_mdelay(100);
+    rt_pin_write(LCD_RESET_PIN, PIN_HIGH);
+}
+
+
+rt_err_t ili9486_open(rt_device_t dev, rt_uint16_t oflag)
+{
+    return RT_EOK;
+}
+
+rt_err_t ili9486_close(rt_device_t dev)
+{
+    return RT_EOK;
+}
+
+rt_size_t ili9486_read(rt_device_t dev, rt_off_t pos, void *buf, rt_size_t size)
+{
+    return 0;
+}
+
+rt_size_t ili9486_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
+{
+#ifdef USING_LCD_CONSOLE
+    fb_print((char*)buffer);
+#endif
+    return size;
+}
+
+rt_err_t ili9486_control(rt_device_t dev, int cmd, void *args)
+{
+    rt_sem_take(&lcd_lock, RT_WAITING_FOREVER);
+    switch (cmd)
+    {
+    case RTGRAPHIC_CTRL_RECT_UPDATE:
+        {
+            struct rt_device_rect_info *info = (struct rt_device_rect_info*)args;
+            info = info;
+            rt_memcpy(send_buffer, _lcd_buffer, LCD_SCREEN_WIDTH * LCD_SCREEN_HEIGHT * 2);
+            lcd_show();
+        }
+        break;
+
+    case RTGRAPHIC_CTRL_GET_INFO:
+        {
+           struct rt_device_graphic_info* info = (struct rt_device_graphic_info*)args;
+
+            RT_ASSERT(info != RT_NULL);
+            info->pixel_format  = RTGRAPHIC_PIXEL_FORMAT_RGB565;
+            info->bits_per_pixel= 16;
+            info->width         = LCD_WIDTH;
+            info->height        = LCD_HEIGHT;
+            info->framebuffer   = (void *)_lcd_buffer;//lcd->fb;
+        }
+        break;
+    }
+    rt_sem_release(&lcd_lock);
+    return RT_EOK;
+}
+
+#ifdef RT_USING_DEVICE_OPS
+const static struct rt_device_ops ili9486_ops = 
+{
+    RT_NULL,
+    ili9486_open,
+    ili9486_close,
+    ili9486_read,
+    ili9486_write,
+    ili9486_control,
+};
+#endif
+
+static int hw_ili9486_lcd_init(void)
+{
+    struct rt_device *device;
+    device = rt_malloc(sizeof(struct rt_device));
+    rt_memset(device, 0, sizeof(struct rt_device));
+
+    lcd_reset();
+    rt_pin_mode(LCD_RS_PIN, PIN_MODE_OUTPUT);
+    lcd_dev = (struct rt_spi_device *)rt_device_find(LCD_DEVICE_NAME);
+    if (!lcd_dev)
+    {
+        rt_kprintf("no %s!\n", LCD_DEVICE_NAME);
+    }
+    lcd_dev->config.max_hz = LCD_SPI_FREQ_MAX;//125M
+    lcd_init();
+
+    rt_sem_init(&lcd_spi_lock, "lcd_spi_lock", 1, RT_IPC_FLAG_FIFO);
+    rt_sem_init(&lcd_lock, "lcd_spi_lock", 1, RT_IPC_FLAG_FIFO);
+     /* set device type */
+    device->type = RT_Device_Class_Graphic;
+    /* initialize device interface */
+#ifdef RT_USING_DEVICE_OPS
+    device->ops = &ili9486_ops;
+#else
+    device->init = RT_NULL;
+    device->open = ili9486_open;
+    device->close = ili9486_close;
+    device->read = ili9486_read;
+    device->write = ili9486_write;
+    device->control = ili9486_control;
+#endif
+    /* register to device manager */
+    rt_device_register(device, "lcd", RT_DEVICE_FLAG_RDWR);
+
+    return RT_EOK;
+}
+INIT_DEVICE_EXPORT(hw_ili9486_lcd_init);

+ 13 - 0
bsp/raspberry-pi/raspi4-32/driver/lcd/drv_ili9486.h

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-08     bigmagic       first version
+ */
+#ifndef __DRV_ILI9486_H__
+#define __DRV_ILI9486_H__
+
+#endif//ILI9486

+ 258 - 0
bsp/raspberry-pi/raspi4-32/driver/lcd/lcd_console.c

@@ -0,0 +1,258 @@
+
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-09     bigmagic       first version
+ */
+
+#include "lcd_console.h"
+#include "lcd_font_20.h"
+
+#define LCD_CONSOLE_FLUSH_NOW    1
+
+#define CONSOLE_NAME    "hdmi"
+#define COLOR_DELTA     0.05
+
+#ifndef LCD_CONSOLE_FLUSH_NOW
+static rt_thread_t console_flush_thread_tid = RT_NULL;
+#define CONSOLE_FLUSH_THREAD_STACK_SIZE   (1024)
+#define CONSOLE_FLUSH_THREAD_PRIORITY     (20)
+#define CONSOLE_FLUSH_THREAD_TIMESLICE    (10)
+#define LCD_CONSOLE_DELAY                 (100)  //100ms
+#endif
+
+static rt_device_t console_dev = RT_NULL;
+
+static fb_t console_fb;
+static rt_uint8_t* virt_buffer;
+
+static rt_uint32_t CHAR_W = 8;
+static rt_uint32_t CHAR_H = 20;
+
+static int prev_x_offset = 0;
+
+static void newline(fb_t* fb)
+{
+    uint8_t* to;
+    uint8_t* from;
+    int i;
+    fb->y++;
+    fb->x = 5 * fb->depth;
+
+    if (fb->y == (fb->height / CHAR_H))
+    {
+        to = (uint8_t*) fb->vaddr;
+        from = to + (CHAR_H * fb->pitch);
+
+        for (i = 0; i < ((fb->height - CHAR_H) * fb->pitch); i++)
+        {
+            *to++ = *from++;
+        }
+
+        if(fb->depth >= 3)
+        {
+            uint32_t *addr_32bit = (uint32_t*) (fb->vaddr) + (fb->height - CHAR_H) * fb->width;        
+
+            for (i = 0; i < (CHAR_H * fb->width); i++)
+            {
+                *addr_32bit++ = fb->back;
+            }
+        }
+        else
+        {
+            uint16_t *addr_16bit = (uint16_t*) (fb->vaddr) + (fb->height - CHAR_H) * fb->width;        
+
+            for (i = 0; i < (CHAR_H * fb->width); i++)
+            {
+                *addr_16bit++ = fb->back;
+            }
+        }
+        fb->y =  fb->y - 1;
+    }
+}
+
+
+static void fb_draw_char(fb_t *fb, char s)
+{
+    unsigned char* addr = (unsigned char*) fb->vaddr;
+    unsigned char *glyph = (unsigned char *)lcd_console_font_dejavu_20_glyph_bitmap + lcd_console_font_dejavu_20_glyph_dsc[s - 32].glyph_index;
+    CHAR_W = lcd_console_font_dejavu_20_glyph_dsc[s - 32].w_px;
+
+    fb->x = fb->x + prev_x_offset * fb->depth;
+
+    int i, j, line, mask, bytesperline = (CHAR_W + 7) / 8;
+    int kk = (bytesperline) * 8;
+    prev_x_offset = CHAR_W + 2;
+    // calculate the offset on screen
+    int offs = (fb->y * CHAR_H * fb->pitch) + fb->x;
+
+    // display a character
+    for (j = 0; j < CHAR_H; j++)
+    {
+        // display one row
+        line = offs;
+        mask = 1;
+        mask = 0x80;
+        for (i = 0; i < kk; i++)
+        {
+            if(fb->depth >= 3)
+            {
+                *((unsigned int*) (addr + line)) = ((int) *(glyph + ((i)/8)) * 1) & mask ? fb->fore : fb->back;
+            }
+            else
+            {
+                *((unsigned short*) (addr + line)) = ((int) *(glyph + ((i)/8)) * 1) & mask ? fb->fore : fb->back;
+            }
+            
+            mask >>= 1;
+            if(mask == 0)
+            {
+                mask = 0x80;
+            }
+            line += fb->depth;
+        }
+        // adjust to next line
+        glyph += bytesperline;
+        offs += fb->pitch;
+    }
+}
+
+void fb_print(char *s)
+{
+    fb_t *fb = &console_fb;
+    // draw next character if it's not zero
+    while (*s)
+    {
+        // handle carrige return
+        if (*s == '\r')
+        {
+            fb->x = 5 * fb->depth;
+        }
+        else if (*s == '\n')
+        {
+            newline(fb);
+        }
+        else if (*s == '\t')
+        {
+            //tab is 8 spaces
+            if((fb->x + 8 * fb->depth) < (fb->width) * fb->depth)
+            {
+                fb->x = fb->x + 8 * fb->depth;
+            }
+        }
+        else if (*s == '\b')
+        {
+            if (fb->x > 5 * fb->depth)
+            {
+                fb->x = fb->x - prev_x_offset * fb->depth;
+                fb_draw_char(fb, ' ');
+            }
+        }
+        else if((fb->x + prev_x_offset * fb->depth + 5 * fb->depth) >= (fb->width * fb->depth))
+        {
+            newline(fb);
+            fb_draw_char(fb, *s);
+        }
+        else
+        {
+            fb_draw_char(fb, *s);
+        }
+        s++;
+    }
+
+#ifdef LCD_CONSOLE_FLUSH_NOW
+    rt_memcpy((void *)fb->paddr, (void *)fb->vaddr, fb->size);
+    if(console_dev != RT_NULL)
+    {
+        rt_device_control(console_dev,RTGRAPHIC_CTRL_RECT_UPDATE, RT_NULL);
+    }
+#endif 
+}
+
+#ifndef LCD_CONSOLE_FLUSH_NOW
+void lcd_console_task_entry(void *param)
+{   
+    fb_t *fb = (fb_t *)param;
+    while (1)
+    {
+        rt_memcpy((void *)fb->paddr, (void *)fb->vaddr, fb->size);
+        if(console_dev != RT_NULL)
+        {
+            rt_device_control(console_dev,RTGRAPHIC_CTRL_RECT_UPDATE, RT_NULL);
+        }
+        rt_thread_mdelay(LCD_CONSOLE_DELAY);
+    }
+    
+}
+#endif
+
+int lcd_console_init(void)
+{
+    struct rt_device_graphic_info info;
+    console_dev = rt_device_find(CONSOLE_NAME);
+    if(console_dev == RT_NULL)
+    {
+        rt_kprintf("no console dev!\n");
+        return 0;
+    }
+    
+    if(console_dev->ref_count >= 1)
+    {
+        rt_kprintf("lcd console has open!\n");
+        return 0;
+    }
+
+    rt_device_open(console_dev,RT_DEVICE_OFLAG_RDWR);
+
+    rt_device_control(console_dev, RTGRAPHIC_CTRL_GET_INFO, &info);
+        
+    virt_buffer = (rt_uint8_t* )rt_malloc(info.width * info.height * (info.bits_per_pixel/8));
+    rt_memset(virt_buffer, 0 , info.width * info.height * (info.bits_per_pixel/8));
+    console_fb.width = info.width;
+    console_fb.height = info.height;
+    console_fb.pitch = info.width * (info.bits_per_pixel/8);
+    console_fb.vaddr = (rt_uint32_t)virt_buffer;
+    console_fb.paddr = (rt_uint32_t)info.framebuffer;
+    console_fb.size = info.width * info.height * (info.bits_per_pixel/8);
+    console_fb.depth = info.bits_per_pixel/8;
+    console_fb.x = 0;
+    console_fb.y = 0;
+    if(console_fb.depth >= 3)
+    {
+        console_fb.fore = CONSOLE_WHITE_32;
+        console_fb.back = CONSOLE_BLACK_32;
+    }
+    else
+    {
+        console_fb.fore = CONSOLE_WHITE_16;
+        console_fb.back = CONSOLE_BLACK_16;
+    }
+
+#ifndef LCD_CONSOLE_FLUSH_NOW
+    console_flush_thread_tid = rt_thread_create("lcd_console", lcd_console_task_entry, (void *)&console_fb,
+                                       CONSOLE_FLUSH_THREAD_STACK_SIZE,
+                                       CONSOLE_FLUSH_THREAD_PRIORITY, CONSOLE_FLUSH_THREAD_TIMESLICE);
+    if (console_flush_thread_tid != RT_NULL)
+        rt_thread_startup(console_flush_thread_tid);
+#endif
+    /*
+    * note:
+    * if serial console and lcd console together
+    * you can add /src/kservice.c:rt_kprintf
+    * #ifdef USING_LCD_CONSOLE
+    *     fb_print((char*)rt_log_buf);
+    * #endif
+    * 
+    * remove rt_console_set_device(CONSOLE_NAME);
+    */
+    rt_console_set_device(CONSOLE_NAME);
+
+    rt_show_version();//show rt-thread logo
+
+    return 0;
+}
+INIT_APP_EXPORT(lcd_console_init);

+ 59 - 0
bsp/raspberry-pi/raspi4-32/driver/lcd/lcd_console.h

@@ -0,0 +1,59 @@
+
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-09     bigmagic       first version
+ */
+#ifndef __LCD_CONSOLE_H__
+#define __LCD_CONSOLE_H__
+
+#include <rtthread.h>
+
+#define RGB(r, g, b) ((((r))<<16) | (((g))<<8) | ((b)))
+#define COLOR_BLACK RGB(0, 0, 0)
+#define COLOR_GREEN RGB(0, 255, 0)  
+#define COLOR_CYAN RGB(0, 255, 255) 
+#define COLOR_RED RGB(255, 0, 0)  
+#define COLOR_YELLOW RGB(255, 255, 0) 
+#define COLOR_WHITE RGB(255, 255, 255)
+
+#define CONSOLE_WHITE_32 COLOR_WHITE
+#define CONSOLE_BLACK_32 COLOR_BLACK
+#define CONSOLE_GREEN_32 COLOR_GREEN
+#define CONSOLE_CYAN_32 COLOR_CYAN
+#define CONSOLE_RED_32 COLOR_RED
+
+
+#define RGB16(r, g, b) ((((r))<<11) | (((g))<<5) | ((b)))
+#define CONSOLE_YELLOW_16 RGB16(0x1f,0x3f,0)
+#define CONSOLE_WHITE_16 RGB16(0x1f,0x3f,0x1f)
+#define CONSOLE_BLACK_16 RGB16(0,0,0)
+#define CONSOLE_GREEN_16 RGB16(0,0x3f,0)
+#define CONSOLE_CYAN_16 RGB16(0,0x3f,0x1f)
+#define CONSOLE_RED_16 RGB16(0x1f,0,0)
+
+typedef struct
+{
+    rt_uint32_t width;
+    rt_uint32_t height;
+    rt_uint32_t vwidth;
+    rt_uint32_t vheight;
+    rt_uint32_t pitch;
+    rt_uint32_t depth;
+    rt_uint32_t fore;
+    rt_uint32_t back;
+    rt_uint32_t x;
+    rt_uint32_t y;
+    rt_uint32_t vaddr;
+    rt_uint32_t paddr;
+    rt_uint32_t size;
+} fb_t;
+
+void fb_print(char *s);
+int lcd_console_init(void);
+
+#endif//CONSOLE

+ 2299 - 0
bsp/raspberry-pi/raspi4-32/driver/lcd/lcd_font_20.h

@@ -0,0 +1,2299 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-26     bigmagic       first version
+ */
+static const uint8_t lcd_console_font_dejavu_20_glyph_bitmap[] = {
+    /*Unicode: U+0020 ( ) , Width: 6 */
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+
+
+    /*Unicode: U+0021 (!) , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+
+
+    /*Unicode: U+0022 (") , Width: 6 */
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0xcc,  //@@..@@
+    0xcc,  //@@..@@
+    0xcc,  //@@..@@
+    0xcc,  //@@..@@
+    0xcc,  //@@..@@
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+
+
+    /*Unicode: U+0023 (#) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x04, 0x40,  //.....@..+@..
+    0x04, 0x40,  //....+@..+@..
+    0x0c, 0xc0,  //....%@..%%..
+    0x0c, 0x80,  //....@%..@+..
+    0x7f, 0xf0,  //.@@@@@@@@@@@
+    0x7f, 0xf0,  //.@@@@@@@@@@@
+    0x09, 0x80,  //...+@..%@...
+    0x19, 0x00,  //...@%..@+...
+    0xff, 0xe0,  //@@@@@@@@@@@.
+    0xff, 0xe0,  //@@@@@@@@@@@.
+    0x13, 0x00,  //..+@..%@....
+    0x33, 0x00,  //..%%..%%....
+    0x32, 0x00,  //..@%..@+....
+    0x22, 0x00,  //..@+..@.....
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0024 ($) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x08, 0x00,  //....@....
+    0x08, 0x00,  //....@....
+    0x3e, 0x00,  //.+%@@@%..
+    0x7f, 0x00,  //+@@@@@@@.
+    0xe9, 0x00,  //@@%.@.+@.
+    0xc8, 0x00,  //@@..@....
+    0xf8, 0x00,  //%@@%@....
+    0x7e, 0x00,  //.@@@@@@+.
+    0x0f, 0x00,  //...+@@@@+
+    0x09, 0x80,  //....@.+@@
+    0x09, 0x80,  //....@..@@
+    0x8b, 0x80,  //@+..@.%@@
+    0xff, 0x00,  //@@@@@@@@+
+    0x7e, 0x00,  //.%@@@@%+.
+    0x08, 0x00,  //....@....
+    0x08, 0x00,  //....@....
+    0x08, 0x00,  //....@....
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0025 (%) , Width: 15 */
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x78, 0x10,  //.%@@%.....+@...
+    0x48, 0x20,  //+@++@+....@....
+    0xcc, 0x60,  //@@..@@...%%....
+    0xcc, 0x40,  //@@..@@...@.....
+    0xcc, 0x80,  //@@..@@..@+.....
+    0xc8, 0x80,  //+@++@+.+%......
+    0x79, 0x3c,  //.%@@%..@..%@@%.
+    0x02, 0x24,  //......%+.+@++@+
+    0x02, 0x66,  //.....+@..@@..@@
+    0x04, 0x66,  //.....@...@@..@@
+    0x0c, 0x66,  //....%%...@@..@@
+    0x08, 0x24,  //....@....+@++@+
+    0x10, 0x3c,  //...@+.....%@@%.
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+
+
+    /*Unicode: U+0026 (&) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x0f, 0x00,  //...+@@@%+...
+    0x1f, 0x80,  //..+@@@@@@...
+    0x30, 0x80,  //..@@+..+%...
+    0x30, 0x00,  //..@@........
+    0x38, 0x00,  //..%@%.......
+    0x3c, 0x00,  //..%@@%......
+    0x7e, 0x60,  //.%@%@@%..@@.
+    0xc7, 0x60,  //%@+.+@@%+@%.
+    0xc3, 0xc0,  //@@...+@@@@..
+    0xc1, 0x80,  //@@+...+@@+..
+    0xe1, 0xc0,  //%@@+..+@@%..
+    0x7f, 0xe0,  //.@@@@@@@@@%.
+    0x3e, 0x70,  //..%@@@%.+@@%
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0027 (') , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+
+
+    /*Unicode: U+0028 (() , Width: 4 */
+    0x00,  //....
+    0x00,  //....
+    0x30,  //..%@
+    0x20,  //..@+
+    0x60,  //.%@.
+    0x60,  //.@%.
+    0x40,  //+@+.
+    0xc0,  //%@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //%@..
+    0x40,  //+@+.
+    0x60,  //.@%.
+    0x60,  //.%@.
+    0x20,  //..@+
+    0x30,  //..%@
+    0x00,  //....
+    0x00,  //....
+
+
+    /*Unicode: U+0029 ()) , Width: 4 */
+    0x00,  //....
+    0x00,  //....
+    0xc0,  //@%..
+    0x40,  //+@..
+    0x60,  //.@%.
+    0x60,  //.%@.
+    0x20,  //.+@+
+    0x30,  //..@%
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@%
+    0x20,  //.+@+
+    0x60,  //.%@.
+    0x60,  //.@%.
+    0x40,  //+@..
+    0xc0,  //@%..
+    0x00,  //....
+    0x00,  //....
+
+
+    /*Unicode: U+002a (*) , Width: 7 */
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x10,  //...@...
+    0x92,  //%..@..%
+    0x54,  //+@+@+@+
+    0x38,  //..@@@..
+    0x38,  //..@@@..
+    0x54,  //+@+@+@+
+    0x92,  //%..@..%
+    0x10,  //...@...
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+
+
+    /*Unicode: U+002b (+) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0xff, 0xf0,  //@@@@@@@@@@@@
+    0xff, 0xf0,  //@@@@@@@@@@@@
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+002c (,) , Width: 3 */
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x60,  //.@@
+    0x60,  //.@@
+    0x40,  //+@.
+    0x80,  //@+.
+    0x00,  //...
+    0x00,  //...
+
+
+    /*Unicode: U+002d (-) , Width: 5 */
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0xf8,  //@@@@@
+    0xf8,  //@@@@@
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+    0x00,  //.....
+
+
+    /*Unicode: U+002e (.) , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+
+
+    /*Unicode: U+002f (/) , Width: 6 */
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x0c,  //....@@
+    0x0c,  //...+@%
+    0x18,  //...%@+
+    0x18,  //...@@.
+    0x18,  //...@@.
+    0x38,  //..+@%.
+    0x30,  //..@@+.
+    0x30,  //..@@..
+    0x30,  //.+@@..
+    0x70,  //.%@%..
+    0x60,  //.@@+..
+    0x60,  //.@@...
+    0x60,  //+@%...
+    0xc0,  //%@+...
+    0xc0,  //@@....
+    0x00,  //......
+    0x00,  //......
+
+
+    /*Unicode: U+0030 (0) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x1c, 0x00,  //..+@@@+..
+    0x7f, 0x00,  //.%@@@@@%.
+    0x63, 0x00,  //+@@+.+@@+
+    0xc1, 0x80,  //%@+...+@%
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //%@+...+@%
+    0x63, 0x00,  //+@@+.+@@+
+    0x7f, 0x00,  //.%@@@@@%.
+    0x3e, 0x00,  //..+@@@+..
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0031 (1) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x38,  //.+@@@...
+    0xf8,  //@@@@@...
+    0x98,  //@+.@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0032 (2) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x7c, 0x00,  //.%@@@%...
+    0xfe, 0x00,  //@@@@@@@+.
+    0x87, 0x00,  //@+...@@@.
+    0x03, 0x00,  //......@@.
+    0x03, 0x00,  //......@@.
+    0x06, 0x00,  //.....%@+.
+    0x06, 0x00,  //....+@@..
+    0x0c, 0x00,  //...+@@...
+    0x18, 0x00,  //..+@@+...
+    0x30, 0x00,  //.+@@+....
+    0x60, 0x00,  //+@@+.....
+    0xff, 0x00,  //@@@@@@@@.
+    0xff, 0x00,  //@@@@@@@@.
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0033 (3) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x7e, 0x00,  //.%@@@@%..
+    0xff, 0x00,  //@@@@@@@@+
+    0x83, 0x80,  //@+....%@@
+    0x01, 0x80,  //.......@@
+    0x03, 0x80,  //......%@%
+    0x3e, 0x00,  //..@@@@@+.
+    0x3f, 0x00,  //..@@@@@%.
+    0x03, 0x80,  //.....+@@%
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+    0x83, 0x80,  //%+...+@@%
+    0xff, 0x00,  //@@@@@@@@.
+    0x7e, 0x00,  //.%@@@@%..
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0034 (4) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x07, 0x00,  //.....%@@..
+    0x07, 0x00,  //....+@@@..
+    0x0b, 0x00,  //....@+@@..
+    0x1b, 0x00,  //...%@.@@..
+    0x13, 0x00,  //..+@..@@..
+    0x23, 0x00,  //..@+..@@..
+    0x63, 0x00,  //.@@...@@..
+    0x43, 0x00,  //+@....@@..
+    0xff, 0xc0,  //@@@@@@@@@@
+    0xff, 0xc0,  //@@@@@@@@@@
+    0x03, 0x00,  //......@@..
+    0x03, 0x00,  //......@@..
+    0x03, 0x00,  //......@@..
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+0035 (5) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x7e,  //.@@@@@@.
+    0x7e,  //.@@@@@@.
+    0x60,  //.@@.....
+    0x60,  //.@@.....
+    0x7c,  //.@@@@@..
+    0x7e,  //.@@@@@@.
+    0x47,  //.%...@@%
+    0x03,  //......@@
+    0x03,  //......@@
+    0x03,  //......@@
+    0x87,  //%...+@@%
+    0xfe,  //@@@@@@@.
+    0x7c,  //.%@@@%..
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0036 (6) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x1e, 0x00,  //...%@@@+.
+    0x3f, 0x00,  //.+@@@@@@.
+    0x71, 0x00,  //.@@%...%.
+    0xe0, 0x00,  //+@@......
+    0xc0, 0x00,  //@@+......
+    0xde, 0x00,  //@@.%@@%..
+    0xff, 0x00,  //@@%@@@@@.
+    0xe3, 0x80,  //@@%...%@%
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //%@.....@@
+    0x63, 0x80,  //+@%...%@%
+    0x7f, 0x00,  //.%@@@@@@.
+    0x1e, 0x00,  //..+@@@%..
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0037 (7) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0x06,  //.....%@+
+    0x06,  //.....@@.
+    0x06,  //....+@@.
+    0x0c,  //....%@+.
+    0x0c,  //....@@..
+    0x0c,  //....@@..
+    0x1c,  //...%@%..
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x38,  //..%@%...
+    0x30,  //..@@+...
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0038 (8) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x3e, 0x00,  //.+%@@@%+.
+    0x7f, 0x00,  //+@@@@@@@+
+    0xe3, 0x80,  //@@%...%@@
+    0xc1, 0x80,  //@@.....@@
+    0xe3, 0x80,  //%@%...%@%
+    0x3e, 0x00,  //.+@@@@@+.
+    0x7f, 0x00,  //.%@@@@@%.
+    0xe3, 0x80,  //%@%...%@%
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xe3, 0x80,  //@@%...%@@
+    0x7f, 0x00,  //+@@@@@@@+
+    0x3e, 0x00,  //..%@@@%..
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0039 (9) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x3c, 0x00,  //..%@@@+..
+    0x7f, 0x00,  //.@@@@@@%.
+    0xe3, 0x00,  //%@%...%@.
+    0xc1, 0x80,  //@@.....@%
+    0xc1, 0x80,  //@@.....@@
+    0xe3, 0x80,  //%@%...%@@
+    0x7f, 0x80,  //.@@@@@%@@
+    0x3d, 0x80,  //..%@@%.@@
+    0x01, 0x80,  //......+@@
+    0x03, 0x00,  //......@@+
+    0x47, 0x00,  //.%...%@@.
+    0x7e, 0x00,  //.@@@@@@+.
+    0x3c, 0x00,  //.+@@@%...
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+003a (:) , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+
+
+    /*Unicode: U+003b (;) , Width: 3 */
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x60,  //.@@
+    0x60,  //.@@
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x00,  //...
+    0x60,  //.@@
+    0x60,  //.@@
+    0x40,  //+@.
+    0x80,  //@+.
+    0x00,  //...
+    0x00,  //...
+
+
+    /*Unicode: U+003c (<) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x20,  //.........+@
+    0x01, 0xe0,  //.......%@@@
+    0x07, 0xc0,  //....+@@@@%+
+    0x3e, 0x00,  //.+%@@@@+...
+    0xf8, 0x00,  //@@@@%+.....
+    0xf8, 0x00,  //@@@@%+.....
+    0x3e, 0x00,  //.+%@@@@+...
+    0x07, 0xc0,  //....+@@@@%+
+    0x01, 0xe0,  //......+%@@@
+    0x00, 0x20,  //.........+@
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+003d (=) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+003e (>) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x80, 0x00,  //@+.........
+    0xf0, 0x00,  //@@@%.......
+    0x7c, 0x00,  //+%@@@@+....
+    0x0f, 0x80,  //...+@@@@%+.
+    0x03, 0xe0,  //.....+%@@@@
+    0x03, 0xe0,  //.....+%@@@@
+    0x0f, 0x80,  //...+@@@@%+.
+    0x7c, 0x00,  //+%@@@@+....
+    0xf0, 0x00,  //@@@%+......
+    0x80, 0x00,  //@+.........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+003f (?) , Width: 7 */
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x78,  //.%@@@+.
+    0xfc,  //@@@@@@+
+    0x8e,  //@+..%@@
+    0x06,  //.....@@
+    0x06,  //....+@%
+    0x0c,  //....@@.
+    0x18,  //...@@..
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x00,  //.......
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+
+
+    /*Unicode: U+0040 (@) , Width: 16 */
+    0x00, 0x00,  //................
+    0x00, 0x00,  //................
+    0x00, 0x00,  //................
+    0x07, 0xe0,  //.....%@@@@%+....
+    0x1f, 0xf8,  //...%@@@@@@@@@+..
+    0x3c, 0x1c,  //..%@@%....+%@@+.
+    0x70, 0x06,  //.%@@........+@@.
+    0x60, 0x03,  //.@@..........+@%
+    0xe3, 0x63,  //%@%...@@.@@...@@
+    0xc7, 0xe3,  //@@...%@@@@@...@@
+    0xc6, 0x63,  //@@...@@..@@..+@@
+    0xc6, 0x66,  //@@...@@..@@.+@@+
+    0xc7, 0xfc,  //@@...%@@@@@@@@+.
+    0xe3, 0x70,  //%@%...@@.@@%+...
+    0x60, 0x00,  //.@@.............
+    0x70, 0x00,  //.%@@............
+    0x3c, 0x30,  //..@@@+....+@....
+    0x1f, 0xf0,  //...%@@@@@@@@....
+    0x07, 0xc0,  //....+%@@@%+.....
+    0x00, 0x00,  //................
+
+
+    /*Unicode: U+0041 (A) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //....+@@+....
+    0x0f, 0x00,  //....@@@@....
+    0x0f, 0x00,  //....@@@@....
+    0x19, 0x80,  //...%@++@%...
+    0x19, 0x80,  //...@@..@@...
+    0x19, 0x80,  //..+@%..%@+..
+    0x30, 0xc0,  //..@@....@@..
+    0x3f, 0xc0,  //..@@@@@@@@..
+    0x7f, 0xe0,  //.%@@@@@@@@%.
+    0x60, 0x60,  //.@@......@@.
+    0x60, 0x60,  //+@%......%@+
+    0xc0, 0x30,  //@@+......+@@
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0042 (B) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0xfc, 0x00,  //@@@@@@+..
+    0xff, 0x00,  //@@@@@@@%.
+    0xc3, 0x00,  //@@...+@@.
+    0xc3, 0x00,  //@@....@@.
+    0xc3, 0x00,  //@@...+@%.
+    0xfe, 0x00,  //@@@@@@%..
+    0xfe, 0x00,  //@@@@@@@+.
+    0xc3, 0x00,  //@@....%@+
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc3, 0x80,  //@@....%@@
+    0xff, 0x00,  //@@@@@@@@+
+    0xfe, 0x00,  //@@@@@@%..
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0043 (C) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x0f, 0xc0,  //...+%@@@@%.
+    0x3f, 0xe0,  //..@@@@@@@@@
+    0x70, 0x20,  //.@@@+....+@
+    0x60, 0x00,  //+@@........
+    0xc0, 0x00,  //%@+........
+    0xc0, 0x00,  //@@.........
+    0xc0, 0x00,  //@@.........
+    0xc0, 0x00,  //@@.........
+    0xc0, 0x00,  //%@+........
+    0x60, 0x00,  //+@@........
+    0x70, 0x20,  //.@@@+....+@
+    0x3f, 0xe0,  //..@@@@@@@@@
+    0x0f, 0xc0,  //...+%@@@@%.
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+0044 (D) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0xfe, 0x00,  //@@@@@@%+...
+    0xff, 0x80,  //@@@@@@@@@..
+    0xc1, 0xc0,  //@@....+@@@.
+    0xc0, 0xc0,  //@@......@@+
+    0xc0, 0x60,  //@@......+@@
+    0xc0, 0x60,  //@@.......@@
+    0xc0, 0x60,  //@@.......@@
+    0xc0, 0x60,  //@@.......@@
+    0xc0, 0x60,  //@@......+@@
+    0xc0, 0xc0,  //@@......@@+
+    0xc1, 0xc0,  //@@....+@@@.
+    0xff, 0x80,  //@@@@@@@@@..
+    0xfe, 0x00,  //@@@@@@%+...
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+0045 (E) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0046 (F) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xfe,  //@@@@@@@.
+    0xfe,  //@@@@@@@.
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0047 (G) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x0f, 0xc0,  //...+%@@@@%.
+    0x3f, 0xe0,  //..@@@@@@@@@
+    0x70, 0x20,  //.@@@+....+@
+    0x60, 0x00,  //+@@........
+    0xc0, 0x00,  //%@+........
+    0xc3, 0xe0,  //@@....@@@@@
+    0xc3, 0xe0,  //@@....@@@@@
+    0xc0, 0x60,  //@@.......@@
+    0xc0, 0x60,  //@@+......@@
+    0x60, 0x60,  //+@@......@@
+    0x70, 0x60,  //.@@@+...+@@
+    0x3f, 0xc0,  //..@@@@@@@@+
+    0x0f, 0x80,  //...+@@@@%..
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+0048 (H) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xff, 0xc0,  //@@@@@@@@@@
+    0xff, 0xc0,  //@@@@@@@@@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+0049 (I) , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+
+
+    /*Unicode: U+004a (J) , Width: 4 */
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x70,  //.%@%
+    0xe0,  //@@@.
+    0xc0,  //@%..
+
+
+    /*Unicode: U+004b (K) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0xc1, 0x80,  //@@.....@@+.
+    0xc3, 0x00,  //@@....@@+..
+    0xc6, 0x00,  //@@...@@+...
+    0xcc, 0x00,  //@@..@@+....
+    0xd8, 0x00,  //@@.@@+.....
+    0xf0, 0x00,  //@@@@+......
+    0xf0, 0x00,  //@@@@.......
+    0xd8, 0x00,  //@@+@@......
+    0xcc, 0x00,  //@@.+@@.....
+    0xc6, 0x00,  //@@..+@@....
+    0xc3, 0x00,  //@@...+@@...
+    0xc1, 0x80,  //@@....+@@..
+    0xc0, 0xc0,  //@@.....+@@+
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+004c (L) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+004d (M) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0xe0, 0x70,  //@@@+....+@@@
+    0xf0, 0xf0,  //@@@%....%@@@
+    0xf0, 0xf0,  //@@%@....@%@@
+    0xd8, 0xb0,  //@@.@+..+@.@@
+    0xd9, 0xb0,  //@@.@@..@@.@@
+    0xd9, 0xb0,  //@@.%@..@+.@@
+    0xcf, 0x30,  //@@..@%%@..@@
+    0xcf, 0x30,  //@@..@@@@..@@
+    0xc6, 0x30,  //@@..+@@+..@@
+    0xc6, 0x30,  //@@...@@...@@
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //@@........@@
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+004e (N) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0xe0, 0xc0,  //@@%.....@@
+    0xe0, 0xc0,  //@@@.....@@
+    0xf0, 0xc0,  //@@@%....@@
+    0xf0, 0xc0,  //@@%@+...@@
+    0xd8, 0xc0,  //@@.@@...@@
+    0xd8, 0xc0,  //@@.%@+..@@
+    0xcc, 0xc0,  //@@..@@..@@
+    0xc6, 0xc0,  //@@..+@%.@@
+    0xc6, 0xc0,  //@@...@@.@@
+    0xc3, 0xc0,  //@@...+@@@@
+    0xc3, 0xc0,  //@@....%@@@
+    0xc1, 0xc0,  //@@.....@@@
+    0xc1, 0xc0,  //@@.....%@@
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+004f (O) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x0f, 0x80,  //...+@@@@+...
+    0x3f, 0xc0,  //..@@@@@@@@..
+    0x70, 0xe0,  //.@@@+..+@@@.
+    0x60, 0x60,  //+@@......@@+
+    0xc0, 0x30,  //%@+......+@%
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //%@+......+@%
+    0x60, 0x60,  //+@@......@@+
+    0x70, 0xe0,  //.@@@+..+@@@.
+    0x3f, 0xc0,  //..@@@@@@@@..
+    0x1f, 0x80,  //...+@@@@+...
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0050 (P) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xfc,  //@@@@@%+.
+    0xfe,  //@@@@@@@+
+    0xc7,  //@@...%@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc7,  //@@...%@@
+    0xfe,  //@@@@@@@+
+    0xfc,  //@@@@@@+.
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0051 (Q) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x0f, 0x80,  //...+@@@@%...
+    0x3f, 0xc0,  //..@@@@@@@@..
+    0x70, 0xe0,  //.@@@+..+@@@.
+    0x60, 0x60,  //+@@......@@+
+    0xc0, 0x30,  //%@+......+@@
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //@@........@@
+    0xc0, 0x30,  //%@+......+@%
+    0x60, 0x60,  //+@@......@@+
+    0x70, 0xe0,  //.@@@+..+@@%.
+    0x3f, 0xc0,  //..@@@@@@@%..
+    0x1f, 0x80,  //...%@@@@%...
+    0x01, 0x80,  //......+@@+..
+    0x00, 0xc0,  //.......+@@+.
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0052 (R) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0xfc, 0x00,  //@@@@@@+...
+    0xfe, 0x00,  //@@@@@@@+..
+    0xc7, 0x00,  //@@...%@@..
+    0xc3, 0x00,  //@@....@@..
+    0xc3, 0x00,  //@@....@@..
+    0xc7, 0x00,  //@@...%@%..
+    0xfe, 0x00,  //@@@@@@@...
+    0xfc, 0x00,  //@@@@@@+...
+    0xc6, 0x00,  //@@..+@@...
+    0xc3, 0x00,  //@@...+@@..
+    0xc3, 0x00,  //@@....@@+.
+    0xc1, 0x80,  //@@....+@@.
+    0xc1, 0xc0,  //@@.....%@%
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+0053 (S) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x3e, 0x00,  //..%@@@%..
+    0x7f, 0x00,  //+@@@@@@@.
+    0xe1, 0x00,  //@@%...+%.
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@+......
+    0x7c, 0x00,  //+@@@@%+..
+    0x3f, 0x00,  //..%@@@@@.
+    0x03, 0x80,  //.....+@@%
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+    0x83, 0x80,  //@+....%@@
+    0xff, 0x00,  //@@@@@@@@+
+    0x7e, 0x00,  //.%@@@@%..
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0054 (T) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0xff, 0xf0,  //@@@@@@@@@@@@
+    0xff, 0xf0,  //@@@@@@@@@@@@
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0055 (U) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@+....+@@
+    0x61, 0x80,  //+@@+..+@@+
+    0x7f, 0x80,  //.@@@@@@@@.
+    0x1e, 0x00,  //..+@@@@+..
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+0056 (V) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0xc0, 0x30,  //@@+......+@@
+    0x60, 0x60,  //+@%......%@+
+    0x60, 0x60,  //.@@......@@.
+    0x60, 0x60,  //.%@+....+@%.
+    0x30, 0xc0,  //..@@....@@..
+    0x30, 0xc0,  //..@@....@@..
+    0x19, 0x80,  //..+@%..%@+..
+    0x19, 0x80,  //...@@..@@...
+    0x19, 0x80,  //...%@++@%...
+    0x0f, 0x00,  //....@@@@+...
+    0x0f, 0x00,  //....@@@@....
+    0x06, 0x00,  //....+@@+....
+    0x06, 0x00,  //.....@@.....
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0057 (W) , Width: 17 */
+    0x00, 0x00, 0x00,  //.................
+    0x00, 0x00, 0x00,  //.................
+    0x00, 0x00, 0x00,  //.................
+    0xc1, 0xc1, 0x80,  //@@.....@@@.....@@
+    0xc1, 0xc1, 0x80,  //%@+...+@@@+...+@%
+    0x63, 0xe3, 0x00,  //+@%...%@%@%...%@+
+    0x63, 0x63, 0x00,  //.@@...@@.@@...@@.
+    0x63, 0x63, 0x00,  //.@@...@@.@@...@@.
+    0x63, 0x63, 0x00,  //.%@+.+@%.%@+.+@%.
+    0x36, 0x36, 0x00,  //.+@%.%@+.+@%.%@+.
+    0x36, 0x36, 0x00,  //..@@.@@...@@.@@..
+    0x36, 0x36, 0x00,  //..@@+@@...@@+@@..
+    0x3e, 0x3e, 0x00,  //..%@@@%...%@@@%..
+    0x1c, 0x1c, 0x00,  //..+@@@+...+@@@+..
+    0x1c, 0x1c, 0x00,  //...@@@.....@@@...
+    0x1c, 0x1c, 0x00,  //...@@@.....@@%...
+    0x00, 0x00, 0x00,  //.................
+    0x00, 0x00, 0x00,  //.................
+    0x00, 0x00, 0x00,  //.................
+    0x00, 0x00, 0x00,  //.................
+
+
+    /*Unicode: U+0058 (X) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x70, 0xe0,  //.%@%....%@%
+    0x30, 0xc0,  //..@@+..+@@.
+    0x39, 0x80,  //..%@@..@@+.
+    0x1b, 0x80,  //...@@+%@%..
+    0x0f, 0x00,  //...+@@@@...
+    0x0e, 0x00,  //....%@@+...
+    0x0e, 0x00,  //....%@@....
+    0x0f, 0x00,  //...+@@@@...
+    0x1b, 0x00,  //...@@+@@+..
+    0x39, 0x80,  //..%@%.+@@..
+    0x31, 0xc0,  //.+@@...@@%.
+    0x60, 0xc0,  //.@@+....@@.
+    0xe0, 0xe0,  //%@@.....%@%
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+0059 (Y) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0xe0, 0x70,  //%@@......@@%
+    0x60, 0x60,  //.@@+....+@@.
+    0x30, 0xc0,  //..@@....@@..
+    0x19, 0x80,  //..+@%..%@+..
+    0x19, 0x80,  //...%@++@%...
+    0x0f, 0x00,  //....@@@@....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //.....@@.....
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+005a (Z) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0x01, 0xc0,  //.......%@@.
+    0x03, 0x80,  //......%@@..
+    0x03, 0x00,  //.....+@@+..
+    0x07, 0x00,  //.....@@%...
+    0x0e, 0x00,  //....@@%....
+    0x1c, 0x00,  //...%@@.....
+    0x18, 0x00,  //..+@@......
+    0x30, 0x00,  //.+@@+......
+    0x70, 0x00,  //.@@%.......
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+005b ([) , Width: 4 */
+    0x00,  //....
+    0x00,  //....
+    0xf0,  //@@@@
+    0xf0,  //@@@@
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xc0,  //@@..
+    0xf0,  //@@@@
+    0xf0,  //@@@@
+    0x00,  //....
+    0x00,  //....
+
+
+    /*Unicode: U+005c (\) , Width: 6 */
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0xc0,  //@@....
+    0xc0,  //%@+...
+    0x60,  //+@%...
+    0x60,  //.@@...
+    0x60,  //.@@+..
+    0x70,  //.%@%..
+    0x30,  //.+@@..
+    0x30,  //..@@..
+    0x30,  //..@@+.
+    0x38,  //..+@%.
+    0x18,  //...@@.
+    0x18,  //...@@.
+    0x18,  //...%@+
+    0x0c,  //...+@%
+    0x0c,  //....@@
+    0x00,  //......
+    0x00,  //......
+
+
+    /*Unicode: U+005d (]) , Width: 4 */
+    0x00,  //....
+    0x00,  //....
+    0xf0,  //@@@@
+    0xf0,  //@@@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0xf0,  //@@@@
+    0xf0,  //@@@@
+    0x00,  //....
+    0x00,  //....
+
+
+    /*Unicode: U+005e (^) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x0e, 0x00,  //....@@@....
+    0x1f, 0x00,  //...%@%@%...
+    0x31, 0x80,  //..%@+.+@%..
+    0x60, 0xc0,  //.%@+...+@%.
+    0xc0, 0x60,  //%@+.....+@%
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+
+
+    /*Unicode: U+005f (_) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0xff, 0x80,  //@@@@@@@@@
+    0xff, 0x80,  //@@@@@@@@@
+
+
+    /*Unicode: U+0060 (`) , Width: 4 */
+    0x00,  //....
+    0x00,  //....
+    0xc0,  //%@..
+    0x60,  //.%@.
+    0x30,  //..%%
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+    0x00,  //....
+
+
+    /*Unicode: U+0061 (a) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x3c,  //.+%@@@+.
+    0x7e,  //.@@@@@@.
+    0x47,  //.%...%@%
+    0x03,  //......@@
+    0x3f,  //.+@@@@@@
+    0xff,  //%@@@@@@@
+    0xc3,  //@@+...@@
+    0xc7,  //@@+..%@@
+    0xff,  //%@@@@%@@
+    0x7b,  //.%@@%.@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0062 (b) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xde, 0x00,  //@@.%@@%..
+    0xff, 0x00,  //@@%@@@@@.
+    0xe3, 0x80,  //@@@...@@%
+    0xc1, 0x80,  //@@+...+@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@+...+@@
+    0xe3, 0x80,  //@@@...@@%
+    0xff, 0x00,  //@@%@@@@@.
+    0xde, 0x00,  //@@.%@@%..
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0063 (c) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x1e,  //..+@@@%+
+    0x7f,  //.%@@@@@@
+    0x61,  //+@@+...%
+    0xc0,  //@@+.....
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@+.....
+    0x61,  //+@@+...%
+    0x7f,  //.%@@@@@@
+    0x1e,  //..+@@@%+
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0064 (d) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+    0x3d, 0x80,  //..%@@%.@@
+    0x7f, 0x80,  //.@@@@@%@@
+    0xe3, 0x80,  //%@@...@@@
+    0xc1, 0x80,  //@@+...+@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@+...+@@
+    0xe3, 0x80,  //%@@...@@@
+    0x7f, 0x80,  //.@@@@@%@@
+    0x3d, 0x80,  //..%@@%.@@
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+0065 (e) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x1f, 0x00,  //..+%@@@%..
+    0x7f, 0x80,  //.%@@@@@@@.
+    0x61, 0xc0,  //+@@+...@@%
+    0xc0, 0xc0,  //@@......@@
+    0xff, 0xc0,  //@@@@@@@@@@
+    0xff, 0xc0,  //@@@@@@@@@@
+    0xc0, 0x00,  //@@........
+    0x60, 0x40,  //+@@+....+@
+    0x7f, 0xc0,  //.%@@@@@@@@
+    0x1f, 0x80,  //..+%@@@@%.
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+0066 (f) , Width: 7 */
+    0x00,  //.......
+    0x00,  //.......
+    0x1e,  //...%@@@
+    0x3e,  //..%@@@@
+    0x30,  //..@@+..
+    0x30,  //..@@...
+    0xfe,  //@@@@@@@
+    0xfe,  //@@@@@@@
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x30,  //..@@...
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+
+
+    /*Unicode: U+0067 (g) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x3d, 0x80,  //..%@@%.@@
+    0x7f, 0x80,  //.@@@@@%@@
+    0xe3, 0x80,  //%@@...@@@
+    0xc1, 0x80,  //@@+...+@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@+...+@@
+    0xe3, 0x80,  //%@@...@@@
+    0x7f, 0x80,  //.@@@@@%@@
+    0x3d, 0x80,  //..%@@%.@@
+    0x01, 0x80,  //......+@%
+    0x43, 0x00,  //.%...+@@+
+    0x7f, 0x00,  //.@@@@@@@.
+    0x3e, 0x00,  //.+%@@@%..
+
+
+    /*Unicode: U+0068 (h) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xc0,  //@@......
+    0xde,  //@@.%@@%.
+    0xfe,  //@@%@@@@+
+    0xe7,  //@@@..%@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0069 (i) , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+
+
+    /*Unicode: U+006a (j) , Width: 4 */
+    0x00,  //....
+    0x00,  //....
+    0x30,  //..@@
+    0x30,  //..@@
+    0x00,  //....
+    0x00,  //....
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //..@@
+    0x30,  //.+@@
+    0xe0,  //@@@+
+    0xc0,  //@@+.
+
+
+    /*Unicode: U+006b (k) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xc3, 0x00,  //@@....@@+
+    0xc6, 0x00,  //@@..+@@+.
+    0xcc, 0x00,  //@@.+@@+..
+    0xd8, 0x00,  //@@+@@+...
+    0xf0, 0x00,  //@@@@.....
+    0xf0, 0x00,  //@@@@+....
+    0xd8, 0x00,  //@@+@@+...
+    0xcc, 0x00,  //@@.+@@+..
+    0xc6, 0x00,  //@@..+@@+.
+    0xc3, 0x00,  //@@...+@@+
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+
+
+    /*Unicode: U+006c (l) , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+    0x00,  //..
+
+
+    /*Unicode: U+006d (m) , Width: 14 */
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+    0xdc, 0x78,  //@@.%@@+..%@@%.
+    0xfe, 0xf8,  //@@%@@@@+@@@@@+
+    0xe7, 0x9c,  //@@@..%@@@..%@@
+    0xc3, 0x0c,  //@@....@@....@@
+    0xc3, 0x0c,  //@@....@@....@@
+    0xc3, 0x0c,  //@@....@@....@@
+    0xc3, 0x0c,  //@@....@@....@@
+    0xc3, 0x0c,  //@@....@@....@@
+    0xc3, 0x0c,  //@@....@@....@@
+    0xc3, 0x0c,  //@@....@@....@@
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+    0x00, 0x00,  //..............
+
+
+    /*Unicode: U+006e (n) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xde,  //@@.%@@%.
+    0xfe,  //@@%@@@@+
+    0xe7,  //@@@..%@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+006f (o) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x1e, 0x00,  //..+@@@@+..
+    0x7f, 0x80,  //.%@@@@@@%.
+    0x61, 0x80,  //+@@+..+@@+
+    0xc0, 0xc0,  //@@+....+@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@......@@
+    0xc0, 0xc0,  //@@+....+@@
+    0x61, 0x80,  //+@@+..+@@+
+    0x7f, 0x80,  //.%@@@@@@%.
+    0x1e, 0x00,  //..+@@@@+..
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+0070 (p) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0xde, 0x00,  //@@.%@@%..
+    0xff, 0x00,  //@@%@@@@@.
+    0xe3, 0x80,  //@@@...@@%
+    0xc1, 0x80,  //@@+...+@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@+...+@@
+    0xe3, 0x80,  //@@@...@@%
+    0xff, 0x00,  //@@%@@@@@.
+    0xde, 0x00,  //@@.%@@%..
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+    0xc0, 0x00,  //@@.......
+
+
+    /*Unicode: U+0071 (q) , Width: 9 */
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x00, 0x00,  //.........
+    0x3d, 0x80,  //..%@@%.@@
+    0x7f, 0x80,  //.@@@@@%@@
+    0xe3, 0x80,  //%@@...@@@
+    0xc1, 0x80,  //@@+...+@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@.....@@
+    0xc1, 0x80,  //@@+...+@@
+    0xe3, 0x80,  //%@@...@@@
+    0x7f, 0x80,  //.@@@@@%@@
+    0x3d, 0x80,  //..%@@%.@@
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+    0x01, 0x80,  //.......@@
+
+
+    /*Unicode: U+0072 (r) , Width: 6 */
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0xdc,  //@@.%@@
+    0xfc,  //@@%@@@
+    0xe0,  //@@@+..
+    0xc0,  //@@+...
+    0xc0,  //@@....
+    0xc0,  //@@....
+    0xc0,  //@@....
+    0xc0,  //@@....
+    0xc0,  //@@....
+    0xc0,  //@@....
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+
+
+    /*Unicode: U+0073 (s) , Width: 7 */
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x7c,  //.+@@@%+
+    0xfe,  //%@@@@@@
+    0xc2,  //@@+...%
+    0xe0,  //@@%+...
+    0x7c,  //+@@@@@.
+    0x1e,  //..+%@@%
+    0x06,  //.....@@
+    0x86,  //%+..+@@
+    0xfe,  //@@@@@@%
+    0x78,  //.%@@@+.
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+    0x00,  //.......
+
+
+    /*Unicode: U+0074 (t) , Width: 6 */
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x60,  //.@@...
+    0x60,  //.@@...
+    0x60,  //.@@...
+    0xfc,  //@@@@@@
+    0xfc,  //@@@@@@
+    0x60,  //.@@...
+    0x60,  //.@@...
+    0x60,  //.@@...
+    0x60,  //.@@...
+    0x60,  //.@@...
+    0x60,  //.@@+..
+    0x7c,  //.%@@@@
+    0x3c,  //..%@@@
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+    0x00,  //......
+
+
+    /*Unicode: U+0075 (u) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xc3,  //@@....@@
+    0xe7,  //@@%..@@@
+    0x7f,  //+@@@@%@@
+    0x7b,  //.%@@%.@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+0076 (v) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x60, 0x60,  //.@@......@@.
+    0x60, 0x60,  //.%@+....+@%.
+    0x30, 0xc0,  //..@@....@@..
+    0x30, 0xc0,  //..@@....@@..
+    0x19, 0x80,  //..+@%..%@+..
+    0x19, 0x80,  //...@@..@@...
+    0x19, 0x80,  //...%@.+@%...
+    0x0f, 0x00,  //...+@%@@....
+    0x0f, 0x00,  //....@@@@....
+    0x06, 0x00,  //....+@@+....
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+
+
+    /*Unicode: U+0077 (w) , Width: 15 */
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x63, 0x8c,  //.@@...@@@...@@.
+    0x63, 0x8c,  //.@@...@@@...@@.
+    0x63, 0x8c,  //.%@+.+@@@+.+@%.
+    0x36, 0xd8,  //.+@%.%@+@%.%@+.
+    0x36, 0xd8,  //..@@.@@.@@.@@..
+    0x36, 0xd8,  //..@@.@%.%@.@@..
+    0x3c, 0x78,  //..%@%@+.+@%@%..
+    0x1c, 0x70,  //..+@@@...@@@+..
+    0x1c, 0x70,  //...@@@...@@@...
+    0x1c, 0x70,  //...@@%...%@@...
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+    0x00, 0x00,  //...............
+
+
+    /*Unicode: U+0078 (x) , Width: 10 */
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0xe1, 0xc0,  //%@@....@@%
+    0x61, 0x80,  //.@@+..+@@.
+    0x33, 0x00,  //.+@@..@@..
+    0x33, 0x00,  //..%@++@%..
+    0x1e, 0x00,  //...@@@@...
+    0x1e, 0x00,  //...@@@@...
+    0x33, 0x00,  //..%@++@%..
+    0x33, 0x00,  //.+@@..@@+.
+    0x61, 0x80,  //.@@+..+@@.
+    0xe1, 0xc0,  //%@@....@@%
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+    0x00, 0x00,  //..........
+
+
+    /*Unicode: U+0079 (y) , Width: 12 */
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x00, 0x00,  //............
+    0x60, 0x60,  //.@@......@@.
+    0x60, 0x60,  //.%@+....+@%.
+    0x30, 0xc0,  //..@@....@@..
+    0x30, 0xc0,  //..%@+..+@@..
+    0x19, 0x80,  //...@@..@@+..
+    0x19, 0x80,  //...@@+.@@...
+    0x0f, 0x00,  //...+@%%@+...
+    0x0f, 0x00,  //....@@@@....
+    0x06, 0x00,  //....+@@+....
+    0x06, 0x00,  //.....@@.....
+    0x06, 0x00,  //....+@%.....
+    0x0c, 0x00,  //....%@......
+    0x3c, 0x00,  //..@@@%......
+    0x38, 0x00,  //..@@%.......
+
+
+    /*Unicode: U+007a (z) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0x06,  //....+@@.
+    0x0c,  //....@@+.
+    0x1c,  //...@@@..
+    0x38,  //..%@@...
+    0x30,  //.+@@+...
+    0x70,  //.@@%....
+    0xff,  //@@@@@@@@
+    0xff,  //@@@@@@@@
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+    0x00,  //........
+
+
+    /*Unicode: U+007b ({) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0x0f,  //....%@@@
+    0x1f,  //...%@@@@
+    0x18,  //...@@+..
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x38,  //..%@@...
+    0xf0,  //@@@@....
+    0xf0,  //@@@@....
+    0x38,  //..%@%...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@+..
+    0x1f,  //...%@@@@
+    0x0f,  //....%@@@
+    0x00,  //........
+
+
+    /*Unicode: U+007c (|) , Width: 2 */
+    0x00,  //..
+    0x00,  //..
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+    0xc0,  //@@
+
+
+    /*Unicode: U+007d (}) , Width: 8 */
+    0x00,  //........
+    0x00,  //........
+    0xf0,  //@@@%....
+    0xf8,  //@@@@%...
+    0x18,  //..+@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x1c,  //...@@%..
+    0x0f,  //....@@@@
+    0x0f,  //....@@@@
+    0x1c,  //...%@%..
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //...@@...
+    0x18,  //..+@@...
+    0xf8,  //@@@@%...
+    0xf0,  //@@@%....
+    0x00,  //........
+
+
+    /*Unicode: U+007e (~) , Width: 11 */
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x7c, 0x20,  //.%@@@%...+@
+    0xff, 0xe0,  //@@@@@@@@@@@
+    0x87, 0xc0,  //@+...%@@@%.
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+    0x00, 0x00,  //...........
+};
+
+typedef struct
+{
+    uint32_t w_px         :8;
+    uint32_t glyph_index  :24;
+} lcd_console_font_glyph_dsc_t;
+
+/*Store the glyph descriptions*/
+static const lcd_console_font_glyph_dsc_t lcd_console_font_dejavu_20_glyph_dsc[] = {
+    {.w_px = 6,   .glyph_index = 0},  /*Unicode: U+0020 ( )*/
+    {.w_px = 2,   .glyph_index = 20}, /*Unicode: U+0021 (!)*/
+    {.w_px = 6,   .glyph_index = 40}, /*Unicode: U+0022 (")*/
+    {.w_px = 12,  .glyph_index = 60}, /*Unicode: U+0023 (#)*/
+    {.w_px = 9,   .glyph_index = 100},    /*Unicode: U+0024 ($)*/
+    {.w_px = 15,  .glyph_index = 140},    /*Unicode: U+0025 (%)*/
+    {.w_px = 12,  .glyph_index = 180},    /*Unicode: U+0026 (&)*/
+    {.w_px = 2,   .glyph_index = 220},    /*Unicode: U+0027 (')*/
+    {.w_px = 4,   .glyph_index = 240},    /*Unicode: U+0028 (()*/
+    {.w_px = 4,   .glyph_index = 260},    /*Unicode: U+0029 ())*/
+    {.w_px = 7,   .glyph_index = 280},    /*Unicode: U+002a (*)*/
+    {.w_px = 12,  .glyph_index = 300},    /*Unicode: U+002b (+)*/
+    {.w_px = 3,   .glyph_index = 340},    /*Unicode: U+002c (,)*/
+    {.w_px = 5,   .glyph_index = 360},    /*Unicode: U+002d (-)*/
+    {.w_px = 2,   .glyph_index = 380},    /*Unicode: U+002e (.)*/
+    {.w_px = 6,   .glyph_index = 400},    /*Unicode: U+002f (/)*/
+    {.w_px = 9,   .glyph_index = 420},    /*Unicode: U+0030 (0)*/
+    {.w_px = 8,   .glyph_index = 460},    /*Unicode: U+0031 (1)*/
+    {.w_px = 9,   .glyph_index = 480},    /*Unicode: U+0032 (2)*/
+    {.w_px = 9,   .glyph_index = 520},    /*Unicode: U+0033 (3)*/
+    {.w_px = 10,  .glyph_index = 560},    /*Unicode: U+0034 (4)*/
+    {.w_px = 8,   .glyph_index = 600},    /*Unicode: U+0035 (5)*/
+    {.w_px = 9,   .glyph_index = 620},    /*Unicode: U+0036 (6)*/
+    {.w_px = 8,   .glyph_index = 660},    /*Unicode: U+0037 (7)*/
+    {.w_px = 9,   .glyph_index = 680},    /*Unicode: U+0038 (8)*/
+    {.w_px = 9,   .glyph_index = 720},    /*Unicode: U+0039 (9)*/
+    {.w_px = 2,   .glyph_index = 760},    /*Unicode: U+003a (:)*/
+    {.w_px = 3,   .glyph_index = 780},    /*Unicode: U+003b (;)*/
+    {.w_px = 11,  .glyph_index = 800},    /*Unicode: U+003c (<)*/
+    {.w_px = 11,  .glyph_index = 840},    /*Unicode: U+003d (=)*/
+    {.w_px = 11,  .glyph_index = 880},    /*Unicode: U+003e (>)*/
+    {.w_px = 7,   .glyph_index = 920},    /*Unicode: U+003f (?)*/
+    {.w_px = 16,  .glyph_index = 940},    /*Unicode: U+0040 (@)*/
+    {.w_px = 12,  .glyph_index = 980},    /*Unicode: U+0041 (A)*/
+    {.w_px = 9,   .glyph_index = 1020},   /*Unicode: U+0042 (B)*/
+    {.w_px = 11,  .glyph_index = 1060},   /*Unicode: U+0043 (C)*/
+    {.w_px = 11,  .glyph_index = 1100},   /*Unicode: U+0044 (D)*/
+    {.w_px = 8,   .glyph_index = 1140},   /*Unicode: U+0045 (E)*/
+    {.w_px = 8,   .glyph_index = 1160},   /*Unicode: U+0046 (F)*/
+    {.w_px = 11,  .glyph_index = 1180},   /*Unicode: U+0047 (G)*/
+    {.w_px = 10,  .glyph_index = 1220},   /*Unicode: U+0048 (H)*/
+    {.w_px = 2,   .glyph_index = 1260},   /*Unicode: U+0049 (I)*/
+    {.w_px = 4,   .glyph_index = 1280},   /*Unicode: U+004a (J)*/
+    {.w_px = 11,  .glyph_index = 1300},   /*Unicode: U+004b (K)*/
+    {.w_px = 8,   .glyph_index = 1340},   /*Unicode: U+004c (L)*/
+    {.w_px = 12,  .glyph_index = 1360},   /*Unicode: U+004d (M)*/
+    {.w_px = 10,  .glyph_index = 1400},   /*Unicode: U+004e (N)*/
+    {.w_px = 12,  .glyph_index = 1440},   /*Unicode: U+004f (O)*/
+    {.w_px = 8,   .glyph_index = 1480},   /*Unicode: U+0050 (P)*/
+    {.w_px = 12,  .glyph_index = 1500},   /*Unicode: U+0051 (Q)*/
+    {.w_px = 10,  .glyph_index = 1540},   /*Unicode: U+0052 (R)*/
+    {.w_px = 9,   .glyph_index = 1580},   /*Unicode: U+0053 (S)*/
+    {.w_px = 12,  .glyph_index = 1620},   /*Unicode: U+0054 (T)*/
+    {.w_px = 10,  .glyph_index = 1660},   /*Unicode: U+0055 (U)*/
+    {.w_px = 12,  .glyph_index = 1700},   /*Unicode: U+0056 (V)*/
+    {.w_px = 17,  .glyph_index = 1740},   /*Unicode: U+0057 (W)*/
+    {.w_px = 11,  .glyph_index = 1800},   /*Unicode: U+0058 (X)*/
+    {.w_px = 12,  .glyph_index = 1840},   /*Unicode: U+0059 (Y)*/
+    {.w_px = 11,  .glyph_index = 1880},   /*Unicode: U+005a (Z)*/
+    {.w_px = 4,   .glyph_index = 1920},   /*Unicode: U+005b ([)*/
+    {.w_px = 6,   .glyph_index = 1940},   /*Unicode: U+005c (\)*/
+    {.w_px = 4,   .glyph_index = 1960},   /*Unicode: U+005d (])*/
+    {.w_px = 11,  .glyph_index = 1980},   /*Unicode: U+005e (^)*/
+    {.w_px = 9,   .glyph_index = 2020},   /*Unicode: U+005f (_)*/
+    {.w_px = 4,   .glyph_index = 2060},   /*Unicode: U+0060 (`)*/
+    {.w_px = 8,   .glyph_index = 2080},   /*Unicode: U+0061 (a)*/
+    {.w_px = 9,   .glyph_index = 2100},   /*Unicode: U+0062 (b)*/
+    {.w_px = 8,   .glyph_index = 2140},   /*Unicode: U+0063 (c)*/
+    {.w_px = 9,   .glyph_index = 2160},   /*Unicode: U+0064 (d)*/
+    {.w_px = 10,  .glyph_index = 2200},   /*Unicode: U+0065 (e)*/
+    {.w_px = 7,   .glyph_index = 2240},   /*Unicode: U+0066 (f)*/
+    {.w_px = 9,   .glyph_index = 2260},   /*Unicode: U+0067 (g)*/
+    {.w_px = 8,   .glyph_index = 2300},   /*Unicode: U+0068 (h)*/
+    {.w_px = 2,   .glyph_index = 2320},   /*Unicode: U+0069 (i)*/
+    {.w_px = 4,   .glyph_index = 2340},   /*Unicode: U+006a (j)*/
+    {.w_px = 9,   .glyph_index = 2360},   /*Unicode: U+006b (k)*/
+    {.w_px = 2,   .glyph_index = 2400},   /*Unicode: U+006c (l)*/
+    {.w_px = 14,  .glyph_index = 2420},   /*Unicode: U+006d (m)*/
+    {.w_px = 8,   .glyph_index = 2460},   /*Unicode: U+006e (n)*/
+    {.w_px = 10,  .glyph_index = 2480},   /*Unicode: U+006f (o)*/
+    {.w_px = 9,   .glyph_index = 2520},   /*Unicode: U+0070 (p)*/
+    {.w_px = 9,   .glyph_index = 2560},   /*Unicode: U+0071 (q)*/
+    {.w_px = 6,   .glyph_index = 2600},   /*Unicode: U+0072 (r)*/
+    {.w_px = 7,   .glyph_index = 2620},   /*Unicode: U+0073 (s)*/
+    {.w_px = 6,   .glyph_index = 2640},   /*Unicode: U+0074 (t)*/
+    {.w_px = 8,   .glyph_index = 2660},   /*Unicode: U+0075 (u)*/
+    {.w_px = 12,  .glyph_index = 2680},   /*Unicode: U+0076 (v)*/
+    {.w_px = 15,  .glyph_index = 2720},   /*Unicode: U+0077 (w)*/
+    {.w_px = 10,  .glyph_index = 2760},   /*Unicode: U+0078 (x)*/
+    {.w_px = 12,  .glyph_index = 2800},   /*Unicode: U+0079 (y)*/
+    {.w_px = 8,   .glyph_index = 2840},   /*Unicode: U+007a (z)*/
+    {.w_px = 8,   .glyph_index = 2860},   /*Unicode: U+007b ({)*/
+    {.w_px = 2,   .glyph_index = 2880},   /*Unicode: U+007c (|)*/
+    {.w_px = 8,   .glyph_index = 2900},   /*Unicode: U+007d (})*/
+    {.w_px = 11,  .glyph_index = 2920},   /*Unicode: U+007e (~)*/
+};

+ 18 - 0
bsp/raspberry-pi/raspi4-32/driver/mbox.c

@@ -49,6 +49,24 @@ int mbox_call(unsigned char ch, int mmu_enable)
     return 0;
 }
 
+int bcm271x_mbox_get_touch(void)
+{
+    mbox[0] = 8*4;                      // length of the message
+    mbox[1] = MBOX_REQUEST;             // this is a request message
+    
+    mbox[2] = MBOX_TAG_GET_TOUCHBUF; 
+    mbox[3] = 4;                        // buffer size
+    mbox[4] = 0;                        // len
+
+    mbox[5] = 0;                       // id
+    mbox[6] = 0;
+
+    mbox[7] = MBOX_TAG_LAST;
+    mbox_call(8, MMU_DISABLE);
+
+    return (int)(mbox[5] &  ~0xC0000000);
+}
+
 int bcm271x_notify_reboot(void)
 {
     mbox[0] = 7*4;                          // length of the message

+ 18 - 0
bsp/raspberry-pi/raspi4-32/driver/mbox.h

@@ -132,9 +132,27 @@ enum {
 #define MBOX_TAG_NOTIFY_REBOOT         0x00030048
 #define MBOX_TAG_NOTIFY_XHCI_RESET     0x00030058
 
+/*
+* touch
+*/
+#define MBOX_TAG_GET_TOUCHBUF          (0x0004000F)
+
 #define MBOX_ADDR 0x08000000
 
+#define    RES_CLK_ID           (0x000000000)
+#define    EMMC_CLK_ID          (0x000000001)
+#define    UART_CLK_ID          (0x000000002)
+#define    ARM_CLK_ID           (0x000000003)
+#define    CORE_CLK_ID          (0x000000004)
+#define    V3D_CLK_ID           (0x000000005)
+#define    H264_CLK_ID          (0x000000006)
+#define    ISP_CLK_ID           (0x000000007)
+#define    SDRAM_CLK_ID         (0x000000008)
+#define    PIXEL_CLK_ID         (0x000000009)
+#define    PWM_CLK_ID           (0x00000000a)
+
 int mbox_call(unsigned char ch, int mmu_enable);
+int bcm271x_mbox_get_touch(void);
 int bcm271x_notify_reboot(void);
 int bcm271x_notify_xhci_reset(void);
 int bcm271x_gpu_enable(void);

+ 20 - 1
bsp/raspberry-pi/raspi4-32/driver/raspi4.h

@@ -150,7 +150,26 @@ typedef enum {
 
 //External Mass Media Controller (SD Card)
 #define MMC0_BASE_ADDR		(PER_BASE+0x300000)   
-#define MMC2_BASE_ADDR		(PER_BASE+0x340000)  
+#define MMC2_BASE_ADDR		(PER_BASE+0x340000)
+
+#define ETH_IRQ                 (160+29)
+
+//I2C
+#define BSC0_BASE_OFFSET            (0x205000)
+#define BSC1_BASE_OFFSET            (0x804000)
+#define BSC3_BASE_OFFSET            (0x205600)
+#define BSC4_BASE_OFFSET            (0x205800)
+#define BSC5_BASE_OFFSET            (0x205A80)
+#define BSC6_BASE_OFFSET            (0x205C00)
+
+//BSC2 and BSC7 masters are dedicated for use by the 
+//HDMI interfaces and should not be accessed byuser programs.
+#define BSC0_BASE                   (PER_BASE + BSC0_BASE_OFFSET)
+#define BSC1_BASE                   (PER_BASE + BSC1_BASE_OFFSET)
+#define BSC3_BASE                   (PER_BASE + BSC3_BASE_OFFSET)
+#define BSC4_BASE                   (PER_BASE + BSC4_BASE_OFFSET)
+#define BSC5_BASE                   (PER_BASE + BSC5_BASE_OFFSET)
+#define BSC6_BASE                   (PER_BASE + BSC6_BASE_OFFSET)
 
 /* the basic constants and interfaces needed by gic */
 rt_inline rt_uint32_t platform_get_gic_dist_base(void)

+ 16 - 0
bsp/raspberry-pi/raspi4-32/driver/touch/Sconscript

@@ -0,0 +1,16 @@
+# RT-Thread building script for component
+
+from building import *
+
+cwd = GetCurrentDir()
+src = Glob('*.c') + Glob('*.cpp')
+CPPPATH = [cwd]
+
+if not GetDepend('BSP_USING_XPT_TOUCH_DEV'):
+    SrcRemove(src, ['drv_xpt2046.c'])
+if not GetDepend('BSP_USING_DSI_TOUCH_DEV'):
+    SrcRemove(src, ['drv_dsi_touch.c'])
+
+group = DefineGroup('drv_touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH)
+
+Return('group')

+ 132 - 0
bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.c

@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-26     bigmagic       first version
+ */
+#include <rtthread.h>
+#include <rtdevice.h>
+#include <touch.h>
+
+#include "mbox.h"
+#include "drv_dsi_touch.h"
+
+#define DBG_TAG "dsi_touch"
+#define DBG_LVL DBG_INFO
+#include <rtdbg.h>
+
+static rt_touch_t touch_device = RT_NULL;
+static struct rt_semaphore dsi_touch_ack;
+
+static rt_uint32_t touch_x;
+static rt_uint32_t touch_y;
+static rt_uint32_t touch_state;
+
+static rt_thread_t dsi_touch_tid = RT_NULL;
+#define DSI_TOUCH_THREAD_STACK_SIZE     (4096)
+#define DSI_TOUCH_THREAD_PRIORITY       (25)
+#define DSI_TOUCH_THREAD_TIMESLICE      (10)
+
+#define MAXIMUM_SUPPORTED_POINTS        (10)
+
+struct touch_regs
+{
+    uint8_t device_mode;
+    uint8_t gesture_id;
+    uint8_t num_points;
+    struct touch
+    {
+        uint8_t xh;
+        uint8_t xl;
+        uint8_t yh;
+        uint8_t yl;
+        uint8_t res1;
+        uint8_t res2;
+    } point[MAXIMUM_SUPPORTED_POINTS];
+};
+
+static void dsi_touch_thread_entry(void *param)
+{
+    static volatile uint32_t touchbuf;
+    touchbuf = bcm271x_mbox_get_touch(); //0x0f436000
+
+    if(touchbuf == RT_NULL)
+    {
+        rt_kprintf("init dsi touch err!\n");
+        return;
+    }
+    
+    while (1)
+    {
+        struct touch_regs *regs = (struct touch_regs *)touchbuf;
+        if ((regs->num_points > 0) && (regs->num_points < MAXIMUM_SUPPORTED_POINTS))
+        {
+            //only one touch point
+            touch_x = (((int)regs->point[0].xh & 0xf) << 8) + regs->point[0].xl;
+            touch_y = (((int)regs->point[0].yh & 0xf) << 8) + regs->point[0].yl;
+            touch_state = 1;
+        }
+        else
+        {
+            touch_state = 0;
+        }
+        rt_thread_mdelay(50); 
+    }
+}
+
+static rt_size_t dsi_read_point(struct rt_touch_device *touch, void *buf, rt_size_t read_num)
+{
+    rt_uint16_t* touchxy = (rt_uint16_t *)buf;
+    if((read_num != 0) && (touch_state == 1))
+    {
+        touchxy[0] = touch_x;
+        touchxy[1] = touch_y;
+        touch_state = 0;
+        return read_num;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+static rt_err_t dsi_control(struct rt_touch_device *device, int cmd, void *data)
+{
+    return RT_EOK;
+}
+
+static struct rt_touch_ops dsi_touch_ops =
+{
+    .touch_readpoint = dsi_read_point,
+    .touch_control = dsi_control,
+};
+
+static int hw_dsi_touch_init(void)
+{
+    //touch sem
+    rt_sem_init(&dsi_touch_ack, "dsi_touch_ack", 0, RT_IPC_FLAG_FIFO);
+
+    dsi_touch_tid = rt_thread_create("dsi_touch",
+                            dsi_touch_thread_entry, RT_NULL,
+                            DSI_TOUCH_THREAD_STACK_SIZE,
+                            DSI_TOUCH_THREAD_PRIORITY, DSI_TOUCH_THREAD_TIMESLICE);
+    if (dsi_touch_tid != RT_NULL)
+        rt_thread_startup(dsi_touch_tid);
+
+    touch_device = (rt_touch_t)rt_calloc(1, sizeof(struct rt_touch_device));
+
+    if (touch_device == RT_NULL)
+        return -RT_ERROR;
+
+    /* register touch device */
+    touch_device->info.type = RT_TOUCH_TYPE_RESISTANCE;
+    touch_device->info.vendor = RT_TOUCH_VENDOR_UNKNOWN;
+    //rt_memcpy(&touch_device->config, cfg, sizeof(struct rt_touch_config));
+    touch_device->ops = &dsi_touch_ops;
+    rt_hw_touch_register(touch_device, "dsi_touch", RT_DEVICE_FLAG_INT_RX, RT_NULL);
+    return 0;
+}
+INIT_DEVICE_EXPORT(hw_dsi_touch_init);

+ 13 - 0
bsp/raspberry-pi/raspi4-32/driver/touch/drv_dsi_touch.h

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-26     bigmagic       first version
+ */
+#ifndef __DRV_DSI_TOUCH_H__
+#define __DRV_DSI_TOUCH_H__
+
+#endif//DSI TOUCH

+ 252 - 0
bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.c

@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-08     bigmagic       first version
+ */
+
+#include <rtthread.h>
+#include <rtdevice.h>
+#include <touch.h>
+
+#include "drv_xpt2046.h"
+//http://www.lcdwiki.com/MHS-3.5inch_RPi_Display
+
+#define DBG_TAG "xpt2046"
+#define DBG_LVL DBG_INFO
+#include <rtdbg.h>
+
+//XPT2049
+#define     READ_X                (0xD0)
+#define     READ_Y                (0x90)
+
+#define     TFT_WIDTH             (320)
+#define     TFT_HEIGHT            (480)
+//freq
+#define     TOUCH_SPI_MAX_FREQ    (10*1000)
+
+#define     TP_IRQ_PIN            (17)
+#define     TOUCH_DEVICE_NAME     ("spi0.1")
+
+static struct rt_semaphore touch_ack;
+static rt_touch_t touch_device = RT_NULL;
+
+static rt_thread_t touch_tid = RT_NULL;
+#define TOUCH_THREAD_STACK_SIZE     (1024)
+#define TOUCH_THREAD_PRIORITY       (30)
+#define TOUCH_THREAD_TIMESLICE      (10)
+
+rt_uint8_t touch_flag = 0;
+rt_uint16_t touch_x_val = 0;
+rt_uint16_t touch_y_val = 0;
+
+extern struct rt_semaphore lcd_spi_lock;
+static void touch_read_x_y(void *dev, rt_uint16_t *x, rt_uint16_t *y)
+{
+    struct rt_spi_device *touch_dev = (struct rt_spi_device *)dev;
+    struct rt_spi_message msg1,msg2,msg3,msg4;
+    rt_uint16_t readx_val = 0,ready_val = 0;
+    rt_uint8_t readx[2];
+    rt_uint8_t ready[2];
+    rt_sem_take(&lcd_spi_lock, RT_WAITING_FOREVER);
+
+    int read_x_id = READ_X;
+    int read_y_id = READ_Y;
+
+    msg1.send_buf   = &read_x_id;
+    msg1.recv_buf   = RT_NULL;
+    msg1.length     = 1;
+    msg1.cs_take    = 1;
+    msg1.cs_release = 0;
+    msg1.next       = &msg2;
+
+    msg2.send_buf   = RT_NULL;
+    msg2.recv_buf   = &readx[0];
+    msg2.length     = 2;
+    msg2.cs_take    = 0;
+    msg2.cs_release = 0;
+    msg2.next       = &msg3;
+
+    msg3.send_buf   = &read_y_id;
+    msg3.recv_buf   = RT_NULL;
+    msg3.length     = 1;
+    msg3.cs_take    = 0;
+    msg3.cs_release = 0;
+    msg3.next       = &msg4;
+
+    msg4.send_buf   = RT_NULL;
+    msg4.recv_buf   = &ready[0];
+    msg4.length     = 2;
+    msg4.cs_take    = 0;
+    msg4.cs_release = 1;
+    msg4.next       = RT_NULL;
+
+    rt_spi_transfer_message(touch_dev, &msg1);
+
+    readx_val = ((readx[0] << 8) | readx[1]) >> 4;
+    ready_val = ((ready[0] << 8) | ready[1]) >> 4;
+
+    rt_sem_release(&lcd_spi_lock);
+    *x = readx_val;
+    *y = ready_val;
+}
+
+/*
+XPT2046:Width:320 High:480
+no pressed:(0x800,0xfff)
+---ETH----USB-----------------------
+| (0x800,0x800)      (0xfff,0x800) |
+|                                  |
+| (0x800,0xFFF)      (0xfff,0xfff) |
+------------------------------------
+*/
+#define XMIN 0x800
+#define YMAX 0xfff 
+void read_tp(void *dev, rt_uint16_t *x, rt_uint16_t *y)
+{
+    struct rt_spi_device *touch_dev = (struct rt_spi_device *)dev;
+    rt_uint8_t try = 0;
+    uint16_t _y[5] = {0,0,0,0,0};
+    uint16_t _x[5] = {0,0,0,0,0};
+    uint16_t x_val = 0;
+    uint16_t y_val = 0;
+    uint16_t cur_x = 0;
+    uint16_t cur_y = 0;
+    int index = 0;
+
+    while(1)
+    {
+        try = try + 1;
+        touch_read_x_y(touch_dev, x, y);
+        if((*x > XMIN) && (*y < YMAX))
+        {
+            _x[index] = *x;
+            _y[index] = *y;
+            index = index + 1;
+        }
+        if(index == 5)
+        {
+            break;
+        }
+
+        if(try > 10)
+        {
+            break;
+        }
+    }
+
+    x_val = (_x[0] + _x[1] + _x[2] + _x[3]+ _x[4]) / index;
+    y_val = (_y[0] + _y[1] + _y[2] + _y[3]+ _y[4]) / index;
+
+    cur_x = (x_val - 0x800) * TFT_WIDTH / 0x800;
+    cur_y = (y_val - 0x800) * TFT_HEIGHT / 0x800;
+
+    if((cur_x < TFT_WIDTH) && (cur_y < TFT_HEIGHT))
+    {
+        *x = TFT_WIDTH - cur_x;
+        *y = TFT_HEIGHT - cur_y;
+    }
+    else
+    {
+        *x = 0;
+        *y = 0;
+    }
+}
+
+static void touch_thread_entry(void *param)
+{
+    rt_uint16_t x,y;
+    struct rt_spi_device *touch_dev;
+    touch_dev = (struct rt_spi_device *)rt_device_find(TOUCH_DEVICE_NAME);
+    touch_dev->config.max_hz = TOUCH_SPI_MAX_FREQ;
+    if (!touch_dev)
+    {
+        rt_kprintf("no %s!\n", TOUCH_DEVICE_NAME);
+    }
+
+    while (1)
+    {
+        rt_sem_take(&touch_ack, RT_WAITING_FOREVER);
+        read_tp(touch_dev, &x, &y);
+        if((x!= 0) && (y !=0))
+        {
+            touch_x_val = x;
+            touch_y_val = y;
+            touch_flag = 1;
+        }
+        rt_pin_mode(TP_IRQ_PIN, PIN_MODE_INPUT_PULLUP);
+    }
+}
+
+static void touch_readly(void *args)
+{
+    if(rt_pin_read(TP_IRQ_PIN) == PIN_LOW)
+    {
+        rt_pin_mode(TP_IRQ_PIN, PIN_MODE_OUTPUT);
+        rt_pin_write(TP_IRQ_PIN,PIN_HIGH);
+        rt_sem_release(&touch_ack);
+    }
+}
+
+static rt_size_t xpt2046_read_point(struct rt_touch_device *touch, void *buf, rt_size_t read_num)
+{
+    rt_uint16_t* touchxy = (rt_uint16_t *)buf;
+    if((read_num != 0) && (touch_flag == 1))
+    {
+        touchxy[0] = touch_x_val;
+        touchxy[1] = touch_y_val;
+        touch_flag = 0;
+        return read_num;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+static rt_err_t xpt2046_control(struct rt_touch_device *device, int cmd, void *data)
+{
+    return RT_EOK;
+}
+
+static struct rt_touch_ops touch_ops =
+{
+    .touch_readpoint = xpt2046_read_point,
+    .touch_control = xpt2046_control,
+};
+
+static int hw_xpt2049_touch_init(void)
+{
+    //touch sem
+    rt_sem_init(&touch_ack, "touch_ack", 0, RT_IPC_FLAG_FIFO);
+
+    touch_tid = rt_thread_create("touch",
+                            touch_thread_entry, RT_NULL,
+                            TOUCH_THREAD_STACK_SIZE,
+                            TOUCH_THREAD_PRIORITY, TOUCH_THREAD_TIMESLICE);
+    if (touch_tid != RT_NULL)
+        rt_thread_startup(touch_tid);
+
+    rt_pin_mode(TP_IRQ_PIN, PIN_MODE_INPUT_PULLUP);
+    rt_pin_attach_irq(TP_IRQ_PIN, PIN_IRQ_MODE_LOW_LEVEL, touch_readly, RT_NULL);
+    rt_pin_irq_enable(TP_IRQ_PIN, PIN_IRQ_ENABLE);
+
+    touch_device = (rt_touch_t)rt_calloc(1, sizeof(struct rt_touch_device));
+
+    if (touch_device == RT_NULL)
+        return -RT_ERROR;
+
+    /* register touch device */
+    touch_device->info.type = RT_TOUCH_TYPE_RESISTANCE;
+    touch_device->info.vendor = RT_TOUCH_VENDOR_UNKNOWN;
+    //rt_memcpy(&touch_device->config, cfg, sizeof(struct rt_touch_config));
+    touch_device->ops = &touch_ops;
+
+    rt_hw_touch_register(touch_device, "xpt2046", RT_DEVICE_FLAG_INT_RX, RT_NULL);
+
+    return 0;
+}
+INIT_DEVICE_EXPORT(hw_xpt2049_touch_init);

+ 13 - 0
bsp/raspberry-pi/raspi4-32/driver/touch/drv_xpt2046.h

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2020-11-08     bigmagic       first version
+ */
+#ifndef __DRV_XPT2046_H__
+#define __DRV_XPT2046_H__
+
+#endif//XPT2046

+ 8 - 0
bsp/raspberry-pi/raspi4-32/link.lds

@@ -63,6 +63,14 @@ SECTIONS
         _etext = .;
     }
 
+    __exidx_start = .;
+    .ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
+    __exidx_end = .;
+
+    __rodata_start = .;
+    .rodata   : { *(.rodata) *(.rodata.*) }
+    __rodata_end = .;
+
     .eh_frame_hdr :
     {
          *(.eh_frame_hdr)

+ 31 - 6
bsp/raspberry-pi/raspi4-32/rtconfig.h

@@ -10,7 +10,7 @@
 #define RT_ALIGN_SIZE 4
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_MAX 32
-#define RT_TICK_PER_SECOND 100
+#define RT_TICK_PER_SECOND 1000
 #define RT_USING_OVERFLOW_CHECK
 #define RT_USING_HOOK
 #define RT_USING_IDLE_HOOK
@@ -40,7 +40,7 @@
 #define RT_USING_DEVICE
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
-#define RT_CONSOLE_DEVICE_NAME "uart0"
+#define RT_CONSOLE_DEVICE_NAME "uart1"
 #define RT_VER_NUM 0x40003
 #define ARCH_ARMV8
 
@@ -94,9 +94,14 @@
 
 #define RT_USING_DEVICE_IPC
 #define RT_PIPE_BUFSZ 512
+#define RT_USING_SYSTEM_WORKQUEUE
+#define RT_SYSTEM_WORKQUEUE_STACKSIZE 2048
+#define RT_SYSTEM_WORKQUEUE_PRIORITY 23
 #define RT_USING_SERIAL
 #define RT_SERIAL_USING_DMA
-#define RT_SERIAL_RB_BUFSZ 64
+#define RT_SERIAL_RB_BUFSZ 512
+#define RT_USING_I2C
+#define RT_USING_I2C_BITOPS
 #define RT_USING_PIN
 #define RT_USING_SDIO
 #define RT_SDIO_STACK_SIZE 512
@@ -106,6 +111,7 @@
 #define RT_MMCSD_MAX_PARTITION 16
 #define RT_USING_SPI
 #define RT_USING_WDT
+#define RT_USING_TOUCH
 
 /* Using USB */
 
@@ -119,6 +125,12 @@
 
 /* Socket abstraction layer */
 
+#define RT_USING_SAL
+
+/* protocol stack implement */
+
+#define SAL_USING_LWIP
+#define SAL_USING_POSIX
 
 /* Network interface device */
 
@@ -214,6 +226,9 @@
 /* system packages */
 
 
+/* Micrium: Micrium software products porting for RT-Thread */
+
+
 /* peripheral libraries and drivers */
 
 
@@ -223,6 +238,9 @@
 /* samples: kernel and components samples */
 
 
+/* games: games run on RT-Thread console */
+
+
 /* Privated Packages of RealThread */
 
 
@@ -236,22 +254,29 @@
 
 #define BSP_USING_UART
 #define RT_USING_UART0
+#define RT_USING_UART1
 #define RT_USING_UART3
-#define RT_USING_UART4
+#define RT_USING_UART5
 #define BSP_USING_GIC
 #define BSP_USING_GIC400
 #define BSP_USING_PIN
 #define BSP_USING_SPI
 #define BSP_USING_SPI0_BUS
 #define BSP_USING_SPI0_DEVICE0
+#define BSP_USING_SPI0_DEVICE1
+#define BSP_USING_I2C
+#define BSP_USING_I2C3
 #define BSP_USING_CORETIMER
 #define BSP_USING_WDT
+#define BSP_USING_ETH
 #define BSP_USING_SDIO
 #define BSP_USING_SDIO0
 
 /* Board Peripheral Drivers */
 
-#define BSP_USING_HDMI
-#define BSP_USING_HDMI_DISPLAY
+#define BSP_USING_LCD
+#define BSP_USING_DSI_DISPLAY
+#define BSP_USING_TOUCH
+#define BSP_USING_DSI_TOUCH_DEV
 
 #endif

+ 15 - 1
bsp/stm32/libraries/HAL_Drivers/Kconfig

@@ -40,7 +40,21 @@ config BSP_USING_RNG
     depends on (SOC_SERIES_STM32L4 || SOC_SERIES_STM32F4 || SOC_SERIES_STM32F7 || \
                 SOC_SERIES_STM32H7 || SOC_SERIES_STM32MP1)
     default n
-    
+
+config BSP_USING_HASH
+    bool "Enable HASH (Hash House Harriers)"
+    select RT_USING_HWCRYPTO
+    select RT_HWCRYPTO_USING_HASH
+    depends on (SOC_SERIES_STM32MP1)
+    default n
+
+config BSP_USING_CRYP
+    bool "Enable CRYP (Encrypt And Decrypt Data)"
+    select RT_USING_HWCRYPTO
+    select RT_HWCRYPTO_USING_CRYP
+    depends on (SOC_SERIES_STM32MP1)
+    default n
+
 config BSP_USING_UDID
     bool "Enable UDID (Unique Device Identifier)"
     select RT_USING_HWCRYPTO

+ 42 - 0
bsp/stm32/libraries/HAL_Drivers/config/l4/dac_config.h

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-06-16     thread-liu   first version
+ */
+
+#ifndef __DAC_CONFIG_H__
+#define __DAC_CONFIG_H__
+
+#include <rtthread.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef BSP_USING_DAC1
+#ifndef DAC1_CONFIG
+#define DAC1_CONFIG                                                    \
+    {                                                                  \
+       .Instance                      = DAC1,                          \
+    }
+#endif /* DAC2_CONFIG */
+#endif /* BSP_USING_DAC2 */
+
+#ifdef BSP_USING_DAC2
+#ifndef DAC2_CONFIG
+#define DAC2_CONFIG                                                    \
+    {                                                                  \
+       .Instance                      = DAC2,                          \
+    }
+#endif /* DAC2_CONFIG */
+#endif /* BSP_USING_DAC2 */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DAC_CONFIG_H__ */

+ 60 - 52
bsp/stm32/libraries/HAL_Drivers/config/mp1/dma_config.h

@@ -1,13 +1,11 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
- * 2019-01-02     zylx         first version
- * 2019-01-08     SummerGift   clean up the code
- * 2020-06-20     thread-liu   add stm32mp1
+ * 2020-06-20     thread-liu   first version
  */
 
 #ifndef __DMA_CONFIG_H__
@@ -19,6 +17,22 @@
 extern "C" {
 #endif
 
+/* DMA1 stream0 */
+
+/* DMA1 stream1 */
+
+/* DMA1 stream2 */
+
+/* DMA1 stream3 */
+
+/* DMA1 stream4 */
+
+/* DMA1 stream5 */
+
+/* DMA1 stream6 */
+
+/* DMA1 stream7 */
+
 /* DMA2 stream0 */
 #if defined(BSP_UART3_RX_USING_DMA) && !defined(UART3_RX_DMA_INSTANCE)
 #define UART3_RX_DMA_IRQHandler          DMA2_Stream0_IRQHandler
@@ -26,18 +40,12 @@ extern "C" {
 #define UART3_RX_DMA_INSTANCE            DMA2_Stream0
 #define UART3_RX_DMA_CHANNEL             DMA_REQUEST_USART3_RX
 #define UART3_RX_DMA_IRQ                 DMA2_Stream0_IRQn
-#elif defined(BSP_SPI4_RX_USING_DMA) && !defined(SPI4_RX_DMA_INSTANCE)
-#define SPI4_DMA_RX_IRQHandler           DMA2_Stream0_IRQHandler
-#define SPI4_RX_DMA_RCC                  RCC_MC_AHB2ENSETR_DMA2EN
-#define SPI4_RX_DMA_INSTANCE             DMA2_Stream0
-#define SPI4_RX_DMA_CHANNEL              DMA_REQUEST_SPI4_RX
-#define SPI4_RX_DMA_IRQ                  DMA2_Stream0_IRQn
-#elif defined(BSP_UART5_RX_USING_DMA) && !defined(UART5_RX_DMA_INSTANCE)
-#define UART5_DMA_RX_IRQHandler          DMA2_Stream0_IRQHandler
-#define UART5_RX_DMA_RCC                 RCC_MC_AHB2ENSETR_DMA2EN
-#define UART5_RX_DMA_INSTANCE            DMA2_Stream0
-#define UART5_RX_DMA_CHANNEL             DMA_REQUEST_UART5_RX
-#define UART5_RX_DMA_IRQ                 DMA2_Stream0_IRQn
+#elif defined(BSP_SPI5_RX_USING_DMA) && !defined(SPI5_RX_DMA_INSTANCE)
+#define SPI5_DMA_RX_IRQHandler           DMA2_Stream0_IRQHandler
+#define SPI5_RX_DMA_RCC                  RCC_MC_AHB2ENSETR_DMA2EN
+#define SPI5_RX_DMA_INSTANCE             DMA2_Stream0
+#define SPI5_RX_DMA_CHANNEL              DMA_REQUEST_SPI5_RX
+#define SPI5_RX_DMA_IRQ                  DMA2_Stream0_IRQn
 #endif
     
 /* DMA2 stream1 */
@@ -47,12 +55,12 @@ extern "C" {
 #define UART3_TX_DMA_INSTANCE             DMA2_Stream1
 #define UART3_TX_DMA_CHANNEL              DMA_REQUEST_USART3_TX
 #define UART3_TX_DMA_IRQ                  DMA2_Stream1_IRQn
-#elif defined(BSP_SPI4_TX_USING_DMA) && !defined(SPI4_TX_DMA_INSTANCE)
-#define SPI4_DMA_TX_IRQHandler           DMA2_Stream1_IRQHandler
-#define SPI4_TX_DMA_RCC                  RCC_MC_AHB2ENSETR_DMA2EN
-#define SPI4_TX_DMA_INSTANCE             DMA2_Stream1
-#define SPI4_TX_DMA_CHANNEL              DMA_REQUEST_SPI4_TX
-#define SPI4_TX_DMA_IRQ                  DMA2_Stream1_IRQn
+#elif defined(BSP_SPI5_TX_USING_DMA) && !defined(SPI5_TX_DMA_INSTANCE)
+#define SPI5_DMA_TX_IRQHandler           DMA2_Stream1_IRQHandler
+#define SPI5_TX_DMA_RCC                  RCC_MC_AHB2ENSETR_DMA2EN
+#define SPI5_TX_DMA_INSTANCE             DMA2_Stream1
+#define SPI5_TX_DMA_CHANNEL              DMA_REQUEST_SPI5_TX
+#define SPI5_TX_DMA_IRQ                  DMA2_Stream1_IRQn
 #endif
 
 /* DMA2 stream2 */
@@ -65,48 +73,48 @@ extern "C" {
 #endif
 
 /* DMA2 stream3 */
-#if defined(BSP_SPI5_RX_USING_DMA) && !defined(SPI5_RX_DMA_INSTANCE)
-#define SPI5_DMA_RX_IRQHandler           DMA2_Stream3_IRQHandler
-#define SPI5_RX_DMA_RCC                  RCC_MC_AHB2ENSETR_DMA2EN
-#define SPI5_RX_DMA_INSTANCE             DMA2_Stream3
-#define SPI5_RX_DMA_CHANNEL              DMA_REQUEST_SPI5_RX
-#define SPI5_RX_DMA_IRQ                  DMA2_Stream3_IRQn
+#if defined(BSP_UART4_RX_USING_DMA) && !defined(UART4_RX_DMA_INSTANCE)
+#define UART4_DMA_RX_IRQHandler          DMA2_Stream3_IRQHandler
+#define UART4_RX_DMA_RCC                 RCC_MC_AHB2ENSETR_DMA2EN
+#define UART4_RX_DMA_INSTANCE            DMA2_Stream3
+#define UART4_RX_DMA_CHANNEL             DMA_REQUEST_UART4_RX
+#define UART4_RX_DMA_IRQ                 DMA2_Stream3_IRQn        
 #endif
 
 /* DMA2 stream4 */
-#if defined(BSP_SPI5_TX_USING_DMA) && !defined(SPI5_TX_DMA_INSTANCE)
-#define SPI5_DMA_TX_IRQHandler           DMA2_Stream4_IRQHandler
-#define SPI5_TX_DMA_RCC                  RCC_MC_AHB2ENSETR_DMA2EN
-#define SPI5_TX_DMA_INSTANCE             DMA2_Stream4
-#define SPI5_TX_DMA_CHANNEL              DMA_REQUEST_SPI5_TX
-#define SPI5_TX_DMA_IRQ                  DMA2_Stream4_IRQn
-#endif
-
-/* DMA2 stream5 */
 #if defined(BSP_UART4_TX_USING_DMA) && !defined(UART5_TX_DMA_INSTANCE)
-#define UART4_DMA_TX_IRQHandler          DMA2_Stream5_IRQHandler
+#define UART4_DMA_TX_IRQHandler          DMA2_Stream4_IRQHandler
 #define UART4_TX_DMA_RCC                 RCC_MC_AHB2ENSETR_DMA2EN
-#define UART4_TX_DMA_INSTANCE            DMA2_Stream5
+#define UART4_TX_DMA_INSTANCE            DMA2_Stream4
 #define UART4_TX_DMA_CHANNEL             DMA_REQUEST_UART4_TX
-#define UART4_TX_DMA_IRQ                 DMA2_Stream5_IRQn    
+#define UART4_TX_DMA_IRQ                 DMA2_Stream4_IRQn   
+#endif
+
+/* DMA2 stream5 */
+#if defined(BSP_USING_CRYP) && !defined(CRYP2_OUT_DMA_INSTANCE)
+#define CRYP2_DMA_OUT_IRQHandler           DMA2_Stream5_IRQHandler
+#define CRYP2_OUT_DMA_RCC                  RCC_MC_AHB2ENSETR_DMA2EN
+#define CRYP2_OUT_DMA_INSTANCE             DMA2_Stream5
+#define CRYP2_OUT_DMA_CHANNEL              DMA_REQUEST_CRYP2_OUT
+#define CRYP2_OUT_DMA_IRQ                  DMA2_Stream5_IRQn
 #endif
 
 /* DMA2 stream6 */
-#if defined(BSP_UART4_RX_USING_DMA) && !defined(UART4_RX_DMA_INSTANCE)
-#define UART4_DMA_RX_IRQHandler          DMA2_Stream6_IRQHandler
-#define UART4_RX_DMA_RCC                 RCC_MC_AHB2ENSETR_DMA2EN
-#define UART4_RX_DMA_INSTANCE            DMA2_Stream6
-#define UART4_RX_DMA_CHANNEL             DMA_REQUEST_UART4_RX
-#define UART4_RX_DMA_IRQ                 DMA2_Stream6_IRQn        
+#if defined(BSP_USING_CRYP) && !defined(CRYP2_IN_DMA_INSTANCE)
+#define CRYP2_DMA_IN_IRQHandler          DMA2_Stream6_IRQHandler
+#define CRYP2_IN_DMA_RCC                 RCC_MC_AHB2ENSETR_DMA2EN
+#define CRYP2_IN_DMA_INSTANCE            DMA2_Stream6
+#define CRYP2_IN_DMA_CHANNEL             DMA_REQUEST_CRYP2_IN
+#define CRYP2_IN_DMA_IRQ                 DMA2_Stream6_IRQn    
 #endif
 
 /* DMA2 stream7 */
-#if defined(BSP_UART5_TX_USING_DMA) && !defined(UART5_TX_DMA_INSTANCE)
-#define UART5_DMA_TX_IRQHandler          DMA2_Stream7_IRQHandler
-#define UART5_TX_DMA_RCC                 RCC_MC_AHB2ENSETR_DMA2EN
-#define UART5_TX_DMA_INSTANCE            DMA2_Stream7
-#define UART5_TX_DMA_CHANNEL             DMA_REQUEST_UART5_TX
-#define UART5_TX_DMA_IRQ                 DMA2_Stream7_IRQn
+#if defined(BSP_USING_HASH) && !defined(HASH2_IN_DMA_INSTANCE)
+#define HASH2_DMA_IN_IRQHandler          DMA2_Stream7_IRQHandler
+#define HASH2_IN_DMA_RCC                 RCC_MC_AHB2ENSETR_DMA2EN
+#define HASH2_IN_DMA_INSTANCE            DMA2_Stream7
+#define HASH2_IN_DMA_CHANNEL             DMA_REQUEST_HASH2_IN
+#define HASH2_IN_DMA_IRQ                 DMA2_Stream7_IRQn  
 #endif
     
 #ifdef __cplusplus

+ 1 - 0
bsp/stm32/libraries/HAL_Drivers/drv_config.h

@@ -73,6 +73,7 @@ extern "C" {
 #include "l4/spi_config.h"
 #include "l4/qspi_config.h"
 #include "l4/adc_config.h"
+#include "l4/dac_config.h"
 #include "l4/tim_config.h"
 #include "l4/sdio_config.h"
 #include "l4/pwm_config.h"

+ 396 - 19
bsp/stm32/libraries/HAL_Drivers/drv_crypto.c

@@ -7,6 +7,8 @@
  * Date           Author       Notes
  * 2019-07-10     Ernest       1st version
  * 2020-10-14     Dozingfiretruck   Porting for stm32wbxx
+ * 2020-11-26     thread-liu   add hash
+ * 2020-11-26     thread-liu   add cryp
  */
 
 #include <rtthread.h>
@@ -15,7 +17,8 @@
 #include <string.h>
 #include "drv_crypto.h"
 #include "board.h"
-
+#include "drv_config.h"
+     
 struct stm32_hwcrypto_device
 {
     struct rt_hwcrypto_device dev;
@@ -24,12 +27,7 @@ struct stm32_hwcrypto_device
 
 #if defined(BSP_USING_CRC)
 
-struct hash_ctx_des
-{
-    CRC_HandleTypeDef contex;
-};
-
-#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB)
+#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32MP1)
 static struct hwcrypto_crc_cfg  crc_backup_cfg;
 
 static int reverse_bit(rt_uint32_t n)
@@ -49,12 +47,12 @@ static rt_uint32_t _crc_update(struct hwcrypto_crc *ctx, const rt_uint8_t *in, r
     rt_uint32_t result = 0;
     struct stm32_hwcrypto_device *stm32_hw_dev = (struct stm32_hwcrypto_device *)ctx->parent.device->user_data;
 
-#if defined(SOC_SERIES_STM32L4)|| defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB)
+#if defined(SOC_SERIES_STM32L4)|| defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32MP1)
     CRC_HandleTypeDef *HW_TypeDef = (CRC_HandleTypeDef *)(ctx->parent.contex);
 #endif
 
     rt_mutex_take(&stm32_hw_dev->mutex, RT_WAITING_FOREVER);
-#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB)
+#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32MP1)
     if (memcmp(&crc_backup_cfg, &ctx->crc_cfg, sizeof(struct hwcrypto_crc_cfg)) != 0)
     {
         if (HW_TypeDef->Init.DefaultPolynomialUse == DEFAULT_POLYNOMIAL_DISABLE)
@@ -113,7 +111,7 @@ static rt_uint32_t _crc_update(struct hwcrypto_crc *ctx, const rt_uint8_t *in, r
 
     result = HAL_CRC_Accumulate(ctx->parent.contex, (rt_uint32_t *)in, length);
 
-#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB)
+#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32MP1)
     if (HW_TypeDef->Init.OutputDataInversionMode)
     {
         ctx ->crc_cfg.last_val = reverse_bit(result);
@@ -149,7 +147,7 @@ static rt_uint32_t _rng_rand(struct hwcrypto_rng *ctx)
     {
         return gen_random ;
     }
-
+    
     return 0;
 }
 
@@ -159,10 +157,213 @@ static const struct hwcrypto_rng_ops rng_ops =
 };
 #endif /* BSP_USING_RNG */
 
+#if defined(BSP_USING_HASH)
+static rt_err_t _hash_update(struct hwcrypto_hash *ctx, const rt_uint8_t *in, rt_size_t length)
+{
+    rt_uint32_t tickstart = 0;
+    rt_uint32_t result = RT_EOK;
+    struct stm32_hwcrypto_device *stm32_hw_dev = (struct stm32_hwcrypto_device *)ctx->parent.device->user_data;
+    rt_mutex_take(&stm32_hw_dev->mutex, RT_WAITING_FOREVER);    
+    
+#if defined(SOC_SERIES_STM32MP1)
+    HASH_HandleTypeDef *HW_TypeDef = (HASH_HandleTypeDef *)(ctx->parent.contex);
+    /* Start HASH computation using DMA transfer */
+    switch (ctx->parent.type)
+    {
+    case HWCRYPTO_TYPE_SHA224:
+       result = HAL_HASHEx_SHA224_Start_DMA(HW_TypeDef, (uint8_t *)in, length);
+       break;
+    case HWCRYPTO_TYPE_SHA256:
+       result = HAL_HASHEx_SHA256_Start_DMA(HW_TypeDef, (uint8_t *)in, length);
+       break;
+    case HWCRYPTO_TYPE_MD5:
+       result = HAL_HASH_MD5_Start_DMA(HW_TypeDef, (uint8_t *)in, length);
+       break;
+    case HWCRYPTO_TYPE_SHA1:
+       result = HAL_HASH_SHA1_Start_DMA(HW_TypeDef, (uint8_t *)in, length);
+       break;
+    default :
+        rt_kprintf("not support hash type: %x", ctx->parent.type);
+        break;
+    }
+    if (result != HAL_OK)
+    {
+        goto _exit;
+    }
+    /* Wait for DMA transfer to complete */ 
+    tickstart = rt_tick_get();
+    while (HAL_HASH_GetState(HW_TypeDef) == HAL_HASH_STATE_BUSY)
+    {
+        if (rt_tick_get() - tickstart > 0xFFFF)
+        {
+            result = RT_ETIMEOUT;
+            goto _exit;
+        }
+    }
+    
+#endif
+_exit:
+    rt_mutex_release(&stm32_hw_dev->mutex);
+        
+   return  result;
+}
+
+static rt_err_t _hash_finish(struct hwcrypto_hash *ctx, rt_uint8_t *out, rt_size_t length)
+{
+    rt_uint32_t result = RT_EOK;
+    struct stm32_hwcrypto_device *stm32_hw_dev = (struct stm32_hwcrypto_device *)ctx->parent.device->user_data;
+    rt_mutex_take(&stm32_hw_dev->mutex, RT_WAITING_FOREVER);
+#if defined(SOC_SERIES_STM32MP1)
+    HASH_HandleTypeDef *HW_TypeDef = (HASH_HandleTypeDef *)(ctx->parent.contex);
+    /* Get the computed digest value */
+    switch (ctx->parent.type)
+    {
+    case HWCRYPTO_TYPE_SHA224:
+       result = HAL_HASHEx_SHA224_Finish(HW_TypeDef, (uint8_t *)out, length);
+       break;
+
+    case HWCRYPTO_TYPE_SHA256:
+       result = HAL_HASHEx_SHA256_Finish(HW_TypeDef, (uint8_t *)out, length);
+       break;
+
+    case HWCRYPTO_TYPE_MD5:
+       result = HAL_HASH_MD5_Finish(HW_TypeDef, (uint8_t *)out, length);
+       break;
+
+    case HWCRYPTO_TYPE_SHA1:
+       result = HAL_HASH_SHA1_Finish(HW_TypeDef, (uint8_t *)out, length);
+       break;
+
+    default :
+        rt_kprintf("not support hash type: %x", ctx->parent.type);
+        break;
+    }
+    if (result != HAL_OK)
+    {
+        goto _exit;
+    }
+#endif    
+    
+_exit:
+    rt_mutex_release(&stm32_hw_dev->mutex);
+    
+    return result;     
+}
+
+static const struct hwcrypto_hash_ops hash_ops =
+{
+    .update = _hash_update,
+    .finish  = _hash_finish
+};
+
+#endif /* BSP_USING_HASH */
+
+#if defined(BSP_USING_CRYP) 
+static rt_err_t _cryp_crypt(struct hwcrypto_symmetric *ctx,
+                            struct hwcrypto_symmetric_info *info)
+{
+    rt_uint32_t result = RT_EOK;
+    rt_uint32_t tickstart = 0;
+
+    struct stm32_hwcrypto_device *stm32_hw_dev = (struct stm32_hwcrypto_device *)ctx->parent.device->user_data;
+    rt_mutex_take(&stm32_hw_dev->mutex, RT_WAITING_FOREVER);
+    
+#if defined(SOC_SERIES_STM32MP1)
+    CRYP_HandleTypeDef *HW_TypeDef = (CRYP_HandleTypeDef *)(ctx->parent.contex);
+    
+    switch (ctx->parent.type)
+    {
+    case HWCRYPTO_TYPE_AES_ECB:
+       HW_TypeDef->Init.Algorithm = CRYP_AES_ECB;
+       break;
+
+    case HWCRYPTO_TYPE_AES_CBC:
+       HW_TypeDef->Init.Algorithm = CRYP_AES_CBC;
+       break;
+
+    case HWCRYPTO_TYPE_AES_CTR:
+       HW_TypeDef->Init.Algorithm = CRYP_AES_CTR;
+       break;
+
+    case HWCRYPTO_TYPE_DES_ECB:
+       HW_TypeDef->Init.Algorithm = CRYP_DES_ECB; 
+       break;
+       
+    case HWCRYPTO_TYPE_DES_CBC:
+       HW_TypeDef->Init.Algorithm = CRYP_DES_CBC; 
+       break;
+       
+    default :
+        rt_kprintf("not support cryp type: %x", ctx->parent.type);
+        break; 
+    }
+    
+    HAL_CRYP_DeInit(HW_TypeDef);
+    
+    HW_TypeDef->Init.DataType       = CRYP_DATATYPE_8B;
+    HW_TypeDef->Init.DataWidthUnit  = CRYP_DATAWIDTHUNIT_BYTE;
+    HW_TypeDef->Init.KeySize        = CRYP_KEYSIZE_128B;
+    HW_TypeDef->Init.pKey           = (uint32_t*)ctx->key;
+    
+    result =  HAL_CRYP_Init(HW_TypeDef);
+    if (result != HAL_OK)
+    {
+        /* Initialization Error */
+        goto _exit;
+    }
+    if (info->mode == HWCRYPTO_MODE_ENCRYPT)
+    {
+         result = HAL_CRYP_Encrypt_DMA(HW_TypeDef, (uint32_t *)info->in, info->length, (uint32_t *)info->out); 
+    }
+    else if (info->mode == HWCRYPTO_MODE_DECRYPT)
+    {
+         result = HAL_CRYP_Decrypt_DMA(HW_TypeDef, (uint32_t *)info->in, info->length, (uint32_t *)info->out);   
+    }
+    else
+    {
+        rt_kprintf("error cryp mode : %02x!\n", info->mode);
+        result = RT_ERROR;
+        goto _exit;
+    }
+    
+    if (result != HAL_OK)
+    {
+        goto _exit;
+    }
+
+    tickstart = rt_tick_get();
+    while (HAL_CRYP_GetState(HW_TypeDef) != HAL_CRYP_STATE_READY)
+    {   
+        if (rt_tick_get() - tickstart > 0xFFFF)
+        {
+            result = RT_ETIMEOUT;
+            goto _exit;
+        }
+    }
+  
+#endif
+    
+    if (result != HAL_OK)
+    {
+        goto _exit;
+    }
+    
+_exit:
+    rt_mutex_release(&stm32_hw_dev->mutex);
+
+    return result;    
+}
+
+static const struct hwcrypto_symmetric_ops cryp_ops = 
+{
+    .crypt = _cryp_crypt
+};
+#endif
+
 static rt_err_t _crypto_create(struct rt_hwcrypto_ctx *ctx)
 {
     rt_err_t res = RT_EOK;
-
+    
     switch (ctx->type & HWCRYPTO_MAIN_TYPE_MASK)
     {
 #if defined(BSP_USING_RNG)
@@ -174,8 +375,11 @@ static rt_err_t _crypto_create(struct rt_hwcrypto_ctx *ctx)
             res = -RT_ERROR;
             break;
         }
-
+#if defined(SOC_SERIES_STM32MP1)
+        hrng->Instance = RNG2;
+#else
         hrng->Instance = RNG;
+#endif
         HAL_RNG_Init(hrng);
         ctx->contex = hrng;
         ((struct hwcrypto_rng *)ctx)->ops = &rng_ops;
@@ -193,9 +397,12 @@ static rt_err_t _crypto_create(struct rt_hwcrypto_ctx *ctx)
             res = -RT_ERROR;
             break;
         }
-
+#if defined(SOC_SERIES_STM32MP1)
+        hcrc->Instance = CRC2;
+#else
         hcrc->Instance = CRC;
-#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB)
+#endif
+#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32MP1)
         hcrc->Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
         hcrc->Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_DISABLE;
         hcrc->Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_BYTE;
@@ -209,9 +416,77 @@ static rt_err_t _crypto_create(struct rt_hwcrypto_ctx *ctx)
 #endif /* defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) */
         ctx->contex = hcrc;
         ((struct hwcrypto_crc *)ctx)->ops = &crc_ops;
+        
         break;
     }
 #endif /* BSP_USING_CRC */
+    
+#if defined(BSP_USING_HASH)
+    case HWCRYPTO_TYPE_MD5:
+    case HWCRYPTO_TYPE_SHA1:
+    case HWCRYPTO_TYPE_SHA2:
+    {
+        HASH_HandleTypeDef *hash = rt_calloc(1, sizeof(HASH_HandleTypeDef));
+        if (RT_NULL == hash)
+        {
+            res = -RT_ERROR;
+            break;
+        }
+#if defined(SOC_SERIES_STM32MP1)
+        /* enable dma for hash */
+        __HAL_RCC_DMA2_CLK_ENABLE();
+        HAL_NVIC_SetPriority(DMA2_Stream7_IRQn, 2, 0);
+        HAL_NVIC_EnableIRQ(DMA2_Stream7_IRQn); 
+
+        hash->Init.DataType = HASH_DATATYPE_8B;
+        if (HAL_HASH_Init(hash) != HAL_OK)
+        {
+            res = -RT_ERROR;
+        } 
+#endif
+        ctx->contex = hash;
+        ((struct hwcrypto_hash *)ctx)->ops = &hash_ops;
+        
+        break;  
+    }
+#endif /* BSP_USING_HASH */
+
+#if defined(BSP_USING_CRYP)
+    case HWCRYPTO_TYPE_AES:
+    case HWCRYPTO_TYPE_DES:
+    case HWCRYPTO_TYPE_3DES:
+    case HWCRYPTO_TYPE_RC4:
+    case HWCRYPTO_TYPE_GCM:
+    {
+        CRYP_HandleTypeDef *cryp = rt_calloc(1, sizeof(CRYP_HandleTypeDef));
+        if (RT_NULL == cryp)
+        {
+            res = -RT_ERROR;
+            break;
+        }
+#if defined(SOC_SERIES_STM32MP1)
+        cryp->Instance = CRYP2;
+        /* enable dma for cryp */
+        __HAL_RCC_DMA2_CLK_ENABLE();
+
+        HAL_NVIC_SetPriority(DMA2_Stream5_IRQn, 2, 0);
+        HAL_NVIC_EnableIRQ(DMA2_Stream5_IRQn);
+
+        HAL_NVIC_SetPriority(DMA2_Stream6_IRQn, 2, 0);
+        HAL_NVIC_EnableIRQ(DMA2_Stream6_IRQn);
+
+        if (HAL_CRYP_Init(cryp) != HAL_OK)
+        {
+            res = -RT_ERROR;
+        }
+#endif  
+        ctx->contex = cryp;
+        ((struct hwcrypto_symmetric *)ctx)->ops = &cryp_ops;
+
+        break;  
+    }
+#endif  /* BSP_USING_CRYP */
+    
     default:
         res = -RT_ERROR;
         break;
@@ -234,6 +509,26 @@ static void _crypto_destroy(struct rt_hwcrypto_ctx *ctx)
         HAL_CRC_DeInit((CRC_HandleTypeDef *)(ctx->contex));
         break;
 #endif /* BSP_USING_CRC */
+        
+#if defined(BSP_USING_HASH)
+    case HWCRYPTO_TYPE_MD5:
+    case HWCRYPTO_TYPE_SHA1:
+    case HWCRYPTO_TYPE_SHA2:
+        __HAL_HASH_RESET_HANDLE_STATE((HASH_HandleTypeDef *)(ctx->contex));
+        HAL_HASH_DeInit((HASH_HandleTypeDef *)(ctx->contex));
+        break;
+#endif /* BSP_USING_HASH */
+
+#if defined(BSP_USING_CRYP)
+    case HWCRYPTO_TYPE_AES:
+    case HWCRYPTO_TYPE_DES:
+    case HWCRYPTO_TYPE_3DES:
+    case HWCRYPTO_TYPE_RC4:
+    case HWCRYPTO_TYPE_GCM:
+         HAL_CRYP_DeInit((CRYP_HandleTypeDef *)(ctx->contex));
+         break;
+#endif /* BSP_USING_CRYP */
+             
     default:
         break;
     }
@@ -251,7 +546,7 @@ static rt_err_t _crypto_clone(struct rt_hwcrypto_ctx *des, const struct rt_hwcry
     case HWCRYPTO_TYPE_RNG:
         if (des->contex && src->contex)
         {
-            rt_memcpy(des->contex, src->contex, sizeof(struct hash_ctx_des));
+            rt_memcpy(des->contex, src->contex, sizeof(RNG_HandleTypeDef));
         }    
         break;
 #endif /* BSP_USING_RNG */
@@ -260,10 +555,35 @@ static rt_err_t _crypto_clone(struct rt_hwcrypto_ctx *des, const struct rt_hwcry
     case HWCRYPTO_TYPE_CRC:
         if (des->contex && src->contex)
         {
-            rt_memcpy(des->contex, src->contex, sizeof(struct hash_ctx_des));
+            rt_memcpy(des->contex, src->contex, sizeof(CRC_HandleTypeDef));
         }
         break;
 #endif /* BSP_USING_CRC */
+        
+#if defined(BSP_USING_HASH)
+    case HWCRYPTO_TYPE_MD5:
+    case HWCRYPTO_TYPE_SHA1:
+    case HWCRYPTO_TYPE_SHA2:
+        if (des->contex && src->contex)
+        {
+            rt_memcpy(des->contex, src->contex, sizeof(HASH_HandleTypeDef));
+        } 
+        break;
+#endif /* BSP_USING_HASH */
+
+#if defined(BSP_USING_CRYP)
+    case HWCRYPTO_TYPE_AES:
+    case HWCRYPTO_TYPE_DES:
+    case HWCRYPTO_TYPE_3DES:
+    case HWCRYPTO_TYPE_RC4:
+    case HWCRYPTO_TYPE_GCM:    
+        if (des->contex && src->contex)
+        {
+            rt_memcpy(des->contex, src->contex, sizeof(CRYP_HandleTypeDef));
+        } 
+        break;
+#endif /* BSP_USING_CRYP */
+        
     default:
         res = -RT_ERROR;
         break;
@@ -285,11 +605,68 @@ static void _crypto_reset(struct rt_hwcrypto_ctx *ctx)
         __HAL_CRC_DR_RESET((CRC_HandleTypeDef *)ctx-> contex);
         break;
 #endif /* BSP_USING_CRC */
+        
+#if defined(BSP_USING_HASH)
+    case HWCRYPTO_TYPE_MD5:
+    case HWCRYPTO_TYPE_SHA1:
+    case HWCRYPTO_TYPE_SHA2:
+        __HAL_HASH_RESET_HANDLE_STATE((HASH_HandleTypeDef *)(ctx->contex));
+        break;
+#endif /* BSP_USING_HASH*/
+        
+#if defined(BSP_USING_CRYP)
+    case HWCRYPTO_TYPE_AES:
+    case HWCRYPTO_TYPE_DES:
+    case HWCRYPTO_TYPE_3DES:
+    case HWCRYPTO_TYPE_RC4:
+    case HWCRYPTO_TYPE_GCM:  
+        break;
+#endif /* BSP_USING_CRYP */
+        
     default:
         break;
     }
 }
 
+void HASH2_DMA_IN_IRQHandler(void)
+{
+    extern DMA_HandleTypeDef hdma_hash_in;
+
+    /* enter interrupt */
+    rt_interrupt_enter();
+    
+    HAL_DMA_IRQHandler(&hdma_hash_in);
+    
+    /* leave interrupt */
+    rt_interrupt_leave();
+}
+
+void CRYP2_DMA_IN_IRQHandler(void)
+{   
+    extern DMA_HandleTypeDef hdma_cryp_in;
+
+    /* enter interrupt */
+    rt_interrupt_enter();
+    
+    HAL_DMA_IRQHandler(&hdma_cryp_in);
+    
+    /* leave interrupt */
+    rt_interrupt_leave();
+}
+
+void CRYP2_DMA_OUT_IRQHandler(void)
+{
+    extern DMA_HandleTypeDef hdma_cryp_out;
+    
+    /* enter interrupt */
+    rt_interrupt_enter();
+    
+    HAL_DMA_IRQHandler(&hdma_cryp_out);
+    
+    /* leave interrupt */
+    rt_interrupt_leave();
+}
+
 static const struct rt_hwcrypto_ops _ops =
 {
     .create = _crypto_create,
@@ -306,10 +683,10 @@ int stm32_hw_crypto_device_init(void)
     _crypto_dev.dev.ops = &_ops;
 #if defined(BSP_USING_UDID)
 
-#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32WB)
+#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) 
     cpuid[0] = HAL_GetUIDw0();
     cpuid[1] = HAL_GetUIDw1();
-#elif defined(SOC_SERIES_STM32H7)
+#elif defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1)
     cpuid[0] = HAL_GetREVID();
     cpuid[1] = HAL_GetDEVID();
 #endif

+ 4 - 4
bsp/stm32/libraries/HAL_Drivers/drv_dac.c

@@ -43,7 +43,7 @@ static rt_err_t stm32_dac_enabled(struct rt_dac_device *device, rt_uint32_t chan
     RT_ASSERT(device != RT_NULL);
     stm32_dac_handler = device->parent.user_data;
 
-#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7)
+#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32L4)
         HAL_DAC_Start(stm32_dac_handler, channel);
 #endif
     
@@ -56,7 +56,7 @@ static rt_err_t stm32_dac_disabled(struct rt_dac_device *device, rt_uint32_t cha
     RT_ASSERT(device != RT_NULL);
     stm32_dac_handler = device->parent.user_data;
     
-#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7)
+#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32L4)
     HAL_DAC_Stop(stm32_dac_handler, channel);
 #endif
     
@@ -96,7 +96,7 @@ static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t ch
 
     rt_memset(&DAC_ChanConf, 0, sizeof(DAC_ChanConf));
     
-#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7)
+#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32L4)
     if ((channel <= 2) && (channel > 0))
     {
         /* set stm32 dac channel */
@@ -109,7 +109,7 @@ static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t ch
     }
 #endif  
     
-#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7)
+#if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32L4)
     DAC_ChanConf.DAC_Trigger      = DAC_TRIGGER_NONE;             
     DAC_ChanConf.DAC_OutputBuffer = DAC_OUTPUTBUFFER_DISABLE;
 #endif    

+ 1 - 1
bsp/stm32/libraries/HAL_Drivers/drv_lcd.c

@@ -338,7 +338,7 @@ int drv_lcd_hw_init(void)
 __exit:
     if (result != RT_EOK)
     {
-        rt_sem_delete(&_lcd.lcd_lock);
+        rt_sem_detach(&_lcd.lcd_lock);
 
         if (_lcd.lcd_info.framebuffer)
         {

+ 4 - 4
bsp/stm32/libraries/HAL_Drivers/drv_sdio.c

@@ -353,7 +353,7 @@ static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
 
 /**
   * @brief  This function send sdio request.
-  * @param  sdio  rthw_sdio
+  * @param  host  rt_mmcsd_host
   * @param  req   request
   * @retval None
   */
@@ -525,11 +525,11 @@ void rthw_sdio_irq_update(struct rt_mmcsd_host *host, rt_int32_t enable)
 }
 
 /**
-  * @brief  This function delect sdcard.
+  * @brief  This function detect sdcard.
   * @param  host    rt_mmcsd_host
   * @retval 0x01
   */
-static rt_int32_t rthw_sd_delect(struct rt_mmcsd_host *host)
+static rt_int32_t rthw_sd_detect(struct rt_mmcsd_host *host)
 {
     LOG_D("try to detect device");
     return 0x01;
@@ -605,7 +605,7 @@ static const struct rt_mmcsd_host_ops ops =
 {
     rthw_sdio_request,
     rthw_sdio_iocfg,
-    rthw_sd_delect,
+    rthw_sd_detect,
     rthw_sdio_irq_update,
 };
 

+ 4 - 0
bsp/stm32/libraries/STM32L4xx_HAL/SConscript

@@ -59,6 +59,10 @@ if GetDepend(['RT_USING_ADC']):
     src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.c']
     src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.c']
 
+if GetDepend(['RT_USING_DAC']):
+    src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dac.c']
+    src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dac_ex.c']
+
 if GetDepend(['RT_USING_RTC']):
     src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rtc.c']
     src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rtc_ex.c']

+ 19 - 3
bsp/stm32/libraries/STM32MPxx_HAL/SConscript

@@ -45,9 +45,6 @@ if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']):
 if GetDepend(['RT_USING_CAN']):
     src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_can.c']
 
-if GetDepend(['BSP_USING_ETH']):
-    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_eth.c']
-
 if GetDepend(['BSP_USING_WWDG']):
     src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_wwdg.c']
 
@@ -107,6 +104,25 @@ if GetDepend(['BSP_USING_DFSDM']):
     src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_dfsdm.c']
     src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_dfsdm_ex.c']
 
+if GetDepend(['BSP_USING_SDMMC']):
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_ll_sdmmc.c']
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_sd.c']
+
+if GetDepend(['BSP_USING_HASH']):
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_hash.c']
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_hash_ex.c']
+
+if GetDepend(['BSP_USING_CRC']):
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_crc.c']
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_crc_ex.c']
+
+if GetDepend(['BSP_USING_RNG']):
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_rng.c']
+
+if GetDepend(['BSP_USING_CRYP']):
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_cryp.c']
+    src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_cryp_ex.c']
+
 path = [cwd + '/STM32MP1xx_HAL_Driver/Inc',
     cwd + '/CMSIS/Device/ST/STM32MP1xx/Include',
     cwd + '/CMSIS/Core/Include',

File diff ditekan karena terlalu besar
+ 0 - 6
bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/.mxproject


+ 131 - 98
bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Inc/stm32l4xx_hal_conf.h

@@ -1,40 +1,27 @@
 /**
   ******************************************************************************
   * @file    stm32l4xx_hal_conf.h
-  * @brief   HAL configuration file.             
+  * @author  MCD Application Team
+  * @brief   HAL configuration template file.
+  *          This file should be copied to the application folder and renamed
+  *          to stm32l4xx_hal_conf.h.
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; COPYRIGHT(c) 2020 STMicroelectronics</center></h2>
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
   *
-  * Redistribution and use in source and binary forms, with or without modification,
-  * are permitted provided that the following conditions are met:
-  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
-  *      without specific prior written permission.
-  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
   *
   ******************************************************************************
-  */ 
+  */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32L4xx_HAL_CONF_H
-#define __STM32L4xx_HAL_CONF_H
+#ifndef STM32L4xx_HAL_CONF_H
+#define STM32L4xx_HAL_CONF_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -45,17 +32,16 @@
 
 /* ########################## Module Selection ############################## */
 /**
-  * @brief This is the list of modules to be used in the HAL driver 
+  * @brief This is the list of modules to be used in the HAL driver
   */
-
-#define HAL_MODULE_ENABLED  
+#define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
 /*#define HAL_CRYP_MODULE_ENABLED   */
 /*#define HAL_CAN_MODULE_ENABLED   */
 /*#define HAL_COMP_MODULE_ENABLED   */
 /*#define HAL_CRC_MODULE_ENABLED   */
 /*#define HAL_CRYP_MODULE_ENABLED   */
-/*#define HAL_DAC_MODULE_ENABLED   */
+#define HAL_DAC_MODULE_ENABLED
 /*#define HAL_DCMI_MODULE_ENABLED   */
 /*#define HAL_DMA2D_MODULE_ENABLED   */
 /*#define HAL_DFSDM_MODULE_ENABLED   */
@@ -97,7 +83,7 @@
 /*#define HAL_EXTI_MODULE_ENABLED   */
 /*#define HAL_PSSI_MODULE_ENABLED   */
 #define HAL_GPIO_MODULE_ENABLED
-#define HAL_EXTI_MODULE_ENABLED 
+#define HAL_EXTI_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
@@ -109,9 +95,9 @@
 /**
   * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
   *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSE is used as system clock source, directly or through the PLL).  
+  *        (when HSE is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSE_VALUE) 
+#if !defined  (HSE_VALUE)
   #define HSE_VALUE    ((uint32_t)8000000U) /*!< Value of the External oscillator in Hz */
 #endif /* HSE_VALUE */
 
@@ -129,7 +115,7 @@
 /**
   * @brief Internal High Speed oscillator (HSI) value.
   *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSI is used as system clock source, directly or through the PLL). 
+  *        (when HSI is used as system clock source, directly or through the PLL).
   */
 #if !defined  (HSI_VALUE)
   #define HSI_VALUE    ((uint32_t)16000000U) /*!< Value of the Internal oscillator in Hz*/
@@ -142,7 +128,7 @@
   *        When the CRS is not used, the HSI48 RC oscillator runs on it default frequency
   *        which is subject to manufacturing process variations.
   */
-#if !defined  (HSI48_VALUE) 
+#if !defined  (HSI48_VALUE)
  #define HSI48_VALUE   ((uint32_t)48000000U) /*!< Value of the Internal High Speed oscillator for USB FS/SDMMC/RNG in Hz.
                                               The real value my vary depending on manufacturing process variations.*/
 #endif /* HSI48_VALUE */
@@ -150,8 +136,8 @@
 /**
   * @brief Internal Low Speed oscillator (LSI) value.
   */
-#if !defined  (LSI_VALUE) 
- #define LSI_VALUE  ((uint32_t)32000U)       /*!< LSI Typical Value in Hz*/
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  32000U       /*!< LSI Typical Value in Hz*/
 #endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
                                              The real value may vary depending on the variations
                                              in voltage and temperature.*/
@@ -161,29 +147,29 @@
   *        This value is used by the UART, RTC HAL module to compute the system frequency
   */
 #if !defined  (LSE_VALUE)
-  #define LSE_VALUE    ((uint32_t)32768U) /*!< Value of the External oscillator in Hz*/
+  #define LSE_VALUE    32768U /*!< Value of the External oscillator in Hz*/
 #endif /* LSE_VALUE */
 
 #if !defined  (LSE_STARTUP_TIMEOUT)
-  #define LSE_STARTUP_TIMEOUT    ((uint32_t)5000U)   /*!< Time out for LSE start up, in ms */
+  #define LSE_STARTUP_TIMEOUT    5000U   /*!< Time out for LSE start up, in ms */
 #endif /* HSE_STARTUP_TIMEOUT */
 
 /**
   * @brief External clock source for SAI1 peripheral
-  *        This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source 
+  *        This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source
   *        frequency.
   */
 #if !defined  (EXTERNAL_SAI1_CLOCK_VALUE)
-  #define EXTERNAL_SAI1_CLOCK_VALUE    ((uint32_t)2097000U) /*!< Value of the SAI1 External clock source in Hz*/
+  #define EXTERNAL_SAI1_CLOCK_VALUE    2097000U /*!< Value of the SAI1 External clock source in Hz*/
 #endif /* EXTERNAL_SAI1_CLOCK_VALUE */
 
 /**
   * @brief External clock source for SAI2 peripheral
-  *        This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source 
+  *        This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source
   *        frequency.
   */
 #if !defined  (EXTERNAL_SAI2_CLOCK_VALUE)
-  #define EXTERNAL_SAI2_CLOCK_VALUE    ((uint32_t)2097000U) /*!< Value of the SAI2 External clock source in Hz*/
+  #define EXTERNAL_SAI2_CLOCK_VALUE    2097000U /*!< Value of the SAI2 External clock source in Hz*/
 #endif /* EXTERNAL_SAI2_CLOCK_VALUE */
 
 /* Tip: To avoid modifying this file each time you need to use different HSE,
@@ -192,22 +178,67 @@
 /* ########################### System Configuration ######################### */
 /**
   * @brief This is the HAL system configuration section
-  */     
-  
-#define  VDD_VALUE					  ((uint32_t)3300U) /*!< Value of VDD in mv */           
-#define  TICK_INT_PRIORITY            ((uint32_t)0U)    /*!< tick interrupt priority */            
-#define  USE_RTOS                     0U     
+  */
+
+#define  VDD_VALUE					  3300U /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY            0U    /*!< tick interrupt priority */
+#define  USE_RTOS                     0U
 #define  PREFETCH_ENABLE              0U
 #define  INSTRUCTION_CACHE_ENABLE     1U
 #define  DATA_CACHE_ENABLE            1U
 
 /* ########################## Assert Selection ############################## */
 /**
-  * @brief Uncomment the line below to expanse the "assert_param" macro in the 
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
   *        HAL drivers code
   */
 /* #define USE_FULL_ASSERT    1U */
 
+/* ################## Register callback feature configuration ############### */
+/**
+  * @brief Set below the peripheral configuration  to "1U" to add the support
+  *        of HAL callback registration/deregistration feature for the HAL
+  *        driver(s). This allows user application to provide specific callback
+  *        functions thanks to HAL_PPP_RegisterCallback() rather than overwriting
+  *        the default weak callback functions (see each stm32l4xx_hal_ppp.h file
+  *        for possible callback identifiers defined in HAL_PPP_CallbackIDTypeDef
+  *        for each PPP peripheral).
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS        0U
+#define USE_HAL_CAN_REGISTER_CALLBACKS        0U
+#define USE_HAL_COMP_REGISTER_CALLBACKS       0U
+#define USE_HAL_CRYP_REGISTER_CALLBACKS       0U
+#define USE_HAL_DAC_REGISTER_CALLBACKS        0U
+#define USE_HAL_DCMI_REGISTER_CALLBACKS       0U
+#define USE_HAL_DFSDM_REGISTER_CALLBACKS      0U
+#define USE_HAL_DMA2D_REGISTER_CALLBACKS      0U
+#define USE_HAL_DSI_REGISTER_CALLBACKS        0U
+#define USE_HAL_GFXMMU_REGISTER_CALLBACKS     0U
+#define USE_HAL_HASH_REGISTER_CALLBACKS       0U
+#define USE_HAL_HCD_REGISTER_CALLBACKS        0U
+#define USE_HAL_I2C_REGISTER_CALLBACKS        0U
+#define USE_HAL_IRDA_REGISTER_CALLBACKS       0U
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS      0U
+#define USE_HAL_LTDC_REGISTER_CALLBACKS       0U
+#define USE_HAL_MMC_REGISTER_CALLBACKS        0U
+#define USE_HAL_OPAMP_REGISTER_CALLBACKS      0U
+#define USE_HAL_OSPI_REGISTER_CALLBACKS       0U
+#define USE_HAL_PCD_REGISTER_CALLBACKS        0U
+#define USE_HAL_QSPI_REGISTER_CALLBACKS       0U
+#define USE_HAL_RNG_REGISTER_CALLBACKS        0U
+#define USE_HAL_RTC_REGISTER_CALLBACKS        0U
+#define USE_HAL_SAI_REGISTER_CALLBACKS        0U
+#define USE_HAL_SD_REGISTER_CALLBACKS         0U
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS  0U
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS      0U
+#define USE_HAL_SPI_REGISTER_CALLBACKS        0U
+#define USE_HAL_SWPMI_REGISTER_CALLBACKS      0U
+#define USE_HAL_TIM_REGISTER_CALLBACKS        0U
+#define USE_HAL_TSC_REGISTER_CALLBACKS        0U
+#define USE_HAL_UART_REGISTER_CALLBACKS       0U
+#define USE_HAL_USART_REGISTER_CALLBACKS      0U
+#define USE_HAL_WWDG_REGISTER_CALLBACKS       0U
+
 /* ################## SPI peripheral configuration ########################## */
 
 /* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
@@ -224,20 +255,14 @@
 
 #ifdef HAL_RCC_MODULE_ENABLED
   #include "stm32l4xx_hal_rcc.h"
-  #include "stm32l4xx_hal_rcc_ex.h"
 #endif /* HAL_RCC_MODULE_ENABLED */
 
-#ifdef HAL_EXTI_MODULE_ENABLED
-  #include "stm32l4xx_hal_exti.h"
-#endif /* HAL_EXTI_MODULE_ENABLED */
-
 #ifdef HAL_GPIO_MODULE_ENABLED
   #include "stm32l4xx_hal_gpio.h"
 #endif /* HAL_GPIO_MODULE_ENABLED */
 
 #ifdef HAL_DMA_MODULE_ENABLED
   #include "stm32l4xx_hal_dma.h"
-  #include "stm32l4xx_hal_dma_ex.h"
 #endif /* HAL_DMA_MODULE_ENABLED */
 
 #ifdef HAL_DFSDM_MODULE_ENABLED
@@ -256,6 +281,10 @@
   #include "stm32l4xx_hal_can.h"
 #endif /* HAL_CAN_MODULE_ENABLED */
 
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+  #include "Legacy/stm32l4xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
 #ifdef HAL_COMP_MODULE_ENABLED
   #include "stm32l4xx_hal_comp.h"
 #endif /* HAL_COMP_MODULE_ENABLED */
@@ -284,6 +313,14 @@
   #include "stm32l4xx_hal_dsi.h"
 #endif /* HAL_DSI_MODULE_ENABLED */
 
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32l4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_GFXMMU_MODULE_ENABLED
+  #include "stm32l4xx_hal_gfxmmu.h"
+#endif /* HAL_GFXMMU_MODULE_ENABLED */
+
 #ifdef HAL_FIREWALL_MODULE_ENABLED
   #include "stm32l4xx_hal_firewall.h"
 #endif /* HAL_FIREWALL_MODULE_ENABLED */
@@ -296,26 +333,18 @@
   #include "stm32l4xx_hal_hash.h"
 #endif /* HAL_HASH_MODULE_ENABLED */
 
-#ifdef HAL_SRAM_MODULE_ENABLED
-  #include "stm32l4xx_hal_sram.h"
-#endif /* HAL_SRAM_MODULE_ENABLED */
-
-#ifdef HAL_MMC_MODULE_ENABLED
-  #include "stm32l4xx_hal_mmc.h"
-#endif /* HAL_MMC_MODULE_ENABLED */
-
-#ifdef HAL_NOR_MODULE_ENABLED
-  #include "stm32l4xx_hal_nor.h"
-#endif /* HAL_NOR_MODULE_ENABLED */
-
-#ifdef HAL_NAND_MODULE_ENABLED
-  #include "stm32l4xx_hal_nand.h"
-#endif /* HAL_NAND_MODULE_ENABLED */
+#ifdef HAL_HCD_MODULE_ENABLED
+  #include "stm32l4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
 
 #ifdef HAL_I2C_MODULE_ENABLED
   #include "stm32l4xx_hal_i2c.h"
 #endif /* HAL_I2C_MODULE_ENABLED */
 
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32l4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
 #ifdef HAL_IWDG_MODULE_ENABLED
   #include "stm32l4xx_hal_iwdg.h"
 #endif /* HAL_IWDG_MODULE_ENABLED */
@@ -332,6 +361,18 @@
   #include "stm32l4xx_hal_ltdc.h"
 #endif /* HAL_LTDC_MODULE_ENABLED */
 
+#ifdef HAL_MMC_MODULE_ENABLED
+  #include "stm32l4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+  #include "stm32l4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+  #include "stm32l4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
 #ifdef HAL_OPAMP_MODULE_ENABLED
   #include "stm32l4xx_hal_opamp.h"
 #endif /* HAL_OPAMP_MODULE_ENABLED */
@@ -340,9 +381,17 @@
   #include "stm32l4xx_hal_ospi.h"
 #endif /* HAL_OSPI_MODULE_ENABLED */
 
+#ifdef HAL_PCD_MODULE_ENABLED
+  #include "stm32l4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
 #ifdef HAL_PKA_MODULE_ENABLED
   #include "stm32l4xx_hal_pka.h"
-#endif /* HAL_PWR_MODULE_ENABLED */
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PSSI_MODULE_ENABLED
+  #include "stm32l4xx_hal_pssi.h"
+#endif /* HAL_PSSI_MODULE_ENABLED */
 
 #ifdef HAL_PWR_MODULE_ENABLED
   #include "stm32l4xx_hal_pwr.h"
@@ -368,6 +417,10 @@
   #include "stm32l4xx_hal_sd.h"
 #endif /* HAL_SD_MODULE_ENABLED */
 
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32l4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
 #ifdef HAL_SMBUS_MODULE_ENABLED
   #include "stm32l4xx_hal_smbus.h"
 #endif /* HAL_SMBUS_MODULE_ENABLED */
@@ -376,6 +429,10 @@
   #include "stm32l4xx_hal_spi.h"
 #endif /* HAL_SPI_MODULE_ENABLED */
 
+#ifdef HAL_SRAM_MODULE_ENABLED
+  #include "stm32l4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
 #ifdef HAL_SWPMI_MODULE_ENABLED
   #include "stm32l4xx_hal_swpmi.h"
 #endif /* HAL_SWPMI_MODULE_ENABLED */
@@ -396,39 +453,15 @@
   #include "stm32l4xx_hal_usart.h"
 #endif /* HAL_USART_MODULE_ENABLED */
 
-#ifdef HAL_IRDA_MODULE_ENABLED
-  #include "stm32l4xx_hal_irda.h"
-#endif /* HAL_IRDA_MODULE_ENABLED */
-
-#ifdef HAL_SMARTCARD_MODULE_ENABLED
-  #include "stm32l4xx_hal_smartcard.h"
-#endif /* HAL_SMARTCARD_MODULE_ENABLED */
-
 #ifdef HAL_WWDG_MODULE_ENABLED
   #include "stm32l4xx_hal_wwdg.h"
 #endif /* HAL_WWDG_MODULE_ENABLED */
 
-#ifdef HAL_PCD_MODULE_ENABLED
-  #include "stm32l4xx_hal_pcd.h"
-#endif /* HAL_PCD_MODULE_ENABLED */
-
-#ifdef HAL_HCD_MODULE_ENABLED
-  #include "stm32l4xx_hal_hcd.h"
-#endif /* HAL_HCD_MODULE_ENABLED */
-
-#ifdef HAL_GFXMMU_MODULE_ENABLED
-  #include "stm32l4xx_hal_gfxmmu.h"
-#endif /* HAL_GFXMMU_MODULE_ENABLED */
-
-#ifdef HAL_PSSI_MODULE_ENABLED
-  #include "stm32l4xx_hal_pssi.h"
-#endif /* HAL_PSSI_MODULE_ENABLED */
-
 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
 /**
   * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
+  * @param  expr If expr is false, it calls assert_failed function
   *         which reports the name of the source file and the source
   *         line number of the call that failed.
   *         If expr is true, it returns no value.
@@ -436,7 +469,7 @@
   */
   #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
 /* Exported functions ------------------------------------------------------- */
-  void assert_failed(char *file, uint32_t line);
+  void assert_failed(uint8_t *file, uint32_t line);
 #else
   #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
@@ -445,6 +478,6 @@
 }
 #endif
 
-#endif /* __STM32L4xx_HAL_CONF_H */
+#endif /* STM32L4xx_HAL_CONF_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+ 1 - 1
bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Inc/stm32l4xx_it.h

@@ -39,7 +39,7 @@
 
 #ifdef __cplusplus
  extern "C" {
-#endif 
+#endif
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */

+ 333 - 327
bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/STM32L475VE.ioc

@@ -1,363 +1,369 @@
 #MicroXplorer Configuration settings - do not modify
+ADC1.Channel-15\#ChannelRegularConversion=ADC_CHANNEL_14
+ADC1.IPParameters=Rank-15\#ChannelRegularConversion,Channel-15\#ChannelRegularConversion,SamplingTime-15\#ChannelRegularConversion,OffsetNumber-15\#ChannelRegularConversion,NbrOfConversionFlag,master
+ADC1.NbrOfConversionFlag=1
+ADC1.OffsetNumber-15\#ChannelRegularConversion=ADC_OFFSET_NONE
+ADC1.Rank-15\#ChannelRegularConversion=1
+ADC1.SamplingTime-15\#ChannelRegularConversion=ADC_SAMPLETIME_2CYCLES_5
+ADC1.master=1
+File.Version=6
+KeepUserPlacement=false
 Mcu.Family=STM32L4
-ProjectManager.MainLocation=Src
-PA6.Mode=Full_Duplex_Master
-SH.S_TIM4_CH2.ConfNb=1
-RCC.USART1Freq_Value=80000000
-RCC.SAI1Freq_Value=13714285.714285715
-USART2.IPParameters=VirtualMode-Asynchronous
-RCC.CortexFreq_Value=80000000
-SPI3.Direction=SPI_DIRECTION_2LINES
-VP_TIM17_VS_ClockSourceINT.Mode=Enable_Timer
-SPI3.VirtualType=VM_MASTER
-ProjectManager.KeepUserCode=true
-Mcu.UserName=STM32L475VETx
-SPI1.VirtualType=VM_MASTER
-SPI2.VirtualType=VM_MASTER
-PH0-OSC_IN\ (PH0).Signal=RCC_OSC_IN
-TIM1.IPParameters=Channel-PWM Generation1 CH1
-PC10.Signal=SDMMC1_D2
-PC12.Signal=SDMMC1_CK
-VP_IWDG_VS_IWDG.Mode=IWDG_Activate
-RCC.PLLSAI1RoutputFreq_Value=48000000
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_USART2_UART_Init-USART2-false-HAL-true,5-MX_QUADSPI_Init-QUADSPI-false-HAL-true,6-MX_SPI1_Init-SPI1-false-HAL-true,7-MX_SPI2_Init-SPI2-false-HAL-true,8-MX_RTC_Init-RTC-false-HAL-true,9-MX_ADC1_Init-ADC1-false-HAL-true,10-MX_IWDG_Init-IWDG-false-HAL-true,11-MX_TIM17_Init-TIM17-false-HAL-true,12-MX_TIM16_Init-TIM16-false-HAL-true,13-MX_TIM15_Init-TIM15-false-HAL-true,14-MX_TIM4_Init-TIM4-false-HAL-true,15-MX_TIM1_Init-TIM1-false-HAL-true,16-MX_SAI1_Init-SAI1-false-HAL-true,17-MX_SPI3_Init-SPI3-false-HAL-true,18-MX_TIM2_Init-TIM2-false-HAL-true,19-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-false-HAL-true
-SAI1.VirtualProtocol-SAI_A_BASIC=VM_BASIC_PROTOCOL
-VP_RTC_VS_RTC_Activate.Mode=RTC_Enabled
-SAI1.Instance-SAI_A_MasterWithClock=SAI$Index_Block_A
-PA11.Mode=Device_Only
-RCC.RTCFreq_Value=32768
-RCC.USART2Freq_Value=80000000
-PC15-OSC32_OUT\ (PC15).Mode=LSE-External-Oscillator
-SH.S_TIM1_CH1.ConfNb=1
-USART1.IPParameters=VirtualMode-Asynchronous
-PB11.Signal=S_TIM2_CH4
-PB13.Signal=SPI2_SCK
-PB15.Signal=SPI2_MOSI
-PinOutPanel.RotationAngle=0
-RCC.MCO1PinFreq_Value=80000000
-RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
-ProjectManager.StackSize=0x400
-PB3\ (JTDO-TRACESWO).Signal=SPI3_SCK
-PC14-OSC32_IN\ (PC14).Mode=LSE-External-Oscillator
-PA14\ (JTCK-SWCLK).Signal=SYS_JTCK-SWCLK
-RCC.I2C3Freq_Value=80000000
-RCC.LPTIM1Freq_Value=80000000
-Mcu.IP4=QUADSPI
-Mcu.IP5=RCC
-RCC.FCLKCortexFreq_Value=80000000
-Mcu.IP2=LPTIM1
-NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-Mcu.IP3=NVIC
 Mcu.IP0=ADC1
-Mcu.IP1=IWDG
-PA12.Signal=USB_OTG_FS_DP
-Mcu.UserConstants=
-PE11.Mode=Single Bank
-RCC.VCOSAI1OutputFreq_Value=96000000
-SAI1.VirtualMode-SAI_B_SyncSlave=VM_SLAVE
-RCC.SDMMCFreq_Value=48000000
-Mcu.ThirdPartyNb=0
-SPI1.Direction=SPI_DIRECTION_2LINES
-RCC.HCLKFreq_Value=80000000
-PE2.Mode=SAI_A_MasterWithClock
-Mcu.IPNb=22
-TIM2.IPParameters=Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4
-ProjectManager.PreviousToolchain=
-RCC.APB2TimFreq_Value=80000000
-VP_SAI1_VP_$IpInstance_SAIB_SAI_BASIC.Signal=SAI1_VP_$IpInstance_SAIB_SAI_BASIC
-SPI1.CalculateBaudRate=40.0 MBits/s
-Mcu.Pin6=PC15-OSC32_OUT (PC15)
-RCC.SAI2Freq_Value=13714285.714285715
-Mcu.Pin7=PH0-OSC_IN (PH0)
-VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT
-Mcu.Pin8=PH1-OSC_OUT (PH1)
-PE5.Signal=SAI1_SCK_A
-Mcu.Pin9=PA2
-RCC.AHBFreq_Value=80000000
-PB13.Locked=true
+Mcu.IP1=DAC1
+Mcu.IP10=SPI1
+Mcu.IP11=SPI2
+Mcu.IP12=SPI3
+Mcu.IP13=SYS
+Mcu.IP14=TIM1
+Mcu.IP15=TIM2
+Mcu.IP16=TIM4
+Mcu.IP17=TIM15
+Mcu.IP18=TIM16
+Mcu.IP19=TIM17
+Mcu.IP2=IWDG
+Mcu.IP20=USART1
+Mcu.IP21=USART2
+Mcu.IP22=USB_OTG_FS
+Mcu.IP3=LPTIM1
+Mcu.IP4=NVIC
+Mcu.IP5=QUADSPI
+Mcu.IP6=RCC
+Mcu.IP7=RTC
+Mcu.IP8=SAI1
+Mcu.IP9=SDMMC1
+Mcu.IPNb=23
+Mcu.Name=STM32L475V(C-E-G)Tx
+Mcu.Package=LQFP100
 Mcu.Pin0=PE2
-PE14.Locked=true
 Mcu.Pin1=PE3
+Mcu.Pin10=PA3
+Mcu.Pin11=PA4
+Mcu.Pin12=PA5
+Mcu.Pin13=PA6
+Mcu.Pin14=PA7
+Mcu.Pin15=PC5
+Mcu.Pin16=PE9
+Mcu.Pin17=PE10
+Mcu.Pin18=PE11
+Mcu.Pin19=PE12
 Mcu.Pin2=PE4
+Mcu.Pin20=PE13
+Mcu.Pin21=PE14
+Mcu.Pin22=PE15
+Mcu.Pin23=PB10
+Mcu.Pin24=PB11
+Mcu.Pin25=PB13
+Mcu.Pin26=PB14
+Mcu.Pin27=PB15
+Mcu.Pin28=PC8
+Mcu.Pin29=PC9
 Mcu.Pin3=PE5
-RCC.USART3Freq_Value=80000000
+Mcu.Pin30=PA9
+Mcu.Pin31=PA10
+Mcu.Pin32=PA11
+Mcu.Pin33=PA12
+Mcu.Pin34=PA13 (JTMS-SWDIO)
+Mcu.Pin35=PA14 (JTCK-SWCLK)
+Mcu.Pin36=PC10
+Mcu.Pin37=PC11
+Mcu.Pin38=PC12
+Mcu.Pin39=PD2
 Mcu.Pin4=PE6
+Mcu.Pin40=PB3 (JTDO-TRACESWO)
+Mcu.Pin41=PB5
+Mcu.Pin42=PB7
+Mcu.Pin43=PB8
+Mcu.Pin44=VP_IWDG_VS_IWDG
+Mcu.Pin45=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
+Mcu.Pin46=VP_RTC_VS_RTC_Activate
+Mcu.Pin47=VP_SAI1_VP_$IpInstance_SAIA_SAI_BASIC
+Mcu.Pin48=VP_SAI1_VP_$IpInstance_SAIB_SAI_BASIC
+Mcu.Pin49=VP_SYS_VS_Systick
 Mcu.Pin5=PC14-OSC32_IN (PC14)
-ProjectManager.ProjectBuild=false
-PH1-OSC_OUT\ (PH1).Mode=HSE-External-Oscillator
-RCC.HSE_VALUE=8000000
-TIM4.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
-NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+Mcu.Pin50=VP_TIM1_VS_ClockSourceINT
+Mcu.Pin51=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin52=VP_TIM4_VS_ClockSourceINT
+Mcu.Pin53=VP_TIM15_VS_ClockSourceINT
+Mcu.Pin54=VP_TIM16_VS_ClockSourceINT
+Mcu.Pin55=VP_TIM17_VS_ClockSourceINT
+Mcu.Pin6=PC15-OSC32_OUT (PC15)
+Mcu.Pin7=PH0-OSC_IN (PH0)
+Mcu.Pin8=PH1-OSC_OUT (PH1)
+Mcu.Pin9=PA2
+Mcu.PinsNb=56
+Mcu.ThirdPartyNb=0
+Mcu.UserConstants=
+Mcu.UserName=STM32L475VETx
+MxCube.Version=6.0.1
+MxDb.Version=DB.6.0.0
+NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-SH.ADCx_IN14.ConfNb=1
-Mcu.IP10=SPI2
-USART2.VirtualMode-Asynchronous=VM_ASYNC
+NVIC.ForceEnableDMAVector=true
+NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.OTG_FS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
+NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
-Mcu.IP12=SYS
-Mcu.IP11=SPI3
-ADC1.OffsetNumber-15\#ChannelRegularConversion=ADC_OFFSET_NONE
-Mcu.IP18=TIM17
-ProjectManager.FirmwarePackage=STM32Cube FW_L4 V1.15.1
-Mcu.IP17=TIM16
-MxDb.Version=DB.5.0.60
-PE15.Locked=true
-Mcu.IP19=USART1
-Mcu.IP14=TIM2
-Mcu.IP13=TIM1
-PE13.Signal=QUADSPI_BK1_IO1
-Mcu.IP16=TIM15
-ProjectManager.BackupPrevious=false
-Mcu.IP15=TIM4
-RCC.VCOInputFreq_Value=8000000
-TIM1.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
-PE9.Signal=S_TIM1_CH1
+NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+PA10.Mode=Asynchronous
+PA10.Signal=USART1_RX
+PA11.Mode=Device_Only
+PA11.Signal=USB_OTG_FS_DM
+PA12.Mode=Device_Only
+PA12.Signal=USB_OTG_FS_DP
+PA13\ (JTMS-SWDIO).Mode=Serial_Wire
+PA13\ (JTMS-SWDIO).Signal=SYS_JTMS-SWDIO
+PA14\ (JTCK-SWCLK).Mode=Serial_Wire
+PA14\ (JTCK-SWCLK).Signal=SYS_JTCK-SWCLK
+PA2.Mode=Asynchronous
+PA2.Signal=USART2_TX
+PA3.Mode=Asynchronous
+PA3.Signal=USART2_RX
+PA4.Signal=COMP_DAC11_group
+PA5.Mode=Full_Duplex_Master
+PA5.Signal=SPI1_SCK
+PA6.Mode=Full_Duplex_Master
+PA6.Signal=SPI1_MISO
+PA7.Mode=Full_Duplex_Master
+PA7.Signal=SPI1_MOSI
+PA9.Mode=Asynchronous
+PA9.Signal=USART1_TX
+PB10.Signal=S_TIM2_CH3
+PB11.Signal=S_TIM2_CH4
+PB13.Locked=true
+PB13.Mode=Full_Duplex_Master
+PB13.Signal=SPI2_SCK
+PB14.Locked=true
 PB14.Mode=Full_Duplex_Master
+PB14.Signal=SPI2_MISO
+PB15.Locked=true
+PB15.Mode=Full_Duplex_Master
+PB15.Signal=SPI2_MOSI
+PB3\ (JTDO-TRACESWO).Locked=true
+PB3\ (JTDO-TRACESWO).Mode=TX_Only_Simplex_Unidirect_Master
+PB3\ (JTDO-TRACESWO).Signal=SPI3_SCK
+PB5.Locked=true
 PB5.Mode=TX_Only_Simplex_Unidirect_Master
-File.Version=6
-PC9.Mode=SD_4_bits_Wide_bus
-SPI2.CalculateBaudRate=40.0 MBits/s
-SAI1.InitProtocol-SAI_A_MasterWithClock=Enable
-SH.S_TIM4_CH2.0=TIM4_CH2,PWM Generation2 CH2
-PE2.Signal=SAI1_MCLK_A
+PB5.Signal=SPI3_MOSI
+PB7.Locked=true
 PB7.Signal=S_TIM4_CH2
-Mcu.IP21=USB_OTG_FS
 PB8.Locked=true
-Mcu.IP20=USART2
-RCC.PLLRCLKFreq_Value=80000000
+PB8.Signal=S_TIM4_CH3
+PC10.Mode=SD_4_bits_Wide_bus
+PC10.Signal=SDMMC1_D2
+PC11.Mode=SD_4_bits_Wide_bus
+PC11.Signal=SDMMC1_D3
+PC12.Mode=SD_4_bits_Wide_bus
+PC12.Signal=SDMMC1_CK
+PC14-OSC32_IN\ (PC14).Mode=LSE-External-Oscillator
+PC14-OSC32_IN\ (PC14).Signal=RCC_OSC32_IN
+PC15-OSC32_OUT\ (PC15).Mode=LSE-External-Oscillator
+PC15-OSC32_OUT\ (PC15).Signal=RCC_OSC32_OUT
+PC5.Signal=ADCx_IN14
+PC8.Mode=SD_4_bits_Wide_bus
+PC8.Signal=SDMMC1_D0
+PC9.Mode=SD_4_bits_Wide_bus
+PC9.Signal=SDMMC1_D1
+PD2.Mode=SD_4_bits_Wide_bus
+PD2.Signal=SDMMC1_CMD
+PE10.Mode=Single Bank
+PE10.Signal=QUADSPI_CLK
+PE11.Mode=Single Bank
+PE11.Signal=QUADSPI_NCS
+PE12.Locked=true
+PE12.Mode=Single Bank
+PE12.Signal=QUADSPI_BK1_IO0
+PE13.Locked=true
 PE13.Mode=Single Bank
-NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+PE13.Signal=QUADSPI_BK1_IO1
+PE14.Locked=true
+PE14.Mode=Single Bank
+PE14.Signal=QUADSPI_BK1_IO2
+PE15.Locked=true
+PE15.Mode=Single Bank
+PE15.Signal=QUADSPI_BK1_IO3
+PE2.Mode=SAI_A_MasterWithClock
+PE2.Signal=SAI1_MCLK_A
+PE3.Mode=SAI_B_SyncSlave
+PE3.Signal=SAI1_SD_B
 PE4.Mode=SAI_A_MasterWithClock
-ADC1.Channel-15\#ChannelRegularConversion=ADC_CHANNEL_14
 PE4.Signal=SAI1_FS_A
-PE10.Signal=QUADSPI_CLK
-VP_TIM15_VS_ClockSourceINT.Signal=TIM15_VS_ClockSourceINT
+PE5.Mode=SAI_A_MasterWithClock
+PE5.Signal=SAI1_SCK_A
+PE6.Mode=SAI_A_MasterWithClock
+PE6.Signal=SAI1_SD_A
+PE9.Signal=S_TIM1_CH1
+PH0-OSC_IN\ (PH0).Mode=HSE-External-Oscillator
+PH0-OSC_IN\ (PH0).Signal=RCC_OSC_IN
+PH1-OSC_OUT\ (PH1).Mode=HSE-External-Oscillator
+PH1-OSC_OUT\ (PH1).Signal=RCC_OSC_OUT
+PinOutPanel.RotationAngle=0
+ProjectManager.AskForMigrate=true
+ProjectManager.BackupPrevious=false
+ProjectManager.CompilerOptimize=6
+ProjectManager.ComputerToolchain=false
+ProjectManager.CoupleFile=false
+ProjectManager.CustomerFirmwarePackage=
+ProjectManager.DefaultFWLocation=true
+ProjectManager.DeletePrevious=true
+ProjectManager.DeviceId=STM32L475VETx
+ProjectManager.FirmwarePackage=STM32Cube FW_L4 V1.16.0
+ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
-VP_TIM1_VS_ClockSourceINT.Mode=Internal
+ProjectManager.HeapSize=0x200
+ProjectManager.KeepUserCode=true
+ProjectManager.LastFirmware=true
+ProjectManager.LibraryCopy=0
+ProjectManager.MainLocation=Src
+ProjectManager.NoMain=false
+ProjectManager.PreviousToolchain=
+ProjectManager.ProjectBuild=false
+ProjectManager.ProjectFileName=STM32L475VE.ioc
 ProjectManager.ProjectName=STM32L475VE
-ADC1.Rank-15\#ChannelRegularConversion=1
-SAI1.OutputDrive-SAI_A_MasterWithClock=SAI_OUTPUTDRIVE_ENABLE
-Mcu.Package=LQFP100
-SAI1.AudioFrequency-SAI_A_MasterWithClock=SAI_AUDIO_FREQUENCY_44K
-PA6.Signal=SPI1_MISO
-SPI2.Mode=SPI_MODE_MASTER
-SPI3.Mode=SPI_MODE_MASTER
-SH.ADCx_IN14.0=ADC1_IN14,IN14-Single-Ended
-NVIC.OTG_FS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+ProjectManager.RegisterCallBack=
+ProjectManager.StackSize=0x400
+ProjectManager.TargetToolchain=MDK-ARM V5
 ProjectManager.ToolChainLocation=
-RCC.LSI_VALUE=32000
-VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Mode=Counts__internal_clock_event_00
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
-RCC.LSCOPinFreq_Value=32000
-PA10.Signal=USART1_RX
-USB_OTG_FS.VirtualMode=Device_Only
-RCC.DFSDMFreq_Value=80000000
-PC11.Mode=SD_4_bits_Wide_bus
-ADC1.SamplingTime-15\#ChannelRegularConversion=ADC_SAMPLETIME_2CYCLES_5
-RCC.PLLPoutputFreq_Value=22857142.85714286
+ProjectManager.UnderRoot=false
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_USART2_UART_Init-USART2-false-HAL-true,5-MX_QUADSPI_Init-QUADSPI-false-HAL-true,6-MX_SPI1_Init-SPI1-false-HAL-true,7-MX_SPI2_Init-SPI2-false-HAL-true,8-MX_RTC_Init-RTC-false-HAL-true,9-MX_ADC1_Init-ADC1-false-HAL-true,10-MX_IWDG_Init-IWDG-false-HAL-true,11-MX_TIM17_Init-TIM17-false-HAL-true,12-MX_TIM16_Init-TIM16-false-HAL-true,13-MX_TIM15_Init-TIM15-false-HAL-true,14-MX_TIM4_Init-TIM4-false-HAL-true,15-MX_TIM1_Init-TIM1-false-HAL-true,16-MX_SAI1_Init-SAI1-false-HAL-true,17-MX_SPI3_Init-SPI3-false-HAL-true,18-MX_TIM2_Init-TIM2-false-HAL-true,19-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-false-HAL-true,20-MX_LPTIM1_Init-LPTIM1-false-HAL-true,21-MX_SDMMC1_SD_Init-SDMMC1-false-HAL-true,22-MX_DAC1_Init-DAC1-false-HAL-true
+RCC.ADCFreq_Value=48000000
+RCC.AHBFreq_Value=80000000
+RCC.APB1Freq_Value=80000000
 RCC.APB1TimFreq_Value=80000000
-NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+RCC.APB2Freq_Value=80000000
+RCC.APB2TimFreq_Value=80000000
+RCC.CortexFreq_Value=80000000
+RCC.DFSDMFreq_Value=80000000
+RCC.FCLKCortexFreq_Value=80000000
+RCC.FamilyName=M
+RCC.HCLKFreq_Value=80000000
+RCC.HSE_VALUE=8000000
+RCC.HSI_VALUE=16000000
+RCC.I2C1Freq_Value=80000000
+RCC.I2C2Freq_Value=80000000
+RCC.I2C3Freq_Value=80000000
+RCC.IPParameters=ADCFreq_Value,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,DFSDMFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSI_VALUE,MCO1PinFreq_Value,MSI_VALUE,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PLLSAI1N,PLLSAI1PoutputFreq_Value,PLLSAI1QoutputFreq_Value,PLLSAI1RoutputFreq_Value,PLLSAI2PoutputFreq_Value,PLLSAI2RoutputFreq_Value,PLLSourceVirtual,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SAI1Freq_Value,SAI2Freq_Value,SDMMCFreq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,UART4Freq_Value,UART5Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USBFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VCOSAI1OutputFreq_Value,VCOSAI2OutputFreq_Value
+RCC.LPTIM1Freq_Value=80000000
+RCC.LPTIM2Freq_Value=80000000
 RCC.LPUART1Freq_Value=80000000
-SPI3.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
-SPI2.Direction=SPI_DIRECTION_2LINES
-PC5.Signal=ADCx_IN14
-USB_OTG_FS.IPParameters=VirtualMode
-PB13.Mode=Full_Duplex_Master
-SH.S_TIM2_CH4.ConfNb=1
-PA13\ (JTMS-SWDIO).Signal=SYS_JTMS-SWDIO
-PH0-OSC_IN\ (PH0).Mode=HSE-External-Oscillator
-PE12.Locked=true
-PE3.Mode=SAI_B_SyncSlave
-ProjectManager.CustomerFirmwarePackage=
-PB15.Locked=true
-PB3\ (JTDO-TRACESWO).Locked=true
-RCC.PLLSAI1N=12
-PA3.Signal=USART2_RX
-PA5.Mode=Full_Duplex_Master
-PE12.Mode=Single Bank
-VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
+RCC.LSCOPinFreq_Value=32000
+RCC.LSI_VALUE=32000
+RCC.MCO1PinFreq_Value=80000000
 RCC.MSI_VALUE=4000000
-RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE
-PA14\ (JTCK-SWCLK).Mode=Serial_Wire
+RCC.PLLN=20
+RCC.PLLPoutputFreq_Value=22857142.85714286
 RCC.PLLQoutputFreq_Value=80000000
-ProjectManager.ProjectFileName=STM32L475VE.ioc
-TIM2.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
-PA7.Mode=Full_Duplex_Master
-PA10.Mode=Asynchronous
-Mcu.PinsNb=55
-VP_SAI1_VP_$IpInstance_SAIA_SAI_BASIC.Mode=SAI_A_BASIC
-ProjectManager.NoMain=false
-SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
-ADC1.IPParameters=Rank-15\#ChannelRegularConversion,Channel-15\#ChannelRegularConversion,SamplingTime-15\#ChannelRegularConversion,OffsetNumber-15\#ChannelRegularConversion,NbrOfConversionFlag,master
-SAI1.MClockEnable-SAI_A_MasterWithClock=SAI_MASTERCLOCK_ENABLE
-PC11.Signal=SDMMC1_D3
+RCC.PLLRCLKFreq_Value=80000000
+RCC.PLLSAI1N=12
+RCC.PLLSAI1PoutputFreq_Value=13714285.714285715
+RCC.PLLSAI1QoutputFreq_Value=48000000
+RCC.PLLSAI1RoutputFreq_Value=48000000
+RCC.PLLSAI2PoutputFreq_Value=9142857.142857144
+RCC.PLLSAI2RoutputFreq_Value=32000000
+RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE
+RCC.PWRFreq_Value=80000000
+RCC.RNGFreq_Value=48000000
+RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
+RCC.RTCFreq_Value=32768
+RCC.SAI1Freq_Value=13714285.714285715
+RCC.SAI2Freq_Value=13714285.714285715
+RCC.SDMMCFreq_Value=48000000
 RCC.SWPMI1Freq_Value=80000000
-PC8.Signal=SDMMC1_D0
-PE10.Mode=Single Bank
-PC10.Mode=SD_4_bits_Wide_bus
-VP_SAI1_VP_$IpInstance_SAIA_SAI_BASIC.Signal=SAI1_VP_$IpInstance_SAIA_SAI_BASIC
-ProjectManager.DefaultFWLocation=true
-SAI1.ErrorAudioFreq-SAI_A_MasterWithClock=-72.09 %
-PC15-OSC32_OUT\ (PC15).Signal=RCC_OSC32_OUT
-VP_TIM16_VS_ClockSourceINT.Mode=Enable_Timer
-ProjectManager.DeletePrevious=true
-PB14.Locked=true
+RCC.SYSCLKFreq_VALUE=80000000
+RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
+RCC.UART4Freq_Value=80000000
+RCC.UART5Freq_Value=80000000
+RCC.USART1Freq_Value=80000000
+RCC.USART2Freq_Value=80000000
+RCC.USART3Freq_Value=80000000
+RCC.USBFreq_Value=48000000
+RCC.VCOInputFreq_Value=8000000
+RCC.VCOOutputFreq_Value=160000000
+RCC.VCOSAI1OutputFreq_Value=96000000
 RCC.VCOSAI2OutputFreq_Value=64000000
-VP_TIM17_VS_ClockSourceINT.Signal=TIM17_VS_ClockSourceINT
-RCC.FamilyName=M
-PH1-OSC_OUT\ (PH1).Signal=RCC_OSC_OUT
-USART1.VirtualMode-Asynchronous=VM_ASYNC
-PA3.Mode=Asynchronous
+SAI1.AudioFrequency-SAI_A_MasterWithClock=SAI_AUDIO_FREQUENCY_44K
+SAI1.ErrorAudioFreq-SAI_A_MasterWithClock=-72.09 %
+SAI1.IPParameters=Instance-SAI_A_MasterWithClock,VirtualMode-SAI_A_MasterWithClock,MClockEnable-SAI_A_MasterWithClock,RealAudioFreq-SAI_A_MasterWithClock,ErrorAudioFreq-SAI_A_MasterWithClock,InitProtocol-SAI_A_MasterWithClock,VirtualProtocol-SAI_A_BASIC,AudioFrequency-SAI_A_MasterWithClock,OutputDrive-SAI_A_MasterWithClock,Instance-SAI_B_SyncSlave,VirtualMode-SAI_B_SyncSlave,InitProtocol-SAI_B_SyncSlave,VirtualProtocol-SAI_B_BASIC
+SAI1.InitProtocol-SAI_A_MasterWithClock=Enable
+SAI1.InitProtocol-SAI_B_SyncSlave=Enable
+SAI1.Instance-SAI_A_MasterWithClock=SAI$Index_Block_A
+SAI1.Instance-SAI_B_SyncSlave=SAI$Index_Block_B
+SAI1.MClockEnable-SAI_A_MasterWithClock=SAI_MASTERCLOCK_ENABLE
+SAI1.OutputDrive-SAI_A_MasterWithClock=SAI_OUTPUTDRIVE_ENABLE
 SAI1.RealAudioFreq-SAI_A_MasterWithClock=53.571 KHz
-PA9.Mode=Asynchronous
+SAI1.VirtualMode-SAI_A_MasterWithClock=VM_MASTER
+SAI1.VirtualMode-SAI_B_SyncSlave=VM_SLAVE
+SAI1.VirtualProtocol-SAI_A_BASIC=VM_BASIC_PROTOCOL
+SAI1.VirtualProtocol-SAI_B_BASIC=VM_BASIC_PROTOCOL
+SH.ADCx_IN14.0=ADC1_IN14,IN14-Single-Ended
+SH.ADCx_IN14.ConfNb=1
+SH.COMP_DAC11_group.0=DAC1_OUT1,DAC_OUT1
+SH.COMP_DAC11_group.ConfNb=1
 SH.S_TIM1_CH1.0=TIM1_CH1,PWM Generation1 CH1
-VP_TIM4_VS_ClockSourceINT.Signal=TIM4_VS_ClockSourceINT
-ProjectManager.TargetToolchain=MDK-ARM V5
-TIM4.IPParameters=Channel-PWM Generation3 CH3,Channel-PWM Generation2 CH2
-Mcu.Pin51=VP_TIM4_VS_ClockSourceINT
-Mcu.Pin52=VP_TIM15_VS_ClockSourceINT
-Mcu.Pin50=VP_TIM2_VS_ClockSourceINT
+SH.S_TIM1_CH1.ConfNb=1
+SH.S_TIM2_CH3.0=TIM2_CH3,PWM Generation3 CH3
+SH.S_TIM2_CH3.ConfNb=1
+SH.S_TIM2_CH4.0=TIM2_CH4,PWM Generation4 CH4
+SH.S_TIM2_CH4.ConfNb=1
+SH.S_TIM4_CH2.0=TIM4_CH2,PWM Generation2 CH2
+SH.S_TIM4_CH2.ConfNb=1
 SH.S_TIM4_CH3.0=TIM4_CH3,PWM Generation3 CH3
-Mcu.Pin53=VP_TIM16_VS_ClockSourceINT
-Mcu.Pin54=VP_TIM17_VS_ClockSourceINT
-PA9.Signal=USART1_TX
-VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
-PB5.Locked=true
-SPI2.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
-RCC.USBFreq_Value=48000000
-PE11.Signal=QUADSPI_NCS
-Mcu.Pin48=VP_SYS_VS_Systick
-Mcu.Pin49=VP_TIM1_VS_ClockSourceINT
-RCC.PLLSAI1PoutputFreq_Value=13714285.714285715
-Mcu.Pin46=VP_SAI1_VP_$IpInstance_SAIA_SAI_BASIC
-Mcu.Pin47=VP_SAI1_VP_$IpInstance_SAIB_SAI_BASIC
-PB10.Signal=S_TIM2_CH3
-SAI1.VirtualMode-SAI_A_MasterWithClock=VM_MASTER
 SH.S_TIM4_CH3.ConfNb=1
-VP_SAI1_VP_$IpInstance_SAIB_SAI_BASIC.Mode=SAI_B_BASIC
-PB14.Signal=SPI2_MISO
-PD2.Mode=SD_4_bits_Wide_bus
-RCC.PLLSAI2RoutputFreq_Value=32000000
-PA5.Signal=SPI1_SCK
-Mcu.Pin40=PB5
-Mcu.Pin41=PB7
-PC12.Mode=SD_4_bits_Wide_bus
-Mcu.Pin44=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
-Mcu.Pin45=VP_RTC_VS_RTC_Activate
-Mcu.Pin42=PB8
-board=custom
-Mcu.Pin43=VP_IWDG_VS_IWDG
-SAI1.IPParameters=Instance-SAI_A_MasterWithClock,VirtualMode-SAI_A_MasterWithClock,MClockEnable-SAI_A_MasterWithClock,RealAudioFreq-SAI_A_MasterWithClock,ErrorAudioFreq-SAI_A_MasterWithClock,InitProtocol-SAI_A_MasterWithClock,VirtualProtocol-SAI_A_BASIC,AudioFrequency-SAI_A_MasterWithClock,OutputDrive-SAI_A_MasterWithClock,Instance-SAI_B_SyncSlave,VirtualMode-SAI_B_SyncSlave,InitProtocol-SAI_B_SyncSlave,VirtualProtocol-SAI_B_BASIC
-RCC.VCOOutputFreq_Value=160000000
-ProjectManager.LastFirmware=true
-PB15.Mode=Full_Duplex_Master
-TIM4.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
-RCC.APB2Freq_Value=80000000
-PE14.Signal=QUADSPI_BK1_IO2
-RCC.UART4Freq_Value=80000000
-SPI3.CalculateBaudRate=40.0 MBits/s
-PE6.Mode=SAI_A_MasterWithClock
-PE15.Signal=QUADSPI_BK1_IO3
-MxCube.Version=5.6.0
-Mcu.Pin37=PC12
-Mcu.Pin38=PD2
-Mcu.Pin35=PC10
-VP_TIM2_VS_ClockSourceINT.Mode=Internal
-RCC.I2C1Freq_Value=80000000
-SH.S_TIM2_CH3.0=TIM2_CH3,PWM Generation3 CH3
-Mcu.Pin36=PC11
+SPI1.CalculateBaudRate=40.0 MBits/s
+SPI1.Direction=SPI_DIRECTION_2LINES
+SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
 SPI1.Mode=SPI_MODE_MASTER
-Mcu.Pin39=PB3 (JTDO-TRACESWO)
-PE14.Mode=Single Bank
-PB3\ (JTDO-TRACESWO).Mode=TX_Only_Simplex_Unidirect_Master
-RCC.RNGFreq_Value=48000000
-PE5.Mode=SAI_A_MasterWithClock
-RCC.PLLSAI1QoutputFreq_Value=48000000
-Mcu.Pin30=PA10
-RCC.ADCFreq_Value=48000000
-VP_SYS_VS_Systick.Mode=SysTick
+SPI1.VirtualType=VM_MASTER
+SPI2.CalculateBaudRate=40.0 MBits/s
+SPI2.Direction=SPI_DIRECTION_2LINES
+SPI2.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
+SPI2.Mode=SPI_MODE_MASTER
+SPI2.VirtualType=VM_MASTER
+SPI3.CalculateBaudRate=40.0 MBits/s
+SPI3.Direction=SPI_DIRECTION_2LINES
+SPI3.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
+SPI3.Mode=SPI_MODE_MASTER
+SPI3.VirtualType=VM_MASTER
+TIM1.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
+TIM1.IPParameters=Channel-PWM Generation1 CH1
 TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
-Mcu.Pin33=PA13 (JTMS-SWDIO)
-Mcu.Pin34=PA14 (JTCK-SWCLK)
-Mcu.Pin31=PA11
-Mcu.Pin32=PA12
-VP_TIM16_VS_ClockSourceINT.Signal=TIM16_VS_ClockSourceINT
-NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-SH.S_TIM2_CH3.ConfNb=1
-PE6.Signal=SAI1_SD_A
-RCC.UART5Freq_Value=80000000
-ProjectManager.FreePins=false
-RCC.IPParameters=ADCFreq_Value,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,DFSDMFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSI_VALUE,MCO1PinFreq_Value,MSI_VALUE,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PLLSAI1N,PLLSAI1PoutputFreq_Value,PLLSAI1QoutputFreq_Value,PLLSAI1RoutputFreq_Value,PLLSAI2PoutputFreq_Value,PLLSAI2RoutputFreq_Value,PLLSourceVirtual,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SAI1Freq_Value,SAI2Freq_Value,SDMMCFreq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,UART4Freq_Value,UART5Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USBFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VCOSAI1OutputFreq_Value,VCOSAI2OutputFreq_Value
-ProjectManager.AskForMigrate=true
-Mcu.Name=STM32L475V(C-E-G)Tx
-RCC.LPTIM2Freq_Value=80000000
-Mcu.Pin26=PB15
-PE12.Signal=QUADSPI_BK1_IO0
-Mcu.Pin27=PC8
-PA2.Signal=USART2_TX
-Mcu.Pin24=PB13
-ProjectManager.UnderRoot=false
-Mcu.Pin25=PB14
-PE13.Locked=true
-Mcu.IP8=SDMMC1
-Mcu.IP9=SPI1
-Mcu.Pin28=PC9
-Mcu.IP6=RTC
-PC8.Mode=SD_4_bits_Wide_bus
-Mcu.Pin29=PA9
-Mcu.IP7=SAI1
-ProjectManager.CoupleFile=false
-PA13\ (JTMS-SWDIO).Mode=Serial_Wire
-RCC.SYSCLKFreq_VALUE=80000000
-Mcu.Pin22=PB10
-PB5.Signal=SPI3_MOSI
-Mcu.Pin23=PB11
-Mcu.Pin20=PE14
-ADC1.master=1
-Mcu.Pin21=PE15
-PA12.Mode=Device_Only
-NVIC.ForceEnableDMAVector=true
-RCC.PLLSAI2PoutputFreq_Value=9142857.142857144
-KeepUserPlacement=false
-PC14-OSC32_IN\ (PC14).Signal=RCC_OSC32_IN
-NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-ProjectManager.CompilerOptimize=6
-SAI1.Instance-SAI_B_SyncSlave=SAI$Index_Block_B
-PA11.Signal=USB_OTG_FS_DM
+TIM2.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
+TIM2.IPParameters=Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4
+TIM4.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
+TIM4.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
+TIM4.IPParameters=Channel-PWM Generation3 CH3,Channel-PWM Generation2 CH2
+USART1.IPParameters=VirtualMode-Asynchronous
+USART1.VirtualMode-Asynchronous=VM_ASYNC
+USART2.IPParameters=VirtualMode-Asynchronous
+USART2.VirtualMode-Asynchronous=VM_ASYNC
+USB_OTG_FS.IPParameters=VirtualMode
+USB_OTG_FS.VirtualMode=Device_Only
+VP_IWDG_VS_IWDG.Mode=IWDG_Activate
 VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
+VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Mode=Counts__internal_clock_event_00
+VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Signal=LPTIM1_VS_LPTIM_counterModeInternalClock
+VP_RTC_VS_RTC_Activate.Mode=RTC_Enabled
+VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
+VP_SAI1_VP_$IpInstance_SAIA_SAI_BASIC.Mode=SAI_A_BASIC
+VP_SAI1_VP_$IpInstance_SAIA_SAI_BASIC.Signal=SAI1_VP_$IpInstance_SAIA_SAI_BASIC
+VP_SAI1_VP_$IpInstance_SAIB_SAI_BASIC.Mode=SAI_B_BASIC
+VP_SAI1_VP_$IpInstance_SAIB_SAI_BASIC.Signal=SAI1_VP_$IpInstance_SAIB_SAI_BASIC
+VP_SYS_VS_Systick.Mode=SysTick
+VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM15_VS_ClockSourceINT.Mode=Internal
-ProjectManager.HeapSize=0x200
-Mcu.Pin15=PE9
-NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-Mcu.Pin16=PE10
-Mcu.Pin13=PA7
-SH.S_TIM2_CH4.0=TIM2_CH4,PWM Generation4 CH4
-Mcu.Pin14=PC5
-Mcu.Pin19=PE13
-ProjectManager.ComputerToolchain=false
-Mcu.Pin17=PE11
-RCC.HSI_VALUE=16000000
-Mcu.Pin18=PE12
+VP_TIM15_VS_ClockSourceINT.Signal=TIM15_VS_ClockSourceINT
+VP_TIM16_VS_ClockSourceINT.Mode=Enable_Timer
+VP_TIM16_VS_ClockSourceINT.Signal=TIM16_VS_ClockSourceINT
+VP_TIM17_VS_ClockSourceINT.Mode=Enable_Timer
+VP_TIM17_VS_ClockSourceINT.Signal=TIM17_VS_ClockSourceINT
+VP_TIM1_VS_ClockSourceINT.Mode=Internal
+VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
+VP_TIM2_VS_ClockSourceINT.Mode=Internal
+VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT
 VP_TIM4_VS_ClockSourceINT.Mode=Internal
-SAI1.VirtualProtocol-SAI_B_BASIC=VM_BASIC_PROTOCOL
-NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
-ADC1.NbrOfConversionFlag=1
-Mcu.Pin11=PA5
-Mcu.Pin12=PA6
-RCC.PLLN=20
-Mcu.Pin10=PA3
-PB7.Locked=true
-PE3.Signal=SAI1_SD_B
-PA2.Mode=Asynchronous
-PB8.Signal=S_TIM4_CH3
-VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Signal=LPTIM1_VS_LPTIM_counterModeInternalClock
-RCC.PWRFreq_Value=80000000
-PC9.Signal=SDMMC1_D1
-PD2.Signal=SDMMC1_CMD
-RCC.I2C2Freq_Value=80000000
-RCC.APB1Freq_Value=80000000
-SAI1.InitProtocol-SAI_B_SyncSlave=Enable
-ProjectManager.DeviceId=STM32L475VETx
-ProjectManager.LibraryCopy=0
-PE15.Mode=Single Bank
-PA7.Signal=SPI1_MOSI
+VP_TIM4_VS_ClockSourceINT.Signal=TIM4_VS_ClockSourceINT
+board=custom

+ 61 - 17
bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Src/main.c

@@ -37,7 +37,6 @@
   ******************************************************************************
   */
 /* USER CODE END Header */
-
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 
@@ -64,6 +63,8 @@
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc1;
 
+DAC_HandleTypeDef hdac1;
+
 IWDG_HandleTypeDef hiwdg;
 
 LPTIM_HandleTypeDef hlptim1;
@@ -120,6 +121,7 @@ static void MX_TIM2_Init(void);
 static void MX_USB_OTG_FS_PCD_Init(void);
 static void MX_LPTIM1_Init(void);
 static void MX_SDMMC1_SD_Init(void);
+static void MX_DAC1_Init(void);
 /* USER CODE BEGIN PFP */
 /* Private function prototypes -----------------------------------------------*/
 
@@ -177,6 +179,7 @@ int main(void)
   MX_USB_OTG_FS_PCD_Init();
   MX_LPTIM1_Init();
   MX_SDMMC1_SD_Init();
+  MX_DAC1_Init();
   /* USER CODE BEGIN 2 */
 
   /* USER CODE END 2 */
@@ -204,11 +207,12 @@ void SystemClock_Config(void)
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
   RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
 
-  /** Configure LSE Drive Capability 
+  /** Configure LSE Drive Capability
   */
   HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
-  /** Initializes the CPU, AHB and APB busses clocks 
+  /** Initializes the RCC Oscillators according to the specified parameters
+  * in the RCC_OscInitTypeDef structure.
   */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE
                               |RCC_OSCILLATORTYPE_LSE;
@@ -226,7 +230,7 @@ void SystemClock_Config(void)
   {
     Error_Handler();
   }
-  /** Initializes the CPU, AHB and APB busses clocks 
+  /** Initializes the CPU, AHB and APB buses clocks
   */
   RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
                               |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
@@ -263,7 +267,7 @@ void SystemClock_Config(void)
   {
     Error_Handler();
   }
-  /** Configure the main internal regulator output voltage 
+  /** Configure the main internal regulator output voltage
   */
   if (HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1) != HAL_OK)
   {
@@ -289,7 +293,7 @@ static void MX_ADC1_Init(void)
   /* USER CODE BEGIN ADC1_Init 1 */
 
   /* USER CODE END ADC1_Init 1 */
-  /** Common config 
+  /** Common config
   */
   hadc1.Instance = ADC1;
   hadc1.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
@@ -301,7 +305,6 @@ static void MX_ADC1_Init(void)
   hadc1.Init.ContinuousConvMode = DISABLE;
   hadc1.Init.NbrOfConversion = 1;
   hadc1.Init.DiscontinuousConvMode = DISABLE;
-  hadc1.Init.NbrOfDiscConversion = 1;
   hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
   hadc1.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
   hadc1.Init.DMAContinuousRequests = DISABLE;
@@ -311,14 +314,14 @@ static void MX_ADC1_Init(void)
   {
     Error_Handler();
   }
-  /** Configure the ADC multi-mode 
+  /** Configure the ADC multi-mode
   */
   multimode.Mode = ADC_MODE_INDEPENDENT;
   if (HAL_ADCEx_MultiModeConfigChannel(&hadc1, &multimode) != HAL_OK)
   {
     Error_Handler();
   }
-  /** Configure Regular Channel 
+  /** Configure Regular Channel
   */
   sConfig.Channel = ADC_CHANNEL_14;
   sConfig.Rank = ADC_REGULAR_RANK_1;
@@ -336,6 +339,47 @@ static void MX_ADC1_Init(void)
 
 }
 
+/**
+  * @brief DAC1 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_DAC1_Init(void)
+{
+
+  /* USER CODE BEGIN DAC1_Init 0 */
+
+  /* USER CODE END DAC1_Init 0 */
+
+  DAC_ChannelConfTypeDef sConfig = {0};
+
+  /* USER CODE BEGIN DAC1_Init 1 */
+
+  /* USER CODE END DAC1_Init 1 */
+  /** DAC Initialization
+  */
+  hdac1.Instance = DAC1;
+  if (HAL_DAC_Init(&hdac1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** DAC channel OUT1 config
+  */
+  sConfig.DAC_SampleAndHold = DAC_SAMPLEANDHOLD_DISABLE;
+  sConfig.DAC_Trigger = DAC_TRIGGER_NONE;
+  sConfig.DAC_OutputBuffer = DAC_OUTPUTBUFFER_ENABLE;
+  sConfig.DAC_ConnectOnChipPeripheral = DAC_CHIPCONNECT_DISABLE;
+  sConfig.DAC_UserTrimming = DAC_TRIMMING_FACTORY;
+  if (HAL_DAC_ConfigChannel(&hdac1, &sConfig, DAC_CHANNEL_1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN DAC1_Init 2 */
+
+  /* USER CODE END DAC1_Init 2 */
+
+}
+
 /**
   * @brief IWDG Initialization Function
   * @param None
@@ -447,7 +491,7 @@ static void MX_RTC_Init(void)
   /* USER CODE BEGIN RTC_Init 1 */
 
   /* USER CODE END RTC_Init 1 */
-  /** Initialize RTC Only 
+  /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
   hrtc.Init.HourFormat = RTC_HOURFORMAT_24;
@@ -695,7 +739,7 @@ static void MX_TIM1_Init(void)
   htim1.Instance = TIM1;
   htim1.Init.Prescaler = 0;
   htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim1.Init.Period = 0;
+  htim1.Init.Period = 65535;
   htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim1.Init.RepetitionCounter = 0;
   htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
@@ -774,7 +818,7 @@ static void MX_TIM2_Init(void)
   htim2.Instance = TIM2;
   htim2.Init.Prescaler = 0;
   htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim2.Init.Period = 0;
+  htim2.Init.Period = 4294967295;
   htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   if (HAL_TIM_Base_Init(&htim2) != HAL_OK)
@@ -837,7 +881,7 @@ static void MX_TIM4_Init(void)
   htim4.Instance = TIM4;
   htim4.Init.Prescaler = 0;
   htim4.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim4.Init.Period = 0;
+  htim4.Init.Period = 65535;
   htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   if (HAL_TIM_Base_Init(&htim4) != HAL_OK)
@@ -899,7 +943,7 @@ static void MX_TIM15_Init(void)
   htim15.Instance = TIM15;
   htim15.Init.Prescaler = 0;
   htim15.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim15.Init.Period = 0;
+  htim15.Init.Period = 65535;
   htim15.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim15.Init.RepetitionCounter = 0;
   htim15.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
@@ -942,7 +986,7 @@ static void MX_TIM16_Init(void)
   htim16.Instance = TIM16;
   htim16.Init.Prescaler = 0;
   htim16.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim16.Init.Period = 0;
+  htim16.Init.Period = 65535;
   htim16.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim16.Init.RepetitionCounter = 0;
   htim16.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
@@ -974,7 +1018,7 @@ static void MX_TIM17_Init(void)
   htim17.Instance = TIM17;
   htim17.Init.Prescaler = 0;
   htim17.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim17.Init.Period = 0;
+  htim17.Init.Period = 65535;
   htim17.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim17.Init.RepetitionCounter = 0;
   htim17.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
@@ -1138,7 +1182,7 @@ void Error_Handler(void)
   * @retval None
   */
 void assert_failed(uint8_t *file, uint32_t line)
-{ 
+{
   /* USER CODE BEGIN 6 */
   /* User can add his own implementation to report the file name and line number,
      tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */

+ 141 - 80
bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Src/stm32l4xx_hal_msp.c

@@ -78,7 +78,7 @@
 /* USER CODE BEGIN 0 */
 
 /* USER CODE END 0 */
-                        
+
 void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
                                                             /**
   * Initializes the Global MSP.
@@ -115,10 +115,10 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc)
   /* USER CODE END ADC1_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_ADC_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOC_CLK_ENABLE();
-    /**ADC1 GPIO Configuration    
-    PC5     ------> ADC1_IN14 
+    /**ADC1 GPIO Configuration
+    PC5     ------> ADC1_IN14
     */
     GPIO_InitStruct.Pin = GPIO_PIN_5;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG_ADC_CONTROL;
@@ -147,9 +147,9 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
   /* USER CODE END ADC1_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_ADC_CLK_DISABLE();
-  
-    /**ADC1 GPIO Configuration    
-    PC5     ------> ADC1_IN14 
+
+    /**ADC1 GPIO Configuration
+    PC5     ------> ADC1_IN14
     */
     HAL_GPIO_DeInit(GPIOC, GPIO_PIN_5);
 
@@ -160,6 +160,67 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
 
 }
 
+/**
+* @brief DAC MSP Initialization
+* This function configures the hardware resources used in this example
+* @param hdac: DAC handle pointer
+* @retval None
+*/
+void HAL_DAC_MspInit(DAC_HandleTypeDef* hdac)
+{
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  if(hdac->Instance==DAC1)
+  {
+  /* USER CODE BEGIN DAC1_MspInit 0 */
+
+  /* USER CODE END DAC1_MspInit 0 */
+    /* Peripheral clock enable */
+    __HAL_RCC_DAC1_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**DAC1 GPIO Configuration
+    PA4     ------> DAC1_OUT1
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_4;
+    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* USER CODE BEGIN DAC1_MspInit 1 */
+
+  /* USER CODE END DAC1_MspInit 1 */
+  }
+
+}
+
+/**
+* @brief DAC MSP De-Initialization
+* This function freeze the hardware resources used in this example
+* @param hdac: DAC handle pointer
+* @retval None
+*/
+void HAL_DAC_MspDeInit(DAC_HandleTypeDef* hdac)
+{
+  if(hdac->Instance==DAC1)
+  {
+  /* USER CODE BEGIN DAC1_MspDeInit 0 */
+
+  /* USER CODE END DAC1_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_DAC1_CLK_DISABLE();
+
+    /**DAC1 GPIO Configuration
+    PA4     ------> DAC1_OUT1
+    */
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_4);
+
+  /* USER CODE BEGIN DAC1_MspDeInit 1 */
+
+  /* USER CODE END DAC1_MspDeInit 1 */
+  }
+
+}
+
 /**
 * @brief LPTIM MSP Initialization
 * This function configures the hardware resources used in this example
@@ -220,17 +281,17 @@ void HAL_QSPI_MspInit(QSPI_HandleTypeDef* hqspi)
   /* USER CODE END QUADSPI_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_QSPI_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOE_CLK_ENABLE();
-    /**QUADSPI GPIO Configuration    
+    /**QUADSPI GPIO Configuration
     PE10     ------> QUADSPI_CLK
     PE11     ------> QUADSPI_NCS
     PE12     ------> QUADSPI_BK1_IO0
     PE13     ------> QUADSPI_BK1_IO1
     PE14     ------> QUADSPI_BK1_IO2
-    PE15     ------> QUADSPI_BK1_IO3 
+    PE15     ------> QUADSPI_BK1_IO3
     */
-    GPIO_InitStruct.Pin = GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13 
+    GPIO_InitStruct.Pin = GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13
                           |GPIO_PIN_14|GPIO_PIN_15;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -260,16 +321,16 @@ void HAL_QSPI_MspDeInit(QSPI_HandleTypeDef* hqspi)
   /* USER CODE END QUADSPI_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_QSPI_CLK_DISABLE();
-  
-    /**QUADSPI GPIO Configuration    
+
+    /**QUADSPI GPIO Configuration
     PE10     ------> QUADSPI_CLK
     PE11     ------> QUADSPI_NCS
     PE12     ------> QUADSPI_BK1_IO0
     PE13     ------> QUADSPI_BK1_IO1
     PE14     ------> QUADSPI_BK1_IO2
-    PE15     ------> QUADSPI_BK1_IO3 
+    PE15     ------> QUADSPI_BK1_IO3
     */
-    HAL_GPIO_DeInit(GPIOE, GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13 
+    HAL_GPIO_DeInit(GPIOE, GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13
                           |GPIO_PIN_14|GPIO_PIN_15);
 
   /* USER CODE BEGIN QUADSPI_MspDeInit 1 */
@@ -339,18 +400,18 @@ void HAL_SD_MspInit(SD_HandleTypeDef* hsd)
   /* USER CODE END SDMMC1_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_SDMMC1_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOC_CLK_ENABLE();
     __HAL_RCC_GPIOD_CLK_ENABLE();
-    /**SDMMC1 GPIO Configuration    
+    /**SDMMC1 GPIO Configuration
     PC8     ------> SDMMC1_D0
     PC9     ------> SDMMC1_D1
     PC10     ------> SDMMC1_D2
     PC11     ------> SDMMC1_D3
     PC12     ------> SDMMC1_CK
-    PD2     ------> SDMMC1_CMD 
+    PD2     ------> SDMMC1_CMD
     */
-    GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11 
+    GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11
                           |GPIO_PIN_12;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -387,16 +448,16 @@ void HAL_SD_MspDeInit(SD_HandleTypeDef* hsd)
   /* USER CODE END SDMMC1_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_SDMMC1_CLK_DISABLE();
-  
-    /**SDMMC1 GPIO Configuration    
+
+    /**SDMMC1 GPIO Configuration
     PC8     ------> SDMMC1_D0
     PC9     ------> SDMMC1_D1
     PC10     ------> SDMMC1_D2
     PC11     ------> SDMMC1_D3
     PC12     ------> SDMMC1_CK
-    PD2     ------> SDMMC1_CMD 
+    PD2     ------> SDMMC1_CMD
     */
-    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11 
+    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11
                           |GPIO_PIN_12);
 
     HAL_GPIO_DeInit(GPIOD, GPIO_PIN_2);
@@ -424,12 +485,12 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
   /* USER CODE END SPI1_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_SPI1_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**SPI1 GPIO Configuration    
+    /**SPI1 GPIO Configuration
     PA5     ------> SPI1_SCK
     PA6     ------> SPI1_MISO
-    PA7     ------> SPI1_MOSI 
+    PA7     ------> SPI1_MOSI
     */
     GPIO_InitStruct.Pin = GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -449,12 +510,12 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
   /* USER CODE END SPI2_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_SPI2_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOB_CLK_ENABLE();
-    /**SPI2 GPIO Configuration    
+    /**SPI2 GPIO Configuration
     PB13     ------> SPI2_SCK
     PB14     ------> SPI2_MISO
-    PB15     ------> SPI2_MOSI 
+    PB15     ------> SPI2_MOSI
     */
     GPIO_InitStruct.Pin = GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -474,11 +535,11 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
   /* USER CODE END SPI3_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_SPI3_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOB_CLK_ENABLE();
-    /**SPI3 GPIO Configuration    
+    /**SPI3 GPIO Configuration
     PB3 (JTDO-TRACESWO)     ------> SPI3_SCK
-    PB5     ------> SPI3_MOSI 
+    PB5     ------> SPI3_MOSI
     */
     GPIO_InitStruct.Pin = GPIO_PIN_3|GPIO_PIN_5;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -509,11 +570,11 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
   /* USER CODE END SPI1_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_SPI1_CLK_DISABLE();
-  
-    /**SPI1 GPIO Configuration    
+
+    /**SPI1 GPIO Configuration
     PA5     ------> SPI1_SCK
     PA6     ------> SPI1_MISO
-    PA7     ------> SPI1_MOSI 
+    PA7     ------> SPI1_MOSI
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7);
 
@@ -528,11 +589,11 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
   /* USER CODE END SPI2_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_SPI2_CLK_DISABLE();
-  
-    /**SPI2 GPIO Configuration    
+
+    /**SPI2 GPIO Configuration
     PB13     ------> SPI2_SCK
     PB14     ------> SPI2_MISO
-    PB15     ------> SPI2_MOSI 
+    PB15     ------> SPI2_MOSI
     */
     HAL_GPIO_DeInit(GPIOB, GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15);
 
@@ -547,10 +608,10 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
   /* USER CODE END SPI3_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_SPI3_CLK_DISABLE();
-  
-    /**SPI3 GPIO Configuration    
+
+    /**SPI3 GPIO Configuration
     PB3 (JTDO-TRACESWO)     ------> SPI3_SCK
-    PB5     ------> SPI3_MOSI 
+    PB5     ------> SPI3_MOSI
     */
     HAL_GPIO_DeInit(GPIOB, GPIO_PIN_3|GPIO_PIN_5);
 
@@ -647,8 +708,8 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
 
   /* USER CODE END TIM1_MspPostInit 0 */
     __HAL_RCC_GPIOE_CLK_ENABLE();
-    /**TIM1 GPIO Configuration    
-    PE9     ------> TIM1_CH1 
+    /**TIM1 GPIO Configuration
+    PE9     ------> TIM1_CH1
     */
     GPIO_InitStruct.Pin = GPIO_PIN_9;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -666,11 +727,11 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
   /* USER CODE BEGIN TIM2_MspPostInit 0 */
 
   /* USER CODE END TIM2_MspPostInit 0 */
-  
+
     __HAL_RCC_GPIOB_CLK_ENABLE();
-    /**TIM2 GPIO Configuration    
+    /**TIM2 GPIO Configuration
     PB10     ------> TIM2_CH3
-    PB11     ------> TIM2_CH4 
+    PB11     ------> TIM2_CH4
     */
     GPIO_InitStruct.Pin = GPIO_PIN_10|GPIO_PIN_11;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -688,11 +749,11 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
   /* USER CODE BEGIN TIM4_MspPostInit 0 */
 
   /* USER CODE END TIM4_MspPostInit 0 */
-  
+
     __HAL_RCC_GPIOB_CLK_ENABLE();
-    /**TIM4 GPIO Configuration    
+    /**TIM4 GPIO Configuration
     PB7     ------> TIM4_CH2
-    PB8     ------> TIM4_CH3 
+    PB8     ------> TIM4_CH3
     */
     GPIO_InitStruct.Pin = GPIO_PIN_7|GPIO_PIN_8;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -800,11 +861,11 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
   /* USER CODE END USART1_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_USART1_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**USART1 GPIO Configuration    
+    /**USART1 GPIO Configuration
     PA9     ------> USART1_TX
-    PA10     ------> USART1_RX 
+    PA10     ------> USART1_RX
     */
     GPIO_InitStruct.Pin = GPIO_PIN_9|GPIO_PIN_10;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -824,11 +885,11 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
   /* USER CODE END USART2_MspInit 0 */
     /* Peripheral clock enable */
     __HAL_RCC_USART2_CLK_ENABLE();
-  
+
     __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**USART2 GPIO Configuration    
+    /**USART2 GPIO Configuration
     PA2     ------> USART2_TX
-    PA3     ------> USART2_RX 
+    PA3     ------> USART2_RX
     */
     GPIO_InitStruct.Pin = GPIO_PIN_2|GPIO_PIN_3;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -859,10 +920,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
   /* USER CODE END USART1_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_USART1_CLK_DISABLE();
-  
-    /**USART1 GPIO Configuration    
+
+    /**USART1 GPIO Configuration
     PA9     ------> USART1_TX
-    PA10     ------> USART1_RX 
+    PA10     ------> USART1_RX
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
 
@@ -877,10 +938,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
   /* USER CODE END USART2_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_USART2_CLK_DISABLE();
-  
-    /**USART2 GPIO Configuration    
+
+    /**USART2 GPIO Configuration
     PA2     ------> USART2_TX
-    PA3     ------> USART2_RX 
+    PA3     ------> USART2_RX
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3);
 
@@ -905,11 +966,11 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd)
   /* USER CODE BEGIN USB_OTG_FS_MspInit 0 */
 
   /* USER CODE END USB_OTG_FS_MspInit 0 */
-  
+
     __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**USB_OTG_FS GPIO Configuration    
+    /**USB_OTG_FS GPIO Configuration
     PA11     ------> USB_OTG_FS_DM
-    PA12     ------> USB_OTG_FS_DP 
+    PA12     ------> USB_OTG_FS_DP
     */
     GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -957,10 +1018,10 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd)
   /* USER CODE END USB_OTG_FS_MspDeInit 0 */
     /* Peripheral clock disable */
     __HAL_RCC_USB_OTG_FS_CLK_DISABLE();
-  
-    /**USB_OTG_FS GPIO Configuration    
+
+    /**USB_OTG_FS GPIO Configuration
     PA11     ------> USB_OTG_FS_DM
-    PA12     ------> USB_OTG_FS_DP 
+    PA12     ------> USB_OTG_FS_DP
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11|GPIO_PIN_12);
 
@@ -1000,12 +1061,12 @@ void HAL_SAI_MspInit(SAI_HandleTypeDef* hsai)
        __HAL_RCC_SAI1_CLK_ENABLE();
     }
     SAI1_client ++;
-    
-    /**SAI1_A_Block_A GPIO Configuration    
+
+    /**SAI1_A_Block_A GPIO Configuration
     PE2     ------> SAI1_MCLK_A
     PE4     ------> SAI1_FS_A
     PE5     ------> SAI1_SCK_A
-    PE6     ------> SAI1_SD_A 
+    PE6     ------> SAI1_SD_A
     */
     GPIO_InitStruct.Pin = GPIO_PIN_2|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -1023,9 +1084,9 @@ void HAL_SAI_MspInit(SAI_HandleTypeDef* hsai)
        __HAL_RCC_SAI1_CLK_ENABLE();
       }
     SAI1_client ++;
-    
-    /**SAI1_B_Block_B GPIO Configuration    
-    PE3     ------> SAI1_SD_B 
+
+    /**SAI1_B_Block_B GPIO Configuration
+    PE3     ------> SAI1_SD_B
     */
     GPIO_InitStruct.Pin = GPIO_PIN_3;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@@ -1045,15 +1106,15 @@ void HAL_SAI_MspDeInit(SAI_HandleTypeDef* hsai)
     SAI1_client --;
     if (SAI1_client == 0)
       {
-      /* Peripheral clock disable */ 
+      /* Peripheral clock disable */
        __HAL_RCC_SAI1_CLK_DISABLE();
       }
-    
-    /**SAI1_A_Block_A GPIO Configuration    
+
+    /**SAI1_A_Block_A GPIO Configuration
     PE2     ------> SAI1_MCLK_A
     PE4     ------> SAI1_FS_A
     PE5     ------> SAI1_SCK_A
-    PE6     ------> SAI1_SD_A 
+    PE6     ------> SAI1_SD_A
     */
     HAL_GPIO_DeInit(GPIOE, GPIO_PIN_2|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6);
 
@@ -1066,9 +1127,9 @@ void HAL_SAI_MspDeInit(SAI_HandleTypeDef* hsai)
       /* Peripheral clock disable */
       __HAL_RCC_SAI1_CLK_DISABLE();
       }
-    
-    /**SAI1_B_Block_B GPIO Configuration    
-    PE3     ------> SAI1_SD_B 
+
+    /**SAI1_B_Block_B GPIO Configuration
+    PE3     ------> SAI1_SD_B
     */
     HAL_GPIO_DeInit(GPIOE, GPIO_PIN_3);
 

+ 1 - 1
bsp/stm32/stm32l475-atk-pandora/board/CubeMX_Config/Src/stm32l4xx_it.c

@@ -77,7 +77,7 @@ extern PCD_HandleTypeDef hpcd_USB_OTG_FS;
 /* USER CODE END EV */
 
 /******************************************************************************/
-/*           Cortex-M4 Processor Interruption and Exception Handlers          */ 
+/*           Cortex-M4 Processor Interruption and Exception Handlers          */
 /******************************************************************************/
 /**
   * @brief This function handles Non maskable interrupt.

+ 10 - 0
bsp/stm32/stm32l475-atk-pandora/board/Kconfig

@@ -308,6 +308,16 @@ menu "On-chip Peripheral Drivers"
                 default n
         endif
 
+    menuconfig BSP_USING_DAC
+        bool "Enable DAC"
+        default n
+        select RT_USING_DAC
+        if BSP_USING_DAC
+            config BSP_USING_DAC1
+                bool "Enable DAC1"
+                default n
+        endif
+
     menuconfig BSP_USING_ONCHIP_RTC
         bool "Enable RTC"
         select RT_USING_RTC

+ 56 - 2
bsp/stm32/stm32mp157a-st-discovery/.config

@@ -123,6 +123,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
+# CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_DAC is not set
@@ -199,12 +200,15 @@ CONFIG_RT_USING_PIN=y
 #
 # IoT - internet of things
 #
+# CONFIG_PKG_USING_LORAWAN_DRIVER is not set
 # CONFIG_PKG_USING_PAHOMQTT is not set
+# CONFIG_PKG_USING_UMQTT is not set
 # CONFIG_PKG_USING_WEBCLIENT is not set
 # CONFIG_PKG_USING_WEBNET is not set
 # CONFIG_PKG_USING_MONGOOSE is not set
 # CONFIG_PKG_USING_MYMQTT is not set
 # CONFIG_PKG_USING_KAWAII_MQTT is not set
+# CONFIG_PKG_USING_BC28_MQTT is not set
 # CONFIG_PKG_USING_WEBTERMINAL is not set
 # CONFIG_PKG_USING_CJSON is not set
 # CONFIG_PKG_USING_JSMN is not set
@@ -231,6 +235,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_COAP is not set
 # CONFIG_PKG_USING_NOPOLL is not set
 # CONFIG_PKG_USING_NETUTILS is not set
+# CONFIG_PKG_USING_CMUX is not set
 # CONFIG_PKG_USING_PPP_DEVICE is not set
 # CONFIG_PKG_USING_AT_DEVICE is not set
 # CONFIG_PKG_USING_ATSRV_SOCKET is not set
@@ -243,7 +248,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_GAGENT_CLOUD is not set
 # CONFIG_PKG_USING_ALI_IOTKIT is not set
 # CONFIG_PKG_USING_AZURE is not set
-# CONFIG_PKG_USING_TENCENT_IOTHUB is not set
+# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set
 # CONFIG_PKG_USING_JIOT-C-SDK is not set
 # CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set
 # CONFIG_PKG_USING_JOYLINK is not set
@@ -265,6 +270,11 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_CAPNP is not set
 # CONFIG_PKG_USING_RT_CJSON_TOOLS is not set
 # CONFIG_PKG_USING_AGILE_TELNET is not set
+# CONFIG_PKG_USING_NMEALIB is not set
+# CONFIG_PKG_USING_AGILE_JSMN is not set
+# CONFIG_PKG_USING_PDULIB is not set
+# CONFIG_PKG_USING_BTSTACK is not set
+# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
 
 #
 # security packages
@@ -273,6 +283,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_libsodium is not set
 # CONFIG_PKG_USING_TINYCRYPT is not set
 # CONFIG_PKG_USING_TFM is not set
+# CONFIG_PKG_USING_YD_CRYPTO is not set
 
 #
 # language packages
@@ -289,6 +300,8 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_STEMWIN is not set
 # CONFIG_PKG_USING_WAVPLAYER is not set
 # CONFIG_PKG_USING_TJPGD is not set
+# CONFIG_PKG_USING_HELIX is not set
+# CONFIG_PKG_USING_AZUREGUIX is not set
 
 #
 # tools packages
@@ -307,6 +320,9 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set
 # CONFIG_PKG_USING_LUNAR_CALENDAR is not set
 # CONFIG_PKG_USING_BS8116A is not set
+# CONFIG_PKG_USING_GPS_RMC is not set
+# CONFIG_PKG_USING_URLENCODE is not set
+# CONFIG_PKG_USING_UMCN is not set
 
 #
 # system packages
@@ -318,6 +334,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_LWEXT4 is not set
 # CONFIG_PKG_USING_PARTITION is not set
 # CONFIG_PKG_USING_FAL is not set
+# CONFIG_PKG_USING_FLASHDB is not set
 # CONFIG_PKG_USING_SQLITE is not set
 # CONFIG_PKG_USING_RTI is not set
 # CONFIG_PKG_USING_LITTLEVGL2RTT is not set
@@ -330,6 +347,19 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_SYSWATCH is not set
 # CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set
 # CONFIG_PKG_USING_PLCCORE is not set
+# CONFIG_PKG_USING_RAMDISK is not set
+# CONFIG_PKG_USING_MININI is not set
+# CONFIG_PKG_USING_QBOOT is not set
+
+#
+# Micrium: Micrium software products porting for RT-Thread
+#
+# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
+# CONFIG_PKG_USING_UC_CRC is not set
+# CONFIG_PKG_USING_UC_CLK is not set
+# CONFIG_PKG_USING_UC_COMMON is not set
+# CONFIG_PKG_USING_UC_MODBUS is not set
+# CONFIG_PKG_USING_PPOOL is not set
 
 #
 # peripheral libraries and drivers
@@ -367,6 +397,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_RPLIDAR is not set
 # CONFIG_PKG_USING_AS608 is not set
 # CONFIG_PKG_USING_RC522 is not set
+# CONFIG_PKG_USING_WS2812B is not set
 # CONFIG_PKG_USING_EMBARC_BSP is not set
 # CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set
 # CONFIG_PKG_USING_MULTI_RTIMER is not set
@@ -374,6 +405,17 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_BEEP is not set
 # CONFIG_PKG_USING_EASYBLINK is not set
 # CONFIG_PKG_USING_PMS_SERIES is not set
+# CONFIG_PKG_USING_CAN_YMODEM is not set
+# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set
+# CONFIG_PKG_USING_QLED is not set
+# CONFIG_PKG_USING_PAJ7620 is not set
+# CONFIG_PKG_USING_AGILE_CONSOLE is not set
+# CONFIG_PKG_USING_LD3320 is not set
+# CONFIG_PKG_USING_WK2124 is not set
+# CONFIG_PKG_USING_LY68L6400 is not set
+# CONFIG_PKG_USING_DM9051 is not set
+# CONFIG_PKG_USING_SSD1306 is not set
+# CONFIG_PKG_USING_QKEY is not set
 
 #
 # miscellaneous packages
@@ -403,13 +445,20 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
 # CONFIG_PKG_USING_HELLO is not set
 # CONFIG_PKG_USING_VI is not set
+# CONFIG_PKG_USING_KI is not set
 # CONFIG_PKG_USING_NNOM is not set
 # CONFIG_PKG_USING_LIBANN is not set
 # CONFIG_PKG_USING_ELAPACK is not set
 # CONFIG_PKG_USING_ARMv7M_DWT is not set
 # CONFIG_PKG_USING_VT100 is not set
+# CONFIG_PKG_USING_TETRIS is not set
 # CONFIG_PKG_USING_ULAPACK is not set
 # CONFIG_PKG_USING_UKAL is not set
+# CONFIG_PKG_USING_CRCLIB is not set
+# CONFIG_PKG_USING_THREES is not set
+# CONFIG_PKG_USING_2048 is not set
+# CONFIG_PKG_USING_LWGPS is not set
+# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
 CONFIG_SOC_FAMILY_STM32=y
 CONFIG_SOC_SERIES_STM32MP1=y
 
@@ -427,6 +476,10 @@ CONFIG_BSP_USING_STLINK_TO_USART=y
 # CONFIG_BSP_USING_PWR is not set
 # CONFIG_BSP_USING_RCC is not set
 # CONFIG_BSP_USING_OPENAMP is not set
+# CONFIG_BSP_USING_RS485 is not set
+# CONFIG_BSP_USING_GBE is not set
+# CONFIG_BSP_USING_SDMMC is not set
+# CONFIG_BSP_USING_AUDIO is not set
 
 #
 # On-chip Peripheral Drivers
@@ -435,7 +488,6 @@ CONFIG_BSP_USING_GPIO=y
 # CONFIG_BSP_USING_WWDG is not set
 CONFIG_BSP_USING_UART=y
 # CONFIG_BSP_USING_UART3 is not set
-# CONFIG_BSP_UART3_RX_USING_DMA is not set
 CONFIG_BSP_USING_UART4=y
 # CONFIG_BSP_UART4_RX_USING_DMA is not set
 # CONFIG_BSP_UART4_TX_USING_DMA is not set
@@ -448,6 +500,8 @@ CONFIG_BSP_USING_UART4=y
 # CONFIG_BSP_USING_SPI is not set
 # CONFIG_BSP_USING_CRC is not set
 # CONFIG_BSP_USING_RNG is not set
+# CONFIG_BSP_USING_HASH is not set
+# CONFIG_BSP_USING_CRYP is not set
 # CONFIG_BSP_USING_UDID is not set
 
 #

+ 6 - 6
bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Inc/stm32mp1xx_hal_conf.h

@@ -34,8 +34,8 @@
 #define HAL_MODULE_ENABLED  
 #define HAL_ADC_MODULE_ENABLED
 /*#define HAL_CEC_MODULE_ENABLED   */
-/*#define HAL_CRC_MODULE_ENABLED   */
-/*#define HAL_CRYP_MODULE_ENABLED   */
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
 #define HAL_DAC_MODULE_ENABLED
 /*#define HAL_DCMI_MODULE_ENABLED   */
 /*#define HAL_DSI_MODULE_ENABLED   */
@@ -43,7 +43,7 @@
 /*#define HAL_DTS_MODULE_ENABLED   */
 /*#define HAL_ETH_MODULE_ENABLED   */
 /*#define HAL_FDCAN_MODULE_ENABLED   */
-/*#define HAL_HASH_MODULE_ENABLED   */
+#define HAL_HASH_MODULE_ENABLED
 /*#define HAL_HCD_MODULE_ENABLED   */
 #define HAL_HSEM_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
@@ -56,9 +56,9 @@
 /*#define HAL_NOR_MODULE_ENABLED   */
 /*#define HAL_PCD_MODULE_ENABLED   */
 /*#define HAL_QSPI_MODULE_ENABLED   */
-/*#define HAL_RNG_MODULE_ENABLED   */
-/*#define HAL_SAI_MODULE_ENABLED   */
-/*#define HAL_SD_MODULE_ENABLED   */
+#define HAL_RNG_MODULE_ENABLED
+#define HAL_SAI_MODULE_ENABLED
+#define HAL_SD_MODULE_ENABLED
 /*#define HAL_MMC_MODULE_ENABLED   */
 /*#define HAL_RTC_MODULE_ENABLED   */
 /*#define HAL_SMBUS_MODULE_ENABLED   */

+ 349 - 3
bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c

@@ -26,7 +26,9 @@
 
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN TD */
-
+DMA_HandleTypeDef hdma_hash_in    = {0};
+DMA_HandleTypeDef hdma_cryp_in    = {0};
+DMA_HandleTypeDef hdma_cryp_out   = {0};
 /* USER CODE END TD */
 
 /* Private define ------------------------------------------------------------*/
@@ -58,8 +60,7 @@
 
 /* USER CODE END 0 */
                         
-void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
-                    /**
+/**
   * Initializes the Global MSP.
   */
 void HAL_MspInit(void)
@@ -942,6 +943,107 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef *hI2c)
     }
 }
 
+/**
+* @brief SD MSP Initialization
+* This function configures the hardware resources used in this example
+* @param hsd: SD handle pointer
+* @retval None
+*/
+void HAL_SD_MspInit(SD_HandleTypeDef* hsd)
+{
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+  
+  if(hsd->Instance==SDMMC1)
+  {
+  /* USER CODE BEGIN SDMMC1_MspInit 0 */
+    if (IS_ENGINEERING_BOOT_MODE())
+    {
+        /** Initializes the peripherals clock 
+        */
+        PeriphClkInit.Sdmmc12ClockSelection = RCC_SDMMC12CLKSOURCE_PLL4;
+        PeriphClkInit.PeriphClockSelection  = RCC_PERIPHCLK_SDMMC12;
+        if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+        {
+            Error_Handler();
+        }
+    }
+  /* USER CODE END SDMMC1_MspInit 0 */
+    /* Peripheral clock enable */
+    __HAL_RCC_SDMMC1_CLK_ENABLE();
+  
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOD_CLK_ENABLE();
+    /**SDMMC1 GPIO Configuration    
+    PC8     ------> SDMMC1_D0
+    PC9     ------> SDMMC1_D1
+    PC10     ------> SDMMC1_D2
+    PC11     ------> SDMMC1_D3
+    PC12     ------> SDMMC1_CK
+    PD2     ------> SDMMC1_CMD 
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11 
+                          |GPIO_PIN_12;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF12_SDIO1;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_2;
+    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
+    __HAL_RCC_SDMMC1_FORCE_RESET();
+    __HAL_RCC_SDMMC1_RELEASE_RESET();
+  
+    /* SDMMC1 interrupt Init */
+    HAL_NVIC_SetPriority(SDMMC1_IRQn, 2, 0);
+    HAL_NVIC_EnableIRQ(SDMMC1_IRQn);
+  /* USER CODE BEGIN SDMMC1_MspInit 1 */
+
+  /* USER CODE END SDMMC1_MspInit 1 */
+  }
+
+}
+
+/**
+* @brief SD MSP De-Initialization
+* This function freeze the hardware resources used in this example
+* @param hsd: SD handle pointer
+* @retval None
+*/
+void HAL_SD_MspDeInit(SD_HandleTypeDef* hsd)
+{
+  if(hsd->Instance==SDMMC1)
+  {
+  /* USER CODE BEGIN SDMMC1_MspDeInit 0 */
+
+  /* USER CODE END SDMMC1_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_SDMMC1_CLK_DISABLE();
+  
+    /**SDMMC1 GPIO Configuration    
+    PC8     ------> SDMMC1_D0
+    PC9     ------> SDMMC1_D1
+    PC10     ------> SDMMC1_D2
+    PC11     ------> SDMMC1_D3
+    PC12     ------> SDMMC1_CK
+    PD2     ------> SDMMC1_CMD 
+    */
+    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11 
+                          |GPIO_PIN_12);
+
+    HAL_GPIO_DeInit(GPIOD, GPIO_PIN_2);
+
+    /* SDMMC1 interrupt DeInit */
+    HAL_NVIC_DisableIRQ(SDMMC1_IRQn);
+  /* USER CODE BEGIN SDMMC1_MspDeInit 1 */
+
+  /* USER CODE END SDMMC1_MspDeInit 1 */
+  }
+
+}
+
 /**
   * @brief  DeInitializes I2C MSP.
   * @param  hI2c : I2C handler
@@ -966,6 +1068,250 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef *hI2c)
     }
 }
 
+/**
+* @brief CRC MSP Initialization
+* This function configures the hardware resources used in this example
+* @param hcrc: CRC handle pointer
+* @retval None
+*/
+void HAL_CRC_MspInit(CRC_HandleTypeDef* hcrc)
+{
+  if(hcrc->Instance==CRC2)
+  {
+  /* USER CODE BEGIN CRC2_MspInit 0 */
+
+  /* USER CODE END CRC2_MspInit 0 */
+    /* Peripheral clock enable */
+    __HAL_RCC_CRC2_CLK_ENABLE();
+  /* USER CODE BEGIN CRC2_MspInit 1 */
+
+  /* USER CODE END CRC2_MspInit 1 */
+  }
+
+}
+
+/**
+* @brief CRC MSP De-Initialization
+* This function freeze the hardware resources used in this example
+* @param hcrc: CRC handle pointer
+* @retval None
+*/
+void HAL_CRC_MspDeInit(CRC_HandleTypeDef* hcrc)
+{
+  if(hcrc->Instance==CRC2)
+  {
+  /* USER CODE BEGIN CRC2_MspDeInit 0 */
+
+  /* USER CODE END CRC2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_CRC2_CLK_DISABLE();
+  /* USER CODE BEGIN CRC2_MspDeInit 1 */
+
+  /* USER CODE END CRC2_MspDeInit 1 */
+  }
+
+}
+
+/**
+* @brief RNG MSP Initialization
+* This function configures the hardware resources used in this example
+* @param hrng: RNG handle pointer
+* @retval None
+*/
+void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng)
+{
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+  if(hrng->Instance==RNG2)
+  {
+  /* USER CODE BEGIN RNG2_MspInit 0 */
+
+  /* USER CODE END RNG2_MspInit 0 */
+  if(IS_ENGINEERING_BOOT_MODE())
+  {
+  /** Initializes the peripherals clock 
+  */
+    PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RNG2;
+    PeriphClkInit.Rng2ClockSelection = RCC_RNG2CLKSOURCE_CSI;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+  }
+
+    /* Peripheral clock enable */
+    __HAL_RCC_RNG2_CLK_ENABLE();
+  /* USER CODE BEGIN RNG2_MspInit 1 */
+
+  /* USER CODE END RNG2_MspInit 1 */
+  }
+
+}
+
+/**
+* @brief RNG MSP De-Initialization
+* This function freeze the hardware resources used in this example
+* @param hrng: RNG handle pointer
+* @retval None
+*/
+void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng)
+{
+  if(hrng->Instance==RNG2)
+  {
+  /* USER CODE BEGIN RNG2_MspDeInit 0 */
+
+  /* USER CODE END RNG2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_RNG2_CLK_DISABLE();
+  /* USER CODE BEGIN RNG2_MspDeInit 1 */
+
+  /* USER CODE END RNG2_MspDeInit 1 */
+  }
+
+}
+
+/**
+* @brief HASH MSP Initialization
+* This function configures the hardware resources used in this example
+* @param hhash: HASH handle pointer
+* @retval None
+*/
+void HAL_HASH_MspInit(HASH_HandleTypeDef* hhash)
+{
+  /* USER CODE BEGIN HASH2_MspInit 0 */
+  /* USER CODE END HASH2_MspInit 0 */
+    /* Peripheral clock enable */
+    __HAL_RCC_HASH2_CLK_ENABLE();
+  /* USER CODE BEGIN HASH2_MspInit 1 */
+    __HAL_RCC_DMAMUX_CLK_ENABLE();
+    
+    /* Peripheral DMA init*/
+    hdma_hash_in.Instance = DMA2_Stream7;
+    hdma_hash_in.Init.Request = DMA_REQUEST_HASH2_IN;
+    hdma_hash_in.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_hash_in.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_hash_in.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_hash_in.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+    hdma_hash_in.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+    hdma_hash_in.Init.Mode = DMA_NORMAL;
+    hdma_hash_in.Init.Priority = DMA_PRIORITY_HIGH;
+    hdma_hash_in.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
+    hdma_hash_in.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_HALFFULL;
+    hdma_hash_in.Init.MemBurst = DMA_MBURST_SINGLE;
+    hdma_hash_in.Init.PeriphBurst = DMA_PBURST_SINGLE;
+
+    if (HAL_DMA_DeInit(&hdma_hash_in) != HAL_OK)
+    {
+      Error_Handler();
+    }
+    if (HAL_DMA_Init(&hdma_hash_in) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(hhash,hdmain,hdma_hash_in);
+  /* USER CODE END HASH2_MspInit 1 */
+
+}
+
+/**
+* @brief HASH MSP De-Initialization
+* This function freeze the hardware resources used in this example
+* @param hhash: HASH handle pointer
+* @retval None
+*/
+void HAL_HASH_MspDeInit(HASH_HandleTypeDef* hhash)
+{
+  /* USER CODE BEGIN HASH2_MspDeInit 0 */
+
+  /* USER CODE END HASH2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_HASH2_CLK_DISABLE();
+  /* USER CODE BEGIN HASH2_MspDeInit 1 */
+
+  /* USER CODE END HASH2_MspDeInit 1 */
+
+}
+
+#if defined (CRYP1) || defined (CRYP2)
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef* hcryp)
+{
+    if(hcryp->Instance==CRYP2)
+    {
+        /* Peripheral clock enable */
+        __HAL_RCC_CRYP2_CLK_ENABLE();
+        __HAL_RCC_DMAMUX_CLK_ENABLE();
+
+       /* Peripheral DMA init*/
+        hdma_cryp_in.Instance = DMA2_Stream6;
+        hdma_cryp_in.Init.Request = DMA_REQUEST_CRYP2_IN;
+        hdma_cryp_in.Init.Direction = DMA_MEMORY_TO_PERIPH;
+        hdma_cryp_in.Init.PeriphInc = DMA_PINC_DISABLE;
+        hdma_cryp_in.Init.MemInc = DMA_MINC_ENABLE;
+        hdma_cryp_in.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+        hdma_cryp_in.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+        hdma_cryp_in.Init.Mode = DMA_NORMAL;
+        hdma_cryp_in.Init.Priority = DMA_PRIORITY_HIGH;
+        hdma_cryp_in.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+        if (HAL_DMA_DeInit(&hdma_cryp_in) != HAL_OK)
+        {
+            Error_Handler();
+        }
+        if (HAL_DMA_Init(&hdma_cryp_in) != HAL_OK)
+        {
+            Error_Handler();
+        }
+
+        __HAL_LINKDMA(hcryp,hdmain,hdma_cryp_in);
+
+        hdma_cryp_out.Instance = DMA2_Stream5;
+        hdma_cryp_out.Init.Request = DMA_REQUEST_CRYP2_OUT;
+        hdma_cryp_out.Init.Direction = DMA_PERIPH_TO_MEMORY;
+        hdma_cryp_out.Init.PeriphInc = DMA_PINC_DISABLE;
+        hdma_cryp_out.Init.MemInc = DMA_MINC_ENABLE;
+        hdma_cryp_out.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+        hdma_cryp_out.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+        hdma_cryp_out.Init.Mode = DMA_NORMAL;
+        hdma_cryp_out.Init.Priority = DMA_PRIORITY_VERY_HIGH;
+        hdma_cryp_out.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+        if (HAL_DMA_DeInit(&hdma_cryp_out) != HAL_OK)
+        {
+            Error_Handler();
+        }
+        if (HAL_DMA_Init(&hdma_cryp_out) != HAL_OK)
+        {
+            Error_Handler();
+        }
+
+        __HAL_LINKDMA(hcryp,hdmaout,hdma_cryp_out);
+
+      /* USER CODE BEGIN CRYP_MspInit 1 */
+
+      /* USER CODE END CRYP_MspInit 1 */
+    }
+}
+
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef* hcryp)
+{
+
+  if(hcryp->Instance==CRYP2)
+  {
+  /* USER CODE BEGIN CRYP_MspDeInit 0 */
+
+  /* USER CODE END CRYP_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_CRYP2_CLK_DISABLE();
+
+    /* Peripheral DMA DeInit*/
+    HAL_DMA_DeInit(hcryp->hdmain);
+    HAL_DMA_DeInit(hcryp->hdmaout);
+  }
+  /* USER CODE BEGIN CRYP_MspDeInit 1 */
+
+  /* USER CODE END CRYP_MspDeInit 1 */
+
+}
+#endif
 /**
   * @brief  This function is executed in case of error occurrence.
   * @retval None

+ 46 - 1
bsp/stm32/stm32mp157a-st-discovery/board/Kconfig

@@ -50,7 +50,37 @@ menu "Onboard Peripheral Drivers"
             config RS485_UART_DEVICE_NAME
             string "the uart name for rs485"
             default "uart3"
+        endif
+    
+    config BSP_USING_GBE
+        bool "Enable Ethernet"
+        default n
+        select RT_USING_LWIP
+        
+    config BSP_USING_SDMMC
+        bool "Enable SDMMC (SD card)"
+        select RT_USING_SDIO
+        select RT_USING_DFS
+        select RT_USING_DFS_ELMFAT
+        default n
+
+    menuconfig BSP_USING_AUDIO
+        bool "Enable Audio Device"
+        select RT_USING_AUDIO
+        select BSP_USING_PMIC
+        select BSP_USING_SDMMC
+        select BSP_USING_I2C
+        select BSP_USING_I2C4
+        default n
+
+        if BSP_USING_AUDIO
+            config BSP_USING_AUDIO_PLAY
+            bool "Enable Audio Play"
+            default y
 
+            config BSP_USING_AUDIO_RECORD
+            bool "Enable Audio Record"
+            default n
         endif
 
 endmenu
@@ -196,7 +226,7 @@ menu "On-chip Peripheral Drivers"
                         range 1 176
                         default 117
                 endif
-	    menuconfig BSP_USING_I2C3
+            menuconfig BSP_USING_I2C3
                 bool "Enable I2C3 BUS (software simulation)"
                 default n
                 if BSP_USING_I2C3
@@ -210,6 +240,21 @@ menu "On-chip Peripheral Drivers"
                         range 1 191
                         default 181
                 endif
+            menuconfig BSP_USING_I2C4
+                bool "Enable I2C4 BUS (software simulation)"
+                default n
+                if BSP_USING_I2C4
+                    comment "Notice: PD12 --> 60; PF15 --> 95" 
+                    config BSP_I2C4_SCL_PIN
+                        int "i2c4 scl pin number"
+                        range 1 191
+                        default 60
+                    config BSP_I2C4_SDA_PIN
+                        int "I2C4 sda pin number"
+                        range 1 191
+                        default 95
+                endif
+
         endif
 
     menuconfig BSP_USING_SPI

+ 18 - 0
bsp/stm32/stm32mp157a-st-discovery/board/SConscript

@@ -40,6 +40,23 @@ if GetDepend(['BSP_USING_PMIC']):
 if GetDepend(['BSP_USING_RS485']):
     src += Glob('ports/drv_rs485.c')
 
+if GetDepend(['BSP_USING_GBE']):
+    src += Glob('ports/drv_eth.c')
+
+if GetDepend(['BSP_USING_SDMMC']):
+    src += Glob('ports/drv_sdio.c')
+
+if GetDepend(['BSP_USING_AUDIO']):
+    src += Glob('ports/audio/drv_cs42l51.c')
+    src += Glob('ports/audio/drv_sound.c')
+    src += Glob('ports/audio/audio_play.c')
+
+if GetDepend(['BSP_USING_AUDIO_RECORD']):
+    src += Glob('ports/audio/drv_mic.c')
+
+if GetDepend(['(BSP_USING_RNG)']) or GetDepend(['(BSP_USING_HASH)']) or GetDepend(['(BSP_USING_CRC)']) or GetDepend(['BSP_USING_CRYP']):
+    src += Glob('ports/crypto/crypto_sample.c')
+
 if GetDepend(['BSP_USING_OPENAMP']):
     src +=  Glob('CubeMX_Config/CM4/Src/ipcc.c')
     src +=  Glob('CubeMX_Config/CM4/Src/openamp.c')
@@ -58,6 +75,7 @@ if GetDepend(['BSP_USING_OPENAMP']):
 path =  [cwd]
 path += [cwd + '/CubeMX_Config/CM4/Inc']
 path += [cwd + '/ports']
+path += [cwd + '/ports/audio']
 
 if GetDepend(['BSP_USING_OPENAMP']):
     path += [cwd + '/ports/OpenAMP']

+ 1 - 3
bsp/stm32/stm32mp157a-st-discovery/board/board.h

@@ -32,7 +32,7 @@ extern "C" {
 
     
 #if defined(BSP_USING_OPENAMP)    
-#define STM32_SRAM_BEGIN             (uint32_t)0x10020000 
+#define STM32_SRAM_BEGIN             (uint32_t)0x10030000 
 #else
 #define STM32_SRAM_BEGIN             (uint32_t)0x2FFF0000     
 #endif
@@ -42,8 +42,6 @@ extern "C" {
 #define HEAP_BEGIN                    STM32_SRAM_BEGIN
 #define HEAP_END                      STM32_SRAM_END
 
-#define HEAP_END        STM32_SRAM_END
-
 void SystemClock_Config(void);
 
 extern void _Error_Handler(char *s, int num);

+ 1 - 6
bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.icf

@@ -5,7 +5,7 @@
 define symbol __ICFEDIT_intvec_start__ = 0x00000000;
 /*-Memory Regions-*/
 define symbol __ICFEDIT_region_text_start__ = 0x10000000;
-define symbol __ICFEDIT_region_text_end__   = 0x1001FFFF;
+define symbol __ICFEDIT_region_text_end__   = 0x1002FFFF;
 define symbol __ICFEDIT_region_data_start__ = 0x10030000;
 define symbol __ICFEDIT_region_data_end__   = 0x1003FFFF;
 /*-Sizes-*/
@@ -27,11 +27,6 @@ define symbol __OPENAMP_region_size__   = 0x8000;
 export symbol __OPENAMP_region_start__;
 export symbol __OPENAMP_region_size__;
 
-define symbol __SDMMC_region_start__   = 0x10048000;
-define symbol __SDMMC_region_size__    = 0x1FFFF;
-export symbol __SDMMC_region_start__;
-export symbol __SDMMC_region_size__;
-
 define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
 define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
 

+ 258 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/audio_play.c

@@ -0,0 +1,258 @@
+/*
+ * Copyright (c) 2006-2022, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-11-24     thread-liu   first version
+ */
+
+#include <rtthread.h>
+#include <rtdevice.h>
+#include <dfs_posix.h>
+
+#if defined(BSP_USING_AUDIO) && defined(BSP_USING_SDMMC)  
+#define BUFSZ   1024
+#define SOUND_DEVICE_NAME    "sound0"
+static rt_device_t snd_dev;
+
+struct RIFF_HEADER_DEF
+{
+    char riff_id[4];     // 'R','I','F','F'
+    uint32_t riff_size;
+    char riff_format[4]; // 'W','A','V','E'
+};
+
+struct WAVE_FORMAT_DEF
+{
+    uint16_t FormatTag;
+    uint16_t Channels;
+    uint32_t SamplesPerSec;
+    uint32_t AvgBytesPerSec;
+    uint16_t BlockAlign;
+    uint16_t BitsPerSample;
+};
+
+struct FMT_BLOCK_DEF
+{
+    char fmt_id[4];    // 'f','m','t',' '
+    uint32_t fmt_size;
+    struct WAVE_FORMAT_DEF wav_format;
+};
+
+struct DATA_BLOCK_DEF
+{
+    char data_id[4];     // 'R','I','F','F'
+    uint32_t data_size;
+};
+
+struct wav_info
+{
+    struct RIFF_HEADER_DEF header;
+    struct FMT_BLOCK_DEF   fmt_block;
+    struct DATA_BLOCK_DEF  data_block;
+};
+
+int wavplay_sample(int argc, char **argv)
+{
+    int fd = -1;
+    uint8_t *buffer = NULL;
+    struct wav_info *info = NULL;
+    struct rt_audio_caps caps = {0};
+
+    if (argc != 2)
+    {
+        rt_kprintf("Usage:\n");
+        rt_kprintf("wavplay_sample song.wav\n");
+        return 0;
+    }
+
+    fd = open(argv[1], O_WRONLY);
+    if (fd < 0)
+    {
+        rt_kprintf("open file failed!\n");
+        goto __exit;
+    }
+
+    buffer = rt_malloc(BUFSZ);
+    if (buffer == RT_NULL)
+        goto __exit;
+
+    info = (struct wav_info *) rt_malloc(sizeof * info);
+    if (info == RT_NULL)
+        goto __exit;
+
+    if (read(fd, &(info->header), sizeof(struct RIFF_HEADER_DEF)) <= 0)
+        goto __exit;
+    if (read(fd, &(info->fmt_block),  sizeof(struct FMT_BLOCK_DEF)) <= 0)
+        goto __exit;
+    if (read(fd, &(info->data_block), sizeof(struct DATA_BLOCK_DEF)) <= 0)
+        goto __exit;
+
+    rt_kprintf("wav information:\n");
+    rt_kprintf("samplerate %d\n", info->fmt_block.wav_format.SamplesPerSec);
+    rt_kprintf("channel %d\n", info->fmt_block.wav_format.Channels);
+
+    snd_dev = rt_device_find(SOUND_DEVICE_NAME);
+
+    rt_device_open(snd_dev, RT_DEVICE_OFLAG_WRONLY);
+
+    caps.main_type               = AUDIO_TYPE_OUTPUT;
+    caps.sub_type                = AUDIO_DSP_PARAM;
+    caps.udata.config.samplerate = info->fmt_block.wav_format.SamplesPerSec;
+    caps.udata.config.channels   = info->fmt_block.wav_format.Channels;
+    caps.udata.config.samplebits = 16;
+    rt_device_control(snd_dev, AUDIO_CTL_CONFIGURE, &caps);
+
+    while (1)
+    {
+        int length;
+
+        length = read(fd, buffer, BUFSZ);
+
+        if (length <= 0)
+            break;
+
+        rt_device_write(snd_dev, 0, buffer, length);
+    }
+
+    rt_device_close(snd_dev);
+
+__exit:
+
+    if (fd >= 0)
+        close(fd);
+
+    if (buffer)
+        rt_free(buffer);
+
+    if (info)
+        rt_free(info);
+
+    return 0;
+}
+
+MSH_CMD_EXPORT(wavplay_sample,  play wav file);
+
+#endif
+
+#if defined(BSP_USING_AUDIO) && defined(BSP_USING_SDMMC)  && defined(BSP_USING_AUDIO_RECORD)
+
+#define RECORD_TIME_MS      5000
+#define RECORD_SAMPLERATE   16000
+#define RECORD_CHANNEL      2
+#define RECORD_CHUNK_SZ     ((RECORD_SAMPLERATE * RECORD_CHANNEL * 2) * 20 / 1000)
+
+#define MIC_DEVICE_NAME    "mic0"
+static rt_device_t mic_dev;
+
+struct wav_header
+{
+    char  riff_id[4];              /* "RIFF" */
+    int   riff_datasize;           /* RIFF chunk data size,exclude riff_id[4] and riff_datasize,total - 8 */
+    char  riff_type[4];            /* "WAVE" */
+    char  fmt_id[4];               /* "fmt " */
+    int   fmt_datasize;            /* fmt chunk data size,16 for pcm */
+    short fmt_compression_code;    /* 1 for PCM */
+    short fmt_channels;            /* 1(mono) or 2(stereo) */
+    int   fmt_sample_rate;         /* samples per second */
+    int   fmt_avg_bytes_per_sec;   /* sample_rate * channels * bit_per_sample / 8 */
+    short fmt_block_align;         /* number bytes per sample, bit_per_sample * channels / 8 */
+    short fmt_bit_per_sample;      /* bits of each sample(8,16,32). */
+    char  data_id[4];              /* "data" */
+    int   data_datasize;           /* data chunk size,pcm_size - 44 */
+};
+
+static void wavheader_init(struct wav_header *header, int sample_rate, int channels, int datasize)
+{
+    memcpy(header->riff_id, "RIFF", 4);
+    header->riff_datasize = datasize + 44 - 8;
+    memcpy(header->riff_type, "WAVE", 4);
+    memcpy(header->fmt_id, "fmt ", 4);
+    header->fmt_datasize = 16;
+    header->fmt_compression_code = 1;
+    header->fmt_channels = channels;
+    header->fmt_sample_rate = sample_rate;
+    header->fmt_bit_per_sample = 16;
+    header->fmt_avg_bytes_per_sec = header->fmt_sample_rate * header->fmt_channels * header->fmt_bit_per_sample / 8;
+    header->fmt_block_align = header->fmt_bit_per_sample * header->fmt_channels / 8;
+    memcpy(header->data_id, "data", 4);
+    header->data_datasize = datasize;
+}
+
+int wavrecord_sample(int argc, char **argv)
+{
+    int fd = -1;
+    uint8_t *buffer = NULL;
+    struct wav_header header;
+    struct rt_audio_caps caps = {0};
+    int length, total_length = 0;
+
+    if (argc != 2)
+    {
+        rt_kprintf("Usage:\n");
+        rt_kprintf("wavrecord_sample file.wav\n");
+        return -1;
+    }
+
+    fd = open(argv[1], O_WRONLY | O_CREAT);
+    if (fd < 0)
+    {
+        rt_kprintf("open file for recording failed!\n");
+        return -1;
+    }
+    write(fd, &header, sizeof(struct wav_header));
+
+    buffer = rt_malloc(RECORD_CHUNK_SZ);
+    if (buffer == RT_NULL)
+        goto __exit;
+
+    mic_dev = rt_device_find(MIC_DEVICE_NAME);
+    if (mic_dev == RT_NULL)
+        goto __exit;
+
+    rt_device_open(mic_dev, RT_DEVICE_OFLAG_RDONLY);
+
+    caps.main_type               = AUDIO_TYPE_INPUT;
+    caps.sub_type                = AUDIO_DSP_PARAM;
+    caps.udata.config.samplerate = RECORD_SAMPLERATE;
+    caps.udata.config.channels   = RECORD_CHANNEL; 
+    caps.udata.config.samplebits = 16;
+    rt_device_control(mic_dev, AUDIO_CTL_CONFIGURE, &caps);
+
+    while (1)
+    {
+        length = rt_device_read(mic_dev, 0, buffer, RECORD_CHUNK_SZ);
+
+        if (length)
+        {
+            write(fd, buffer, length);
+            total_length += length;
+        }
+
+        if ((total_length / RECORD_CHUNK_SZ) >  (RECORD_TIME_MS / 20))
+            break;
+    }
+
+    /* write wav file head */
+    wavheader_init(&header, RECORD_SAMPLERATE, RECORD_CHANNEL, total_length);
+    lseek(fd, 0, SEEK_SET);
+    write(fd, &header, sizeof(struct wav_header));
+    close(fd);
+
+    /* close audio mic device */
+    rt_device_close(mic_dev);
+
+__exit:
+    if (fd >= 0)
+        close(fd);
+
+    if (buffer)
+        rt_free(buffer);
+
+    return 0;
+}
+MSH_CMD_EXPORT(wavrecord_sample, record voice to a wav file);
+
+#endif

+ 531 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_cs42l51.c

@@ -0,0 +1,531 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-07-02     thread-liu   first version
+ */
+
+#include "board.h"
+
+#if defined(BSP_USING_AUDIO)
+#include <drv_cs42l51.h>
+
+#define DRV_DEBUG
+#define LOG_TAG             "drv.audio"
+#include <drv_log.h>
+
+/* CS42L51 address */
+#define CHIP_ADDRESS 0x4A
+/* reset pin, active low */
+#define CS42L51_RESET_PIN   GET_PIN(G, 9) 
+
+static uint16_t CS42L51_Device             = OUT_HEADPHONE;
+static struct rt_i2c_bus_device *audio_dev = RT_NULL;
+
+/* i2c read reg */
+static rt_err_t read_reg(struct rt_i2c_bus_device *bus, rt_uint8_t reg, rt_uint8_t len, rt_uint8_t *buf)
+{
+    struct rt_i2c_msg msg[2] = {0, 0};
+
+    RT_ASSERT(bus != RT_NULL);
+    
+    msg[0].addr  = CHIP_ADDRESS;    /* Slave address */
+    msg[0].flags = RT_I2C_WR;        /* Write flag */
+    msg[0].buf   = &reg;             /* Slave register address */
+    msg[0].len   = 1;                /* Number of bytes sent */
+        
+    msg[1].addr  = CHIP_ADDRESS;
+    msg[1].flags = RT_I2C_RD;
+    msg[1].len   = len;
+    msg[1].buf   = buf;
+
+    if (rt_i2c_transfer(bus, msg, 2) == 2)
+    {
+        return RT_EOK;
+    }
+
+    return RT_ERROR;
+}
+
+/* i2c write reg */
+static rt_err_t write_reg(struct rt_i2c_bus_device *bus, rt_uint8_t reg, rt_uint8_t data)
+{
+    rt_uint8_t buf[2];
+    struct rt_i2c_msg msgs;
+
+    RT_ASSERT(bus != RT_NULL);
+    
+    buf[0] = reg; 
+    buf[1] = data;
+
+    msgs.addr  = CHIP_ADDRESS;
+    msgs.flags = RT_I2C_WR;
+    msgs.buf   = buf;
+    msgs.len   = 2;
+
+    if (rt_i2c_transfer(bus, &msgs, 1) == 1)
+    {
+        return RT_EOK;
+    }
+
+    return RT_ERROR;
+}
+
+/**
+  * @brief  deinitializes cs42l51 low level.
+  * @retval none
+  */
+static void cs42l51_lowlevel_deinit(void)
+{
+    rt_uint8_t temp = 0;
+
+    /* Mute DAC and ADC */
+    read_reg(audio_dev, CS42L51_DAC_OUT_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_DAC_OUT_CTL, (temp | 0x03));
+    read_reg(audio_dev, CS42L51_ADC_INPUT, 1, &temp);
+    write_reg(audio_dev, CS42L51_ADC_INPUT, (temp | 0x03));
+
+    /* Disable soft ramp and zero cross */
+    read_reg(audio_dev, CS42L51_ADC_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_ADC_CTL, (temp & 0xF0));
+
+    /* Set PDN to 1 */
+    read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+    write_reg(audio_dev, CS42L51_POWER_CTL1, (temp | 0x01));
+
+    /* Set all power down bits to 1 */
+    write_reg(audio_dev, CS42L51_POWER_CTL1, 0x7F);
+    read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_MIC_POWER_CTL, (temp | 0x0E));
+
+    /* Power off the codec */
+    rt_pin_write(CS42L51_RESET_PIN, PIN_LOW);
+}
+
+/**
+  * @brief  initializes cs42l51 low level.
+  * @retval none
+  */
+static void cs42l51_lowlevel_init(void)
+{
+    rt_uint8_t temp = 0;
+
+    /* Initialized RESET IO */
+    rt_pin_mode(CS42L51_RESET_PIN, PIN_MODE_OUTPUT);
+
+    /* Power off the cs42l51 */
+    rt_pin_write(CS42L51_RESET_PIN, PIN_LOW);
+
+    /* wait until power supplies are stable */    
+    rt_thread_mdelay(10);
+
+    /* Power on the cs42l51 */    
+    rt_pin_write(CS42L51_RESET_PIN, PIN_HIGH);
+
+    /* Wait at least 500ns after reset */
+    rt_thread_mdelay(1);
+
+    /* Set the device in standby mode */
+    read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+    write_reg(audio_dev, CS42L51_POWER_CTL1, (temp | 0x01));
+
+    /* Set all power down bits to 1 */
+    write_reg(audio_dev, CS42L51_POWER_CTL1, 0x7F);
+    read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_MIC_POWER_CTL, (temp | 0x0E));
+}
+
+/**
+  * @brief Initializes CS42L51.
+  * @param Device:     Audio type.
+  * @param bus_name    I2C device name.
+  * @param volume:     Initial output volume level (from 0 (-100dB) to 100 (0dB)).
+  * @retval 0 if correct communication, else wrong communication
+  */
+static rt_err_t cs42l51_init(uint16_t device, const char *bus_name, uint8_t volume)
+{
+    static uint8_t init_flag  = 0;
+    rt_uint8_t temp = 0;
+    rt_uint8_t value = 0;
+    
+    /* check if codec is already initialized */
+    if (init_flag == 0)
+    {
+        audio_dev = rt_i2c_bus_device_find(bus_name);
+        
+        if (audio_dev == RT_NULL)
+        {
+            LOG_E("%s bus not found\n", bus_name);
+            return -RT_ERROR;
+        }
+        /* hard reset cs42l51 */
+        cs42l51_drv.reset();
+        /* Wait at least 500ns after reset */
+        rt_thread_mdelay(1);
+        /* Set the device in standby mode */
+        read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+        write_reg(audio_dev, CS42L51_POWER_CTL1, (temp | 0x01));
+        /* Set all power down bits to 1 */
+        write_reg(audio_dev, CS42L51_POWER_CTL1, 0x7F);
+        read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+        write_reg(audio_dev, CS42L51_MIC_POWER_CTL, (temp | 0x0E));
+        
+        init_flag = 1;
+    }
+    else
+    {
+        /* Set all power down bits to 1 exept PDN to mute ADCs and DACs*/
+        write_reg(audio_dev, CS42L51_POWER_CTL1, 0x7E);
+        read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+        write_reg(audio_dev, CS42L51_MIC_POWER_CTL, (temp | 0x0E));
+        /* Disable zero cross and soft ramp */
+        read_reg(audio_dev, CS42L51_DAC_CTL, 1, &temp);
+        write_reg(audio_dev, CS42L51_DAC_CTL, (temp & 0xFC));
+
+        /* Power control : Enter standby (PDN = 1) */
+        read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+        write_reg(audio_dev, CS42L51_POWER_CTL1, (temp | 0x01)); 
+    }
+    /* Mic Power and Speed Control : Auto detect on, Speed mode SSM, tri state off, MCLK divide by 2 off */
+    read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_MIC_POWER_CTL, ((temp & 0x0E) | 0xA0));
+    /* Interface control : Loopback off, Slave, I2S (SDIN and SOUT), Digital mix off, Mic mix off */
+    write_reg(audio_dev, CS42L51_INTF_CTL, 0x0C);
+    /* Mic control : ADC single volume off, ADCB boost off, ADCA boost off, MicBias on AIN3B/MICIN2 pin, MicBias level 0.8xVA, MICB boost 16db, MICA boost 16dB */
+    write_reg(audio_dev, CS42L51_MIC_CTL, 0x00);
+    /* ADC control : ADCB HPF off, ADCB HPF freeze off, ADCA HPF off, ADCA HPF freeze off, Soft ramp B off, Zero cross B off, Soft ramp A off, Zero cross A off */
+    write_reg(audio_dev, CS42L51_ADC_CTL, 0x00);
+    /* ADC Input Select, Invert and Mute : AIN1B to PGAB, AIN3A to PreAmp to PGAA, ADCB invert off, ADCA invert off, ADCB mute on, ADCA mute off */
+    write_reg(audio_dev, CS42L51_ADC_INPUT, 0x32);
+    /* DAC output control : HP Gain to 1, Single volume control off, PCM invert signals polarity off, DAC channels mute on */
+    write_reg(audio_dev, CS42L51_DAC_OUT_CTL, 0xC3);
+    /* DAC control : Signal processing to DAC, Freeze off, De-emphasis off, Analog output auto mute off, DAC soft ramp */
+    write_reg(audio_dev, CS42L51_DAC_CTL, 0x42);
+    /* ALCA and PGAA Control : ALCA soft ramp disable on, ALCA zero cross disable on, PGA A Gain 0dB */  
+    write_reg(audio_dev, CS42L51_ALC_PGA_CTL, 0xC0);
+    /* ALCB and PGAB Control : ALCB soft ramp disable on, ALCB zero cross disable on, PGA B Gain 0dB */  
+    write_reg(audio_dev, CS42L51_ALC_PGB_CTL, 0xC0);
+    /* ADCA Attenuator : 0dB */
+    write_reg(audio_dev, CS42L51_ADCA_ATT, 0x00);
+    /* ADCB Attenuator : 0dB */
+    write_reg(audio_dev, CS42L51_ADCB_ATT, 0x00);
+    /* ADCA mixer volume control : ADCA mixer channel mute on, ADCA mixer volume 0dB */
+    write_reg(audio_dev, CS42L51_ADCA_VOL, 0x80);
+    /* ADCB mixer volume control : ADCB mixer channel mute on, ADCB mixer volume 0dB */
+    write_reg(audio_dev, CS42L51_ADCB_VOL, 0x80);
+    /* PCMA mixer volume control : PCMA mixer channel mute off, PCMA mixer volume 0dB */
+    write_reg(audio_dev, CS42L51_PCMA_VOL, 0x00);
+    /* PCMB mixer volume control : PCMB mixer channel mute off, PCMB mixer volume 0dB */
+    write_reg(audio_dev, CS42L51_PCMB_VOL, 0x00);
+    /* PCM channel mixer : AOUTA Left, AOUTB Right */
+    write_reg(audio_dev, CS42L51_PCM_MIXER, 0x00);
+
+    if(device & OUT_HEADPHONE)
+    {
+        value = VOLUME_CONVERT(volume);
+        /* AOUTA volume control : AOUTA volume */
+        write_reg(audio_dev, CS42L51_AOUTA_VOL, value);
+        /* AOUTB volume control : AOUTB volume */
+        write_reg(audio_dev, CS42L51_AOUTB_VOL, value); 
+    }
+    
+    CS42L51_Device = device;
+    
+    return RT_EOK;  
+}
+
+/**
+  * @brief  Deinitialize the audio codec.
+  * @param  None
+  * @retval  None
+  */
+static void cs42l51_deinit(void)
+{
+    /* Deinitialize Audio Codec interface */
+    rt_uint8_t temp = 0;
+
+    /* Mute DAC and ADC */
+    read_reg(audio_dev, CS42L51_DAC_OUT_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_DAC_OUT_CTL, (temp | 0x03));
+    read_reg(audio_dev, CS42L51_ADC_INPUT, 1, &temp);
+    write_reg(audio_dev, CS42L51_ADC_INPUT, (temp | 0x03));
+
+    /* Disable soft ramp and zero cross */
+    read_reg(audio_dev, CS42L51_ADC_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_ADC_CTL, (temp & 0xF0));
+
+    /* Set PDN to 1 */
+    read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+    write_reg(audio_dev, CS42L51_POWER_CTL1, (temp | 0x01));
+
+    /* Set all power down bits to 1 */
+    write_reg(audio_dev, CS42L51_POWER_CTL1, 0x7F);
+    read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+    write_reg(audio_dev, CS42L51_MIC_POWER_CTL, (temp | 0x0E));
+
+    /* Power off CS42L51*/
+    rt_pin_write(CS42L51_RESET_PIN, PIN_LOW);
+}
+
+/**
+  * @brief Verify that we have a CS42L51.   
+  * @retval 0 if correct communication, else wrong communication
+  */
+
+static uint32_t cs42l51_read_id(void)
+{
+    uint8_t temp;
+
+    /* read cs42l51 id */
+    read_reg(audio_dev, CS42L51_CHIP_REV_ID, 1, &temp);
+
+    if ((temp != CS42L51_MK_CHIP_REV(CS42L51_CHIP_ID, CS42L51_CHIP_REV_A)) &&
+        (temp != CS42L51_MK_CHIP_REV(CS42L51_CHIP_ID, CS42L51_CHIP_REV_B))) 
+    {
+      LOG_E("device id : 0x%02x", temp);  
+        return RT_ERROR;     
+    }
+    
+    LOG_D("device id : 0x%02x", temp);  
+    
+    return RT_EOK;
+}
+
+/**
+  * @brief Start the audio Codec play feature.
+  * @note For this codec no Play options are required.  
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_play(void)
+{
+    rt_uint8_t temp = 0;
+
+    switch (CS42L51_Device)
+    {
+    case OUT_HEADPHONE:
+        {
+        /* Unmute the output first */
+        cs42l51_drv.set_mute(AUDIO_MUTE_OFF);
+        /* DAC control : Signal processing to DAC, Freeze off, De-emphasis off, Analog output auto mute off, DAC soft ramp */
+        write_reg(audio_dev, CS42L51_DAC_CTL, 0x42);
+        /* Power control 1 : PDN_DACA, PDN_DACB disable. */
+        read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+        write_reg(audio_dev, CS42L51_POWER_CTL1, (temp & 0x9F));
+        break;
+        }
+        
+    case IN_LINE1:
+        {
+        /* ADC Input Select, Invert and Mute : AIN1B to PGAB, AIN1A to PGAA, ADCB invert off, ADCA invert off, ADCB mute off, ADCA mute off */
+        write_reg(audio_dev, CS42L51_ADC_INPUT, 0x00);
+        /* Power control 1 : PDN_PGAA, PDN_PGAA, PDN_ADCB, PDN_ADCA disable. */
+        read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+        write_reg(audio_dev, CS42L51_POWER_CTL1, (temp & 0x9F));
+        break;
+        }
+        
+    case IN_MIC1:
+        {
+        /* ADC Input Select, Invert and Mute : AIN1B to PGAB, AIN3A to PreAmp to PGAA, ADCB invert off, ADCA invert off, ADCB mute on, ADCA mute off */
+        write_reg(audio_dev, CS42L51_ADC_INPUT, 0x32);
+        /* Power control 1 : PDN_PGAA, PDN_ADCA disable. */
+        read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+        write_reg(audio_dev, CS42L51_POWER_CTL1, (temp & 0xF5));
+        /* Mic Power and Speed Control : PDN_MICA, PDN_MIC_BIAS disable. */
+        read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+        write_reg(audio_dev, CS42L51_MIC_POWER_CTL,(temp & 0xF9));
+        break;
+        }
+        
+    case IN_MIC2:
+        {
+         /* Power control 1 : PDN_PGAB, PDN_ADCB disable. */
+         read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+         write_reg(audio_dev, CS42L51_POWER_CTL1, (temp & 0xEB));
+         /* Mic Power and Speed Control : PDN_MICB, PDN_MIC_BIAS disable. */
+         read_reg(audio_dev, CS42L51_MIC_POWER_CTL, 1, &temp);
+         write_reg(audio_dev, CS42L51_MIC_POWER_CTL,(temp & 0xF5));
+         break;
+        }
+        
+    default:
+        LOG_D("error audio play mode!");
+        break;
+    }
+
+    /* Power control : Exit standby (PDN = 0) */
+    read_reg(audio_dev, CS42L51_POWER_CTL1, 1, &temp);
+    write_reg(audio_dev, CS42L51_POWER_CTL1, (temp & 0xFE));
+
+    return RT_EOK;
+}
+
+/**
+  * @brief Pause playing on the audio codec.
+  * @param audio_dev: Device address on communication Bus. 
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_pause(void)
+{  
+
+  /* Pause the audio file playing */
+  /* Mute the output first */
+  return cs42l51_drv.set_mute(AUDIO_MUTE_ON);
+
+}
+
+/**
+  * @brief Resume playing on the audio codec.
+  * @param audio_dev: Device address on communication Bus. 
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_resume(void)
+{
+  /* Unmute the output  */
+  return cs42l51_drv.set_mute(AUDIO_MUTE_OFF);
+}
+
+/**
+  * @brief Stop audio Codec playing. It powers down the codec.
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_stop(void)
+{
+    rt_uint8_t temp = 0;
+
+    /* Set all power down bits to 1 exept PDN to mute ADCs and DACs*/
+    write_reg(audio_dev, 0x02, 0x7E);
+    read_reg(audio_dev, 0x03, 1, &temp);
+    write_reg(audio_dev, 0x03, (temp | 0x0E));
+
+    /* Disable zero cross and soft ramp */
+    read_reg(audio_dev, 0x09, 1, &temp);
+    write_reg(audio_dev, 0x09, (temp & 0xFC));
+
+    /* Power control : Enter standby (PDN = 1) */
+    read_reg(audio_dev, 0x02, 1, &temp);
+    write_reg(audio_dev, 0x02, (temp | 0x01));
+
+    return RT_EOK;
+}
+
+/**
+  * @brief Set new frequency.
+  * @param AudioFreq: Audio frequency used to play the audio stream.
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_set_frequency(uint32_t AudioFreq)
+{
+    return RT_EOK;
+}
+
+/**
+  * @brief Set higher or lower the codec volume level.  
+  * @param Volume: output volume level (from 0 (-100dB) to 100 (0dB)).
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_set_volume(uint8_t Volume)
+{
+    uint8_t  convertedvol = VOLUME_CONVERT(Volume);
+
+    /* AOUTA volume control : AOUTA volume */
+    write_reg(audio_dev, CS42L51_AOUTA_VOL, convertedvol);
+    /* AOUTB volume control : AOUTB volume */
+    write_reg(audio_dev, CS42L51_AOUTB_VOL, convertedvol);
+
+    return RT_EOK;
+}
+
+/**
+  * @brief get higher or lower the codec volume level.  
+  * @retval value if correct communication
+  */
+static uint32_t cs42l51_get_volume(void)
+{
+    rt_uint8_t temp = 0;
+    
+    /* AOUTA volume control : AOUTA volume */
+    read_reg(audio_dev, CS42L51_AOUTA_VOL, 1, &temp);
+
+    temp = VOLUME_INVERT(temp);
+    
+    return temp;
+}
+
+/**
+* @brief Enable or disable the mute feature on the audio codec.  
+* @param Cmd: AUDIO_MUTE_ON to enable the mute or AUDIO_MUTE_OFF to disable the
+*             mute mode.
+* @retval 0 if correct communication, else wrong communication
+*/
+static uint32_t cs42l51_set_mute(uint32_t cmd)
+{
+    rt_uint8_t temp = 0;
+    
+    /* Read DAC output control register */
+    read_reg(audio_dev, 0x08, 1, &temp);
+
+    /* Set the Mute mode */
+    if(cmd == AUDIO_MUTE_ON)
+    {
+        /* Mute DAC channels */
+        write_reg(audio_dev, CS42L51_DAC_OUT_CTL, (temp | 0x03));
+    }
+    else /* AUDIO_MUTE_OFF Disable the Mute */
+    {
+        /* Unmute DAC channels */
+        write_reg(audio_dev, CS42L51_DAC_OUT_CTL, (temp & 0xFC));
+    }
+
+    return RT_EOK;
+}
+
+/**
+  * @brief Switch dynamically (while audio file is played) the output target 
+  *         (speaker, headphone, etc).
+  * @note This function is currently not used (only headphone output device).
+  * @param Output: specifies the audio output device target. 
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_set_output_mode(uint8_t Output)
+{
+    return RT_EOK;
+}
+
+/**
+  * @brief Reset CS42L51 registers. 
+  * @retval 0 if correct communication, else wrong communication
+  */
+static uint32_t cs42l51_reset(void)
+{
+    cs42l51_lowlevel_deinit();
+
+    cs42l51_lowlevel_init();
+
+    return RT_EOK;
+}
+
+/* Audio codec driver structure initialization */  
+AUDIO_DrvTypeDef cs42l51_drv = 
+{
+  cs42l51_init,
+  cs42l51_deinit,
+  cs42l51_read_id,
+
+  cs42l51_play,
+  cs42l51_pause,
+  cs42l51_resume,
+  cs42l51_stop,  
+  
+  cs42l51_set_frequency,  
+  cs42l51_set_volume,
+  cs42l51_get_volume,
+  cs42l51_set_mute,  
+  cs42l51_set_output_mode,
+  cs42l51_reset,
+};
+
+#endif

+ 198 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_cs42l51.h

@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ * 
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Date           Author       Notes
+ * 2020-07-02     thread-liu   first version
+ */
+
+#ifndef __DRV_CS42L51_H__
+#define __DRV_CS42L51_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+    
+typedef struct
+{
+  rt_err_t  (*init)(uint16_t , const char *, uint8_t);
+  void      (*deinit)(void);
+  uint32_t  (*read_id)(void);
+  uint32_t  (*play)(void);
+  uint32_t  (*pause)(void);
+  uint32_t  (*resume)(void);
+  uint32_t  (*stop)(void);
+  uint32_t  (*set_frequency)(uint32_t);
+  uint32_t  (*set_volume)(uint8_t);
+  uint32_t  (*get_volume)(void);
+  uint32_t  (*set_mute)(uint32_t);
+  uint32_t  (*set_output_mode)(uint8_t);
+  uint32_t  (*reset)(void);
+}AUDIO_DrvTypeDef;
+
+extern AUDIO_DrvTypeDef cs42l51_drv;
+
+/* CS42L51 register space */
+#define CS42L51_CHIP_ID			            0x1B
+#define CS42L51_CHIP_REV_A		            0x00
+#define CS42L51_CHIP_REV_B		            0x01
+
+#define CS42L51_CHIP_REV_ID		            0x01
+#define CS42L51_MK_CHIP_REV(a, b)	        ((a)<<3|(b))
+
+#define CS42L51_POWER_CTL1		            0x02
+#define CS42L51_POWER_CTL1_PDN_DACB	        (1<<6)
+#define CS42L51_POWER_CTL1_PDN_DACA	        (1<<5)
+#define CS42L51_POWER_CTL1_PDN_PGAB	        (1<<4)
+#define CS42L51_POWER_CTL1_PDN_PGAA	        (1<<3)
+#define CS42L51_POWER_CTL1_PDN_ADCB	        (1<<2)
+#define CS42L51_POWER_CTL1_PDN_ADCA	        (1<<1)
+#define CS42L51_POWER_CTL1_PDN		        (1<<0)
+
+#define CS42L51_MIC_POWER_CTL		        0x03
+#define CS42L51_MIC_POWER_CTL_AUTO	        (1<<7)
+#define CS42L51_MIC_POWER_CTL_SPEED(x)	    (((x)&3)<<5)
+#define CS42L51_QSM_MODE		            3
+#define CS42L51_HSM_MODE		            2
+#define	CS42L51_SSM_MODE		            1
+#define CS42L51_DSM_MODE		            0
+#define CS42L51_MIC_POWER_CTL_3ST_SP	    (1<<4)
+#define CS42L51_MIC_POWER_CTL_PDN_MICB	    (1<<3)
+#define CS42L51_MIC_POWER_CTL_PDN_MICA	    (1<<2)
+#define CS42L51_MIC_POWER_CTL_PDN_BIAS	    (1<<1)
+#define CS42L51_MIC_POWER_CTL_MCLK_DIV2	    (1<<0)
+
+#define CS42L51_INTF_CTL		            0x04
+#define CS42L51_INTF_CTL_LOOPBACK	        (1<<7)
+#define CS42L51_INTF_CTL_MASTER		        (1<<6)
+#define CS42L51_INTF_CTL_DAC_FORMAT(x)	    (((x)&7)<<3)
+#define CS42L51_DAC_DIF_LJ24		        0x00
+#define CS42L51_DAC_DIF_I2S		            0x01
+#define CS42L51_DAC_DIF_RJ24		        0x02
+#define CS42L51_DAC_DIF_RJ20		        0x03
+#define CS42L51_DAC_DIF_RJ18		        0x04
+#define CS42L51_DAC_DIF_RJ16		        0x05
+#define CS42L51_INTF_CTL_ADC_I2S	        (1<<2)
+#define CS42L51_INTF_CTL_DIGMIX		        (1<<1)
+#define CS42L51_INTF_CTL_MICMIX		        (1<<0)
+
+#define CS42L51_MIC_CTL			            0x05
+#define CS42L51_MIC_CTL_ADC_SNGVOL	        (1<<7)
+#define CS42L51_MIC_CTL_ADCD_DBOOST	        (1<<6)
+#define CS42L51_MIC_CTL_ADCA_DBOOST	        (1<<5)
+#define CS42L51_MIC_CTL_MICBIAS_SEL	        (1<<4)
+#define CS42L51_MIC_CTL_MICBIAS_LVL(x)	    (((x)&3)<<2)
+#define CS42L51_MIC_CTL_MICB_BOOST	        (1<<1)
+#define CS42L51_MIC_CTL_MICA_BOOST	        (1<<0)
+
+#define CS42L51_ADC_CTL			            0x06
+#define CS42L51_ADC_CTL_ADCB_HPFEN	        (1<<7)
+#define CS42L51_ADC_CTL_ADCB_HPFRZ	        (1<<6)
+#define CS42L51_ADC_CTL_ADCA_HPFEN	        (1<<5)
+#define CS42L51_ADC_CTL_ADCA_HPFRZ	        (1<<4)
+#define CS42L51_ADC_CTL_SOFTB		        (1<<3)
+#define CS42L51_ADC_CTL_ZCROSSB		        (1<<2)
+#define CS42L51_ADC_CTL_SOFTA		        (1<<1)
+#define CS42L51_ADC_CTL_ZCROSSA		        (1<<0)
+
+#define CS42L51_ADC_INPUT		            0x07
+#define CS42L51_ADC_INPUT_AINB_MUX(x)	    (((x)&3)<<6)
+#define CS42L51_ADC_INPUT_AINA_MUX(x)	    (((x)&3)<<4)
+#define CS42L51_ADC_INPUT_INV_ADCB	        (1<<3)
+#define CS42L51_ADC_INPUT_INV_ADCA	        (1<<2)
+#define CS42L51_ADC_INPUT_ADCB_MUTE	        (1<<1)
+#define CS42L51_ADC_INPUT_ADCA_MUTE	        (1<<0)
+
+#define CS42L51_DAC_OUT_CTL		            0x08
+#define CS42L51_DAC_OUT_CTL_HP_GAIN(x)	    (((x)&7)<<5)
+#define CS42L51_DAC_OUT_CTL_DAC_SNGVOL	    (1<<4)
+#define CS42L51_DAC_OUT_CTL_INV_PCMB	    (1<<3)
+#define CS42L51_DAC_OUT_CTL_INV_PCMA	    (1<<2)
+#define CS42L51_DAC_OUT_CTL_DACB_MUTE	    (1<<1)
+#define CS42L51_DAC_OUT_CTL_DACA_MUTE	    (1<<0)
+
+#define CS42L51_DAC_CTL			            0x09
+#define CS42L51_DAC_CTL_DATA_SEL(x)	        (((x)&3)<<6)
+#define CS42L51_DAC_CTL_FREEZE		        (1<<5)
+#define CS42L51_DAC_CTL_DEEMPH		        (1<<3)
+#define CS42L51_DAC_CTL_AMUTE		        (1<<2)
+#define CS42L51_DAC_CTL_DACSZ(x)	        (((x)&3)<<0)
+
+#define CS42L51_ALC_PGA_CTL		            0x0A
+#define CS42L51_ALC_PGB_CTL		            0x0B
+#define CS42L51_ALC_PGX_ALCX_SRDIS	        (1<<7)
+#define CS42L51_ALC_PGX_ALCX_ZCDIS	        (1<<6)
+#define CS42L51_ALC_PGX_PGX_VOL(x)	        (((x)&0x1f)<<0)
+
+#define CS42L51_ADCA_ATT		            0x0C
+#define CS42L51_ADCB_ATT		            0x0D
+
+#define CS42L51_ADCA_VOL		            0x0E
+#define CS42L51_ADCB_VOL		            0x0F
+#define CS42L51_PCMA_VOL		            0x10
+#define CS42L51_PCMB_VOL		            0x11
+#define CS42L51_MIX_MUTE_ADCMIX		        (1<<7)
+#define CS42L51_MIX_VOLUME(x)		        (((x)&0x7f)<<0)
+
+#define CS42L51_BEEP_FREQ		            0x12
+#define CS42L51_BEEP_VOL		            0x13
+#define CS42L51_BEEP_CONF		            0x14
+
+#define CS42L51_TONE_CTL		            0x15
+#define CS42L51_TONE_CTL_TREB(x)	        (((x)&0xf)<<4)
+#define CS42L51_TONE_CTL_BASS(x)	        (((x)&0xf)<<0)
+
+#define CS42L51_AOUTA_VOL		            0x16
+#define CS42L51_AOUTB_VOL		            0x17
+#define CS42L51_PCM_MIXER		            0x18
+#define CS42L51_LIMIT_THRES_DIS		        0x19
+#define CS42L51_LIMIT_REL		            0x1A
+#define CS42L51_LIMIT_ATT		            0x1B
+#define CS42L51_ALC_EN			            0x1C
+#define CS42L51_ALC_REL			            0x1D
+#define CS42L51_ALC_THRES		            0x1E
+#define CS42L51_NOISE_CONF		            0x1F
+
+#define CS42L51_STATUS			            0x20
+#define CS42L51_STATUS_SP_CLKERR	        (1<<6)
+#define CS42L51_STATUS_SPEA_OVFL	        (1<<5)
+#define CS42L51_STATUS_SPEB_OVFL	        (1<<4)
+#define CS42L51_STATUS_PCMA_OVFL	        (1<<3)
+#define CS42L51_STATUS_PCMB_OVFL	        (1<<2)
+#define CS42L51_STATUS_ADCA_OVFL	        (1<<1)
+#define CS42L51_STATUS_ADCB_OVFL	        (1<<0)
+
+#define CS42L51_CHARGE_FREQ		            0x21
+#define CS42L51_FIRSTREG	                0x01
+
+enum play_type {
+    NONE,
+    OUT_HEADPHONE,
+    IN_MIC1,
+    IN_MIC2,
+    IN_LINE1,
+    IN_LINE2,
+    IN_LINE3,
+};
+
+/*
+ * Hack: with register 0x21, it makes 33 registers. Looks like someone in the
+ * i2c layer doesn't like i2c smbus block read of 33 regs. Workaround by using
+ * 32 regs
+ */
+#define CS42L51_LASTREG		                0x20
+#define CS42L51_NUMREGS		                (CS42L51_LASTREG - CS42L51_FIRSTREG + 1)
+
+#define VOLUME_CONVERT(Volume)              ((Volume >= 100) ? 0 : ((uint8_t)(((Volume * 2) + 56))))
+#define VOLUME_INVERT(Volume)               (((Volume) == 0U) ? 100U : ((uint8_t)(((Volume) - 56U) / 2U)))
+     
+/* MUTE commands */
+#define AUDIO_MUTE_ON                       1
+#define AUDIO_MUTE_OFF                      0
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

+ 390 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_mic.c

@@ -0,0 +1,390 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2019-07-31     Zero-Free    first implementation
+ * 2020-07-02     thread-liu   Porting for STM32MP1
+ */
+
+#include <board.h>
+
+#if defined(BSP_USING_AUDIO_RECORD)
+
+#include "drv_cs42l51.h"
+
+//#define DRV_DEBUG
+#define DBG_TAG              "drv.audio"
+#define DBG_LVL              DBG_INFO
+#include <rtdbg.h>
+
+#define MIC_BUS_NAME    "i2c4"
+
+/* SYSRAM  */
+#define RX_FIFO_SIZE (4096)
+#if defined(__CC_ARM) || defined(__CLANG_ARM)
+rt_uint8_t MIC_RX_FIFO[RX_FIFO_SIZE] __attribute__((at(0x2FFC2000)));
+#elif defined(__ICCARM__)
+#pragma location = 0x2FFC2000
+rt_uint8_t MIC_RX_FIFO[RX_FIFO_SIZE];
+#elif defined ( __GNUC__ )
+rt_uint8_t MIC_RX_FIFO[RX_FIFO_SIZE] __attribute__((at(0x2FFC2000)));
+#endif
+
+struct mic_device
+{
+    struct rt_audio_device audio;
+    struct rt_audio_configure record_config;
+    rt_uint8_t *rx_fifo;
+    rt_uint8_t volume;
+};
+
+static struct mic_device mic_dev = {0};
+static rt_uint16_t zero_frame[2] = {0};
+
+extern SAI_HandleTypeDef hsai_BlockA2;
+extern DMA_HandleTypeDef hdma_sai2_a;
+extern SAI_HandleTypeDef hsai_BlockB2;
+extern DMA_HandleTypeDef hdma_sai2_b;
+extern void SAIA_Frequency_Set(uint32_t frequency);
+
+void SAIB_Init(void)
+{
+    HAL_SAI_DeInit(&hsai_BlockB2);
+
+    hsai_BlockB2.Instance                    = SAI2_Block_B;
+    hsai_BlockB2.Init.AudioFrequency         = SAI_AUDIO_FREQUENCY_44K;
+    hsai_BlockB2.Init.AudioMode              = SAI_MODESLAVE_RX;
+    hsai_BlockB2.Init.Synchro                = SAI_SYNCHRONOUS;
+    hsai_BlockB2.Init.OutputDrive            = SAI_OUTPUTDRIVE_ENABLE;
+    hsai_BlockB2.Init.NoDivider              = SAI_MASTERDIVIDER_ENABLE;
+    hsai_BlockB2.Init.FIFOThreshold          = SAI_FIFOTHRESHOLD_1QF;
+    hsai_BlockB2.Init.Mckdiv                 = 0;
+    hsai_BlockB2.Init.MckOverSampling        = SAI_MCK_OVERSAMPLING_DISABLE;
+    hsai_BlockB2.Init.MonoStereoMode         = SAI_STEREOMODE;
+    hsai_BlockB2.Init.CompandingMode         = SAI_NOCOMPANDING;
+    hsai_BlockB2.Init.TriState               = SAI_OUTPUT_NOTRELEASED;
+    hsai_BlockB2.Init.PdmInit.Activation     = DISABLE;
+    hsai_BlockB2.Init.PdmInit.MicPairsNbr    = 1;
+    hsai_BlockB2.Init.PdmInit.ClockEnable    = SAI_PDM_CLOCK1_ENABLE;
+    hsai_BlockB2.Init.Protocol               = SAI_FREE_PROTOCOL;
+    hsai_BlockB2.Init.DataSize               = SAI_DATASIZE_16;
+    hsai_BlockB2.Init.FirstBit               = SAI_FIRSTBIT_MSB;
+    hsai_BlockB2.Init.ClockStrobing          = SAI_CLOCKSTROBING_RISINGEDGE;
+
+    hsai_BlockB2.FrameInit.FrameLength       = 64;
+    hsai_BlockB2.FrameInit.ActiveFrameLength = 32;
+    hsai_BlockB2.FrameInit.FSDefinition      = SAI_FS_CHANNEL_IDENTIFICATION;
+    hsai_BlockB2.FrameInit.FSPolarity        = SAI_FS_ACTIVE_LOW;
+    hsai_BlockB2.FrameInit.FSOffset          = SAI_FS_BEFOREFIRSTBIT;
+    
+    hsai_BlockB2.SlotInit.FirstBitOffset     = 0;
+    hsai_BlockB2.SlotInit.SlotSize           = SAI_SLOTSIZE_32B;
+    hsai_BlockB2.SlotInit.SlotNumber         = 2;
+    hsai_BlockB2.SlotInit.SlotActive         = SAI_SLOTACTIVE_0|SAI_SLOTACTIVE_1;
+    
+    /* DeInit SAI PDM input */
+    HAL_SAI_DeInit(&hsai_BlockB2);
+    
+    /* Init SAI PDM input */
+    if(HAL_OK != HAL_SAI_Init(&hsai_BlockB2))
+    {
+        Error_Handler();
+    }
+    
+    /* Enable SAI to generate clock used by audio driver */
+    __HAL_SAI_ENABLE(&hsai_BlockB2);
+}
+
+void SAIB_Channels_Set(uint8_t channels)
+{
+    if (channels == 1)
+    {
+        hsai_BlockB2.Init.MonoStereoMode = SAI_MONOMODE;
+    }
+    else
+    {
+        hsai_BlockB2.Init.MonoStereoMode = SAI_STEREOMODE;
+    }
+
+    __HAL_SAI_DISABLE(&hsai_BlockB2);
+    HAL_SAI_Init(&hsai_BlockB2);
+    __HAL_SAI_ENABLE(&hsai_BlockB2);
+}
+
+void DMA2_Stream4_IRQHandler(void)
+{
+    HAL_DMA_IRQHandler(&hdma_sai2_b);
+}
+
+void HAL_SAI_RxHalfCpltCallback(SAI_HandleTypeDef *hsai)
+{
+    rt_audio_rx_done(&mic_dev.audio, &mic_dev.rx_fifo[0], RX_FIFO_SIZE / 2);
+}
+
+void HAL_SAI_RxCpltCallback(SAI_HandleTypeDef *hsai)
+{
+    rt_audio_rx_done(&mic_dev.audio, &mic_dev.rx_fifo[RX_FIFO_SIZE / 2], RX_FIFO_SIZE / 2);
+}
+
+static rt_err_t mic_getcaps(struct rt_audio_device *audio, struct rt_audio_caps *caps)
+{
+    rt_err_t result = RT_EOK;
+    struct mic_device *mic_dev;
+
+    RT_ASSERT(audio != RT_NULL);
+    mic_dev = (struct mic_device *)audio->parent.user_data;
+
+    switch (caps->main_type)
+    {
+    case AUDIO_TYPE_QUERY: /* qurey the types of hw_codec device */
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_TYPE_QUERY:
+            caps->udata.mask = AUDIO_TYPE_INPUT | AUDIO_TYPE_MIXER;
+            break;
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    case AUDIO_TYPE_INPUT: /* Provide capabilities of INPUT unit */
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_DSP_PARAM:
+            caps->udata.config.samplerate   = mic_dev->record_config.samplerate;
+            caps->udata.config.channels     = mic_dev->record_config.channels;
+            caps->udata.config.samplebits   = mic_dev->record_config.samplebits;
+            break;
+
+        case AUDIO_DSP_SAMPLERATE:
+            caps->udata.config.samplerate   = mic_dev->record_config.samplerate;
+            break;
+
+        case AUDIO_DSP_CHANNELS:
+            caps->udata.config.channels     = mic_dev->record_config.channels;
+            break;
+
+        case AUDIO_DSP_SAMPLEBITS:
+            caps->udata.config.samplebits   = mic_dev->record_config.samplebits;
+            break;
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    case AUDIO_TYPE_MIXER: /* report the Mixer Units */
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_MIXER_QUERY:
+            caps->udata.mask = AUDIO_MIXER_VOLUME | AUDIO_MIXER_LINE;
+            break;
+
+        case AUDIO_MIXER_VOLUME:
+            caps->udata.value = mic_dev->volume;
+            break;
+
+        case AUDIO_MIXER_LINE:
+            break;
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    default:
+        result = -RT_ERROR;
+        break;
+    }
+
+    return result;
+}
+
+static rt_err_t mic_configure(struct rt_audio_device *audio, struct rt_audio_caps *caps)
+{
+    rt_err_t result = RT_EOK;
+    struct mic_device *mic_dev;
+
+    RT_ASSERT(audio != RT_NULL);
+    mic_dev = (struct mic_device *)audio->parent.user_data;
+
+    switch (caps->main_type)
+    {
+    case AUDIO_TYPE_MIXER:
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_MIXER_VOLUME:
+        {
+            rt_uint32_t volume = caps->udata.value;
+            mic_dev->volume = volume;
+            LOG_D("set volume %d", volume);
+            break;
+        }
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    case AUDIO_TYPE_INPUT:
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_DSP_PARAM:
+        {
+            SAIA_Frequency_Set(caps->udata.config.samplerate);
+            HAL_SAI_DMAStop(&hsai_BlockB2);
+            SAIB_Channels_Set(caps->udata.config.channels);
+            HAL_SAI_Transmit(&hsai_BlockA2, (uint8_t *)&zero_frame[0], 2, 0);
+            HAL_SAI_Receive_DMA(&hsai_BlockB2, mic_dev->rx_fifo, RX_FIFO_SIZE / 2);
+
+            /* save configs */
+            mic_dev->record_config.samplerate = caps->udata.config.samplerate;
+            mic_dev->record_config.channels   = caps->udata.config.channels;
+            mic_dev->record_config.samplebits = caps->udata.config.samplebits;
+            LOG_D("set samplerate %d", mic_dev->record_config.samplerate);
+            LOG_D("set channels %d", mic_dev->record_config.channels);
+            break;
+        }
+
+        case AUDIO_DSP_SAMPLERATE:
+        {
+            mic_dev->record_config.samplerate = caps->udata.config.samplerate;
+            LOG_D("set channels %d", mic_dev->record_config.channels);
+            break;
+        }
+
+        case AUDIO_DSP_CHANNELS:
+        {
+            mic_dev->record_config.channels = caps->udata.config.channels;
+            LOG_D("set channels %d", mic_dev->record_config.channels);
+            break;
+        }
+
+        default:
+            break;
+        }
+
+        break;
+    }
+
+    default:
+        break;
+    }
+
+    return result;
+}
+
+static rt_err_t mic_init(struct rt_audio_device *audio)
+{
+    struct mic_device *mic_dev;
+    RT_ASSERT(audio != RT_NULL);
+    
+    mic_dev = (struct mic_device *)audio->parent.user_data;
+    SAIB_Init();
+    /* set default params */
+    SAIB_Channels_Set(mic_dev->record_config.channels);
+
+    return RT_EOK;
+}
+
+static rt_err_t mic_start(struct rt_audio_device *audio, int stream)
+{
+    struct mic_device *mic_dev;
+    RT_ASSERT(audio != RT_NULL);
+    
+    mic_dev = (struct mic_device *)audio->parent.user_data;
+    if (stream == AUDIO_STREAM_RECORD)
+    {
+        cs42l51_drv.init(IN_MIC1, MIC_BUS_NAME, 40);
+        /* open receive */
+        if (HAL_SAI_Receive_DMA(&hsai_BlockB2, mic_dev->rx_fifo, RX_FIFO_SIZE / 2) != HAL_OK)
+        {
+            return RT_ERROR;
+        }
+        /* supply clk */
+        HAL_SAI_Transmit(&hsai_BlockA2, (uint8_t *)&zero_frame[0], 2, 0);
+        
+        cs42l51_drv.play();
+    }
+
+    return RT_EOK;
+}
+
+static rt_err_t mic_stop(struct rt_audio_device *audio, int stream)
+{
+    if (stream == AUDIO_STREAM_RECORD)
+    {
+        HAL_SAI_DMAStop(&hsai_BlockB2);
+        HAL_SAI_Abort(&hsai_BlockB2);
+        cs42l51_drv.stop();
+    }
+
+    return RT_EOK;
+}
+
+static struct rt_audio_ops mic_ops =
+{
+    .getcaps     = mic_getcaps,
+    .configure   = mic_configure,
+    .init        = mic_init,
+    .start       = mic_start,
+    .stop        = mic_stop,
+    .transmit    = RT_NULL,
+    .buffer_info = RT_NULL,
+};
+
+int rt_hw_mic_init(void)
+{
+    rt_err_t result = RT_EOK;
+    struct rt_device *device;
+    
+    rt_memset(MIC_RX_FIFO, 0, RX_FIFO_SIZE);
+    mic_dev.rx_fifo = MIC_RX_FIFO;
+
+    /* init default configuration */
+    {
+        mic_dev.record_config.samplerate = 44100;
+        mic_dev.record_config.channels   = 2;
+        mic_dev.record_config.samplebits = 16;
+        mic_dev.volume                   = 55;
+    }
+
+    /* register sound device */
+    mic_dev.audio.ops = &mic_ops;
+    result = rt_audio_register(&mic_dev.audio, "mic0", RT_DEVICE_FLAG_RDONLY, &mic_dev);
+    
+    if (result != RT_EOK)
+    {
+        device = &(mic_dev.audio.parent); 
+        rt_device_unregister(device);
+        LOG_E("mic device init error!");
+        return RT_ERROR;
+    }
+    
+    return RT_EOK;
+}
+
+INIT_DEVICE_EXPORT(rt_hw_mic_init);
+
+#endif

+ 603 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_sound.c

@@ -0,0 +1,603 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2019-07-31     Zero-Free    first implementation
+ * 2020-07-02     thread-liu   Porting for STM32MP1
+ */
+
+#include "board.h"
+#include "drv_cs42l51.h"
+
+#ifdef BSP_USING_AUDIO
+
+//#define DRV_DEBUG
+#define LOG_TAG             "drv.audio"
+#include <drv_log.h>
+
+#define SOUND_BUS_NAME    "i2c4"
+
+/* SYSRAM  */
+#define TX_FIFO_SIZE       (4096)
+#if defined(__CC_ARM) || defined(__CLANG_ARM)
+rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE] __attribute__((at(0x2FFC3000)));
+#elif defined(__ICCARM__)
+#pragma location = 0x2FFC3000
+rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE];
+#elif defined ( __GNUC__ )
+rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE] __attribute__((at(0x2FFC3000)));
+#endif
+
+struct sound_device
+{
+    struct rt_audio_device audio;
+    struct rt_audio_configure replay_config;
+    rt_uint8_t *tx_fifo;
+    rt_uint8_t volume;
+};
+
+static struct sound_device snd_dev = {0};
+
+SAI_HandleTypeDef hsai_BlockA2     = {0};
+DMA_HandleTypeDef hdma_sai2_a      = {0};
+SAI_HandleTypeDef hsai_BlockB2     = {0};
+DMA_HandleTypeDef hdma_sai2_b      = {0};
+
+void HAL_SAI_MspInit(SAI_HandleTypeDef* hsai)
+{
+
+    GPIO_InitTypeDef GPIO_InitStruct = {0};
+    RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+    /* SAI2 */
+    if(hsai->Instance==SAI2_Block_A)
+    {
+        /* Peripheral clock enable */
+        if(IS_ENGINEERING_BOOT_MODE())
+        {
+            /** Initializes the peripherals clock 
+            */
+            PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_SAI2;
+            PeriphClkInit.Sai2ClockSelection = RCC_SAI2CLKSOURCE_PLL3_Q;
+            if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+            {
+                Error_Handler();
+            }
+        }
+
+        __HAL_RCC_GPIOE_CLK_ENABLE();
+        __HAL_RCC_GPIOI_CLK_ENABLE();
+        __HAL_RCC_GPIOF_CLK_ENABLE();
+        __HAL_RCC_SAI2_CLK_ENABLE();
+
+        /**SAI2_A_Block_A GPIO Configuration    
+        PE0     ------> SAI2_MCLK_A
+        PI7     ------> SAI2_FS_A
+        PI5     ------> SAI2_SCK_A
+        PI6     ------> SAI2_SD_A
+        */
+        GPIO_InitStruct.Pin = GPIO_PIN_0;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+        GPIO_InitStruct.Alternate = GPIO_AF10_SAI2;
+        HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
+
+        GPIO_InitStruct.Pin = GPIO_PIN_7|GPIO_PIN_5|GPIO_PIN_6;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+        GPIO_InitStruct.Alternate = GPIO_AF10_SAI2;
+        HAL_GPIO_Init(GPIOI, &GPIO_InitStruct);
+
+        /* Configure DMA used for SAI2 */
+        __HAL_RCC_DMAMUX_CLK_ENABLE();
+        __HAL_RCC_DMA2_CLK_ENABLE();
+
+        hdma_sai2_a.Instance                 = DMA2_Stream5;
+        hdma_sai2_a.Init.Request             = DMA_REQUEST_SAI2_A;
+        hdma_sai2_a.Init.Direction           = DMA_MEMORY_TO_PERIPH;
+        hdma_sai2_a.Init.PeriphInc           = DMA_PINC_DISABLE;
+        hdma_sai2_a.Init.MemInc              = DMA_MINC_ENABLE;
+        hdma_sai2_a.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+        hdma_sai2_a.Init.MemDataAlignment    = DMA_MDATAALIGN_HALFWORD;
+        hdma_sai2_a.Init.Mode                = DMA_CIRCULAR;
+        hdma_sai2_a.Init.Priority            = DMA_PRIORITY_HIGH;
+        hdma_sai2_a.Init.FIFOMode            = DMA_FIFOMODE_DISABLE;
+        
+        HAL_DMA_DeInit(&hdma_sai2_a);
+        if (HAL_DMA_Init(&hdma_sai2_a) != HAL_OK)
+        {
+          Error_Handler();
+        }
+        __HAL_LINKDMA(hsai,hdmatx,hdma_sai2_a);
+        __HAL_DMA_ENABLE(&hdma_sai2_a);
+        HAL_NVIC_SetPriority(DMA2_Stream5_IRQn, 2, 0);
+        HAL_NVIC_EnableIRQ(DMA2_Stream5_IRQn);
+    }
+    
+    if(hsai->Instance==SAI2_Block_B)
+    {
+          /* Peripheral clock enable */
+        if(IS_ENGINEERING_BOOT_MODE())
+        {
+            /** Initializes the peripherals clock 
+            */
+            PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_SAI2;
+            PeriphClkInit.Sai2ClockSelection = RCC_SAI2CLKSOURCE_PLL3_Q;
+            if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+            {
+              Error_Handler();
+            }
+
+        }
+        __HAL_RCC_GPIOF_CLK_ENABLE();
+        __HAL_RCC_SAI2_CLK_ENABLE();
+                
+        /**SAI2_B_Block_B GPIO Configuration    
+        PF11     ------> SAI2_SD_B 
+        */
+        GPIO_InitStruct.Pin = GPIO_PIN_11;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+        GPIO_InitStruct.Alternate = GPIO_AF10_SAI2;
+        HAL_GPIO_Init(GPIOF, &GPIO_InitStruct);
+
+        __HAL_RCC_DMAMUX_CLK_ENABLE();
+        __HAL_RCC_DMA2_CLK_ENABLE();
+        
+        /* Peripheral DMA init*/
+        hdma_sai2_b.Instance                 = DMA2_Stream4;
+        hdma_sai2_b.Init.Request             = DMA_REQUEST_SAI2_B;
+        hdma_sai2_b.Init.Direction           = DMA_PERIPH_TO_MEMORY;
+        hdma_sai2_b.Init.PeriphInc           = DMA_PINC_DISABLE;
+        hdma_sai2_b.Init.MemInc              = DMA_MINC_ENABLE;
+        hdma_sai2_b.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+        hdma_sai2_b.Init.MemDataAlignment    = DMA_MDATAALIGN_HALFWORD;
+        hdma_sai2_b.Init.Mode                = DMA_CIRCULAR;
+        hdma_sai2_b.Init.Priority            = DMA_PRIORITY_HIGH;
+        hdma_sai2_b.Init.FIFOMode            = DMA_FIFOMODE_DISABLE;
+        hdma_sai2_b.Init.FIFOThreshold       = DMA_FIFO_THRESHOLD_FULL;
+        hdma_sai2_b.Init.MemBurst            = DMA_MBURST_SINGLE;
+        hdma_sai2_b.Init.PeriphBurst         = DMA_PBURST_SINGLE;
+		__HAL_LINKDMA(hsai,hdmarx,hdma_sai2_b);
+        HAL_DMA_DeInit(&hdma_sai2_b);
+        if (HAL_DMA_Init(&hdma_sai2_b) != HAL_OK)
+        {
+          Error_Handler();
+        }
+        __HAL_LINKDMA(hsai,hdmarx,hdma_sai2_b);
+        __HAL_DMA_ENABLE(&hdma_sai2_b);
+        HAL_NVIC_SetPriority(DMA2_Stream4_IRQn, 2, 0);
+        HAL_NVIC_EnableIRQ(DMA2_Stream4_IRQn); 
+    }
+}
+
+void HAL_SAI_MspDeInit(SAI_HandleTypeDef* hsai)
+{
+    /* SAI2 */
+    if(hsai->Instance==SAI2_Block_A)
+    {
+
+        /* Peripheral clock disable */ 
+        __HAL_RCC_SAI2_CLK_DISABLE();
+
+        /**SAI2_A_Block_A GPIO Configuration    
+        PE0     ------> SAI2_MCLK_A
+        PI7     ------> SAI2_FS_A
+        PI5     ------> SAI2_SCK_A
+        PI6     ------> SAI2_SD_A 
+        */
+        HAL_GPIO_DeInit(GPIOE, GPIO_PIN_0);
+
+        HAL_GPIO_DeInit(GPIOI, GPIO_PIN_7|GPIO_PIN_5|GPIO_PIN_6);
+
+        HAL_DMA_DeInit(hsai->hdmarx);
+        HAL_DMA_DeInit(hsai->hdmatx);
+    }
+    
+    if(hsai->Instance==SAI2_Block_B)
+    {
+        /* Peripheral clock disable */
+        __HAL_RCC_SAI2_CLK_DISABLE();
+
+        /**SAI2_B_Block_B GPIO Configuration    
+        PF11     ------> SAI2_SD_B 
+        */
+        HAL_GPIO_DeInit(GPIOF, GPIO_PIN_11);
+
+        HAL_DMA_DeInit(hsai->hdmarx);
+        HAL_DMA_DeInit(hsai->hdmatx);
+    }
+}
+
+static void rt_hw_sai2a_init(void)
+{
+    HAL_SAI_DeInit(&hsai_BlockA2);
+    hsai_BlockA2.Instance                    = SAI2_Block_A;
+    hsai_BlockA2.Init.Protocol               = SAI_FREE_PROTOCOL;
+    hsai_BlockA2.Init.AudioMode              = SAI_MODEMASTER_TX;
+    hsai_BlockA2.Init.DataSize               = SAI_DATASIZE_16;
+    hsai_BlockA2.Init.FirstBit               = SAI_FIRSTBIT_MSB;
+    hsai_BlockA2.Init.ClockStrobing          = SAI_CLOCKSTROBING_RISINGEDGE;
+    hsai_BlockA2.Init.Synchro                = SAI_ASYNCHRONOUS;
+    hsai_BlockA2.Init.OutputDrive            = SAI_OUTPUTDRIVE_ENABLE;
+    hsai_BlockA2.Init.NoDivider              = SAI_MASTERDIVIDER_ENABLE;
+    hsai_BlockA2.Init.FIFOThreshold          = SAI_FIFOTHRESHOLD_EMPTY;
+    hsai_BlockA2.Init.AudioFrequency         = SAI_AUDIO_FREQUENCY_44K;
+    hsai_BlockA2.Init.SynchroExt             = SAI_SYNCEXT_DISABLE;
+    hsai_BlockA2.Init.MonoStereoMode         = SAI_STEREOMODE;
+    hsai_BlockA2.Init.CompandingMode         = SAI_NOCOMPANDING;
+    hsai_BlockA2.Init.TriState               = SAI_OUTPUT_NOTRELEASED;
+    hsai_BlockA2.Init.PdmInit.Activation     = DISABLE;
+    hsai_BlockA2.Init.PdmInit.MicPairsNbr    = 0;
+    hsai_BlockA2.Init.PdmInit.ClockEnable    = SAI_PDM_CLOCK1_ENABLE;
+
+    hsai_BlockA2.FrameInit.FrameLength       = 64;
+    hsai_BlockA2.FrameInit.ActiveFrameLength = 32;
+    hsai_BlockA2.FrameInit.FSDefinition      = SAI_FS_CHANNEL_IDENTIFICATION;
+    hsai_BlockA2.FrameInit.FSPolarity        = SAI_FS_ACTIVE_LOW;
+    hsai_BlockA2.FrameInit.FSOffset          = SAI_FS_BEFOREFIRSTBIT;
+    
+    hsai_BlockA2.SlotInit.FirstBitOffset     = 0;
+    hsai_BlockA2.SlotInit.SlotSize           = SAI_SLOTSIZE_32B;
+    hsai_BlockA2.SlotInit.SlotNumber         = 2;
+    hsai_BlockA2.SlotInit.SlotActive         = SAI_SLOTACTIVE_0 | SAI_SLOTACTIVE_1;
+    
+    if(HAL_OK != HAL_SAI_Init(&hsai_BlockA2))
+    {
+        Error_Handler();
+    }
+    /* Enable SAI to generate clock used by audio driver */
+    __HAL_SAI_ENABLE(&hsai_BlockA2);
+}
+
+void DMA2_Stream5_IRQHandler(void)
+{
+    HAL_DMA_IRQHandler(&hdma_sai2_a);
+}
+
+void HAL_SAI_TxHalfCpltCallback(SAI_HandleTypeDef *hsai)
+{
+    if (hsai == &hsai_BlockA2)
+    {
+        rt_audio_tx_complete(&snd_dev.audio);
+    }
+}
+
+void HAL_SAI_TxCpltCallback(SAI_HandleTypeDef *hsai)
+{
+    if (hsai == &hsai_BlockA2)
+    {
+        rt_audio_tx_complete(&snd_dev.audio);
+    }
+}
+
+void SAIA_Frequency_Set(uint32_t frequency)
+{
+    return;
+}
+
+void SAIA_Channels_Set(uint8_t channels)
+{
+    if (channels == 1)
+    {
+        hsai_BlockA2.Init.MonoStereoMode = SAI_MONOMODE;
+    }
+    else
+    {
+        hsai_BlockA2.Init.MonoStereoMode  = SAI_STEREOMODE;
+    }
+
+    __HAL_SAI_DISABLE(&hsai_BlockA2);
+    HAL_SAI_Init(&hsai_BlockA2);
+    __HAL_SAI_ENABLE(&hsai_BlockA2);
+}
+
+/**
+ * RT-Thread Audio Device Driver Interface
+ */
+static rt_err_t sound_getcaps(struct rt_audio_device *audio, struct rt_audio_caps *caps)
+{
+    rt_err_t result = RT_EOK;
+    struct sound_device *snd_dev;
+
+    RT_ASSERT(audio != RT_NULL);
+    snd_dev = (struct sound_device *)audio->parent.user_data;
+
+    switch (caps->main_type)
+    {
+    case AUDIO_TYPE_QUERY: /* qurey the types of hw_codec device */
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_TYPE_QUERY:
+            caps->udata.mask = AUDIO_TYPE_OUTPUT | AUDIO_TYPE_MIXER;
+            break;
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    case AUDIO_TYPE_OUTPUT: /* Provide capabilities of OUTPUT unit */
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_DSP_PARAM:
+            caps->udata.config.samplerate   = snd_dev->replay_config.samplerate;
+            caps->udata.config.channels     = snd_dev->replay_config.channels;
+            caps->udata.config.samplebits   = snd_dev->replay_config.samplebits;
+            break;
+
+        case AUDIO_DSP_SAMPLERATE:
+            caps->udata.config.samplerate   = snd_dev->replay_config.samplerate;
+            break;
+
+        case AUDIO_DSP_CHANNELS:
+            caps->udata.config.channels     = snd_dev->replay_config.channels;
+            break;
+
+        case AUDIO_DSP_SAMPLEBITS:
+            caps->udata.config.samplebits   = snd_dev->replay_config.samplebits;
+            break;
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    case AUDIO_TYPE_MIXER: /* report the Mixer Units */
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_MIXER_QUERY:
+            caps->udata.mask = AUDIO_MIXER_VOLUME;
+            break;
+
+        case AUDIO_MIXER_VOLUME:
+            caps->udata.value =  cs42l51_drv.get_volume();
+            break;
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    default:
+        result = -RT_ERROR;
+        break;
+    }
+
+    return result;
+}
+    
+static rt_err_t sound_configure(struct rt_audio_device *audio, struct rt_audio_caps *caps)
+{
+    rt_err_t result = RT_EOK;
+    struct sound_device *snd_dev;
+
+    RT_ASSERT(audio != RT_NULL);
+    snd_dev = (struct sound_device *)audio->parent.user_data;
+
+    switch (caps->main_type)
+    {
+    case AUDIO_TYPE_MIXER:
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_MIXER_VOLUME:
+        {
+            rt_uint8_t volume = caps->udata.value;
+
+            cs42l51_drv.set_volume(volume);
+            
+            snd_dev->volume = volume;
+            
+            LOG_D("set volume %d", volume);
+            break;
+        }
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    case AUDIO_TYPE_OUTPUT:
+    {
+        switch (caps->sub_type)
+        {
+        case AUDIO_DSP_PARAM:
+        {
+            /* set samplerate */
+            SAIA_Frequency_Set(caps->udata.config.samplerate);
+            /* set channels */
+            SAIA_Channels_Set(caps->udata.config.channels);
+
+            /* save configs */
+            snd_dev->replay_config.samplerate = caps->udata.config.samplerate;
+            snd_dev->replay_config.channels   = caps->udata.config.channels;
+            snd_dev->replay_config.samplebits = caps->udata.config.samplebits;
+            LOG_D("set samplerate %d", snd_dev->replay_config.samplerate);
+            break;
+        }
+
+        case AUDIO_DSP_SAMPLERATE:
+        {
+            SAIA_Frequency_Set(caps->udata.config.samplerate);
+            snd_dev->replay_config.samplerate = caps->udata.config.samplerate;
+            LOG_D("set samplerate %d", snd_dev->replay_config.samplerate);
+            break;
+        }
+
+        case AUDIO_DSP_CHANNELS:
+        {
+            SAIA_Channels_Set(caps->udata.config.channels);
+            snd_dev->replay_config.channels   = caps->udata.config.channels;
+            LOG_D("set channels %d", snd_dev->replay_config.channels);
+            break;
+        }
+
+        case AUDIO_DSP_SAMPLEBITS:
+        {
+            /* not support */
+            snd_dev->replay_config.samplebits = caps->udata.config.samplebits;
+            break;
+        }
+
+        default:
+            result = -RT_ERROR;
+            break;
+        }
+
+        break;
+    }
+
+    default:
+        break;
+    }
+
+    return result;
+}
+
+static rt_err_t sound_init(struct rt_audio_device *audio)
+{
+    rt_err_t result = RT_EOK;
+    struct sound_device *snd_dev;
+
+    RT_ASSERT(audio != RT_NULL);
+    snd_dev = (struct sound_device *)audio->parent.user_data;
+
+    cs42l51_drv.init(OUT_HEADPHONE, SOUND_BUS_NAME, 40); 
+    
+    if (cs42l51_drv.read_id() != RT_EOK)
+    {
+        LOG_E("can't find low level audio device!");
+        return RT_ERROR;
+    }
+    
+    rt_hw_sai2a_init();
+    
+    /* set default params */
+    SAIA_Frequency_Set(snd_dev->replay_config.samplerate);
+    SAIA_Channels_Set(snd_dev->replay_config.channels);
+
+    return result;
+}
+
+static rt_err_t sound_start(struct rt_audio_device *audio, int stream)
+{
+    struct sound_device *snd_dev;
+
+    RT_ASSERT(audio != RT_NULL);
+    snd_dev = (struct sound_device *)audio->parent.user_data;
+
+    if (stream == AUDIO_STREAM_REPLAY)
+    {
+        LOG_D("open sound device");
+        
+        cs42l51_drv.init(OUT_HEADPHONE, SOUND_BUS_NAME, 60); /* set work mode */
+        cs42l51_drv.play();
+        
+        if (HAL_SAI_Transmit_DMA(&hsai_BlockA2, snd_dev->tx_fifo, TX_FIFO_SIZE / 2) != HAL_OK)
+        {
+            return RT_ERROR;
+        }
+    }
+
+    return RT_EOK;
+}
+
+static rt_err_t sound_stop(struct rt_audio_device *audio, int stream)
+{
+    RT_ASSERT(audio != RT_NULL);
+
+    if (stream == AUDIO_STREAM_REPLAY)
+    {
+        HAL_SAI_DMAStop(&hsai_BlockA2);
+        HAL_SAI_Abort(&hsai_BlockA2);
+        cs42l51_drv.stop();
+
+        LOG_D("close sound device");
+    }
+
+    return RT_EOK;
+}
+
+static void sound_buffer_info(struct rt_audio_device *audio, struct rt_audio_buf_info *info)
+{
+    struct sound_device *snd_dev;
+
+    RT_ASSERT(audio != RT_NULL);
+    snd_dev = (struct sound_device *)audio->parent.user_data;
+
+    /**
+     *               TX_FIFO
+     * +----------------+----------------+
+     * |     block1     |     block2     |
+     * +----------------+----------------+
+     *  \  block_size  /
+     */
+    info->buffer      = snd_dev->tx_fifo;
+    info->total_size  = TX_FIFO_SIZE;
+    info->block_size  = TX_FIFO_SIZE / 2;
+    info->block_count = 2;
+}
+
+static struct rt_audio_ops snd_ops =
+{
+    .getcaps     = sound_getcaps,
+    .configure   = sound_configure,
+    .init        = sound_init,
+    .start       = sound_start,
+    .stop        = sound_stop,
+    .transmit    = RT_NULL,
+    .buffer_info = sound_buffer_info,
+};
+
+int rt_hw_sound_init(void)
+{
+    rt_err_t result = RT_EOK;
+    struct rt_device *device = RT_NULL;
+
+    rt_memset(AUDIO_TX_FIFO, 0, TX_FIFO_SIZE);
+    snd_dev.tx_fifo = AUDIO_TX_FIFO;
+
+    /* init default configuration */
+    snd_dev.replay_config.samplerate = 44100;
+    snd_dev.replay_config.channels   = 2;
+    snd_dev.replay_config.samplebits = 16;
+    snd_dev.volume                   = 55;
+
+    /* register sound device */
+    snd_dev.audio.ops = &snd_ops;
+    result = rt_audio_register(&snd_dev.audio, "sound0", RT_DEVICE_FLAG_WRONLY, &snd_dev);
+    if (result != RT_EOK)
+    {
+        device = &(snd_dev.audio.parent); 
+        rt_device_unregister(device);
+        LOG_E("sound device init error!");
+        return RT_ERROR;
+    }
+    
+    return RT_EOK;
+}
+
+INIT_APP_EXPORT(rt_hw_sound_init);
+
+#endif

+ 449 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/crypto/crypto_sample.c

@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) 2006-2022, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-06-27     thread-liu   first version
+ */
+
+#include <board.h>
+
+#include "drv_crypto.h"
+#include <hwcrypto.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ')
+static void dump_hex(const rt_uint8_t *ptr, rt_size_t buflen)
+{
+    unsigned char *buf = (unsigned char *)ptr;
+    int i, j;
+
+    for (i = 0; i < buflen; i += 16)
+    {
+        rt_kprintf("%08X: ", i);
+
+        for (j = 0; j < 16; j++)
+        {
+            if (i + j < buflen)
+            {
+                rt_kprintf("%02X ", buf[i + j]);
+            }
+            else
+            {
+                rt_kprintf("   ");
+            }
+        }
+        rt_kprintf(" ");
+
+        for (j = 0; j < 16; j++)
+        {
+            if (i + j < buflen)
+            {
+                rt_kprintf("%c", __is_print(buf[i + j]) ? buf[i + j] : '.');
+            }
+        }
+        rt_kprintf("\n");
+    }
+}
+
+#if defined(BSP_USING_RNG)
+static rt_err_t hw_rng_sample(int random_num)
+{
+    rt_err_t result = RT_EOK;
+    int i = 0, num0 = 0, num1 = 0;
+
+    if (random_num == 0)
+    {
+        return RT_ERROR;
+    }
+
+    for (i = 0; i< random_num; i++)
+    {
+        result = rt_hwcrypto_rng_update();
+        rt_kprintf("%d ", result);
+        result%2 ? num1++ : num0++;
+    }
+    rt_kprintf("\neven numbers : %d, odd numbers: %d\n",num1, num0);
+
+    return RT_EOK;
+}
+#endif
+
+#if defined(BSP_USING_CRC)
+static void hw_crc_sample(uint8_t *temp, int size)
+{
+    struct rt_hwcrypto_ctx *ctx;
+    rt_uint32_t result = 0;
+    
+    struct hwcrypto_crc_cfg cfg =
+    {
+        .last_val = 0xFFFFFFFF,
+        .poly     = 0x04C11DB7,
+        .width    = 32,
+        .xorout   = 0x00000000,
+        .flags    = 0,
+    };
+
+    ctx = rt_hwcrypto_crc_create(rt_hwcrypto_dev_default(), HWCRYPTO_CRC_CRC32);
+    rt_hwcrypto_crc_cfg(ctx, &cfg);
+
+    result = rt_hwcrypto_crc_update(ctx, temp, size);
+
+    rt_kprintf("crc result: %x \n", result);                
+
+    rt_hwcrypto_crc_destroy(ctx);  
+}
+#endif
+
+#if defined(BSP_USING_HASH)
+static void hw_hash_sample()
+{
+    struct rt_hwcrypto_ctx *ctx = RT_NULL;
+    const uint8_t hash_input[] = "RT-Thread was born in 2006, it is an open source, neutral, and community-based real-time operating system (RTOS).";
+    
+    static uint8_t sha1_output[20];
+    static uint8_t sha1_except[20] = {0xff, 0x3c, 0x95, 0x54, 0x95, 0xf0, 0xad, 
+                                    0x02, 0x1b, 0xa8, 0xbc, 0xa2, 0x2e, 0xa5,
+                                    0xb0, 0x62, 0x1b, 0xdf, 0x7f, 0xec};
+    
+    static uint8_t md5_output[16];
+    static uint8_t md5_except[16] = {0x40, 0x86, 0x03, 0x80, 0x0d, 0x8c, 0xb9, 
+                                   0x4c, 0xd6, 0x7d, 0x28, 0xfc, 0xf6, 0xc3,
+                                   0xac, 0x8b};
+    
+    static uint8_t sha224_output[28];
+    static uint8_t sha224_except[28] = {0x6f, 0x62, 0x52, 0x7d, 0x80, 0xe6, 
+                                        0x9f, 0x82, 0x78, 0x7a, 0x46, 0x91,
+                                        0xb0, 0xe9, 0x64, 0x89, 0xe6, 0xc3,
+                                        0x6b, 0x7e, 0xcf, 0xca, 0x11, 0x42,
+                                        0xc8, 0x77, 0x13, 0x79};
+    static uint8_t sha256_output[32];
+    static uint8_t sha256_except[32] = {0x74, 0x19, 0xb9, 0x0e, 0xd1, 0x46,
+                                        0x37, 0x0a, 0x55, 0x18, 0x26, 0x6c,
+                                        0x50, 0xd8, 0x71, 0x34, 0xfa, 0x1f,
+                                        0x5f, 0x5f, 0xe4, 0x9a, 0xe9, 0x40,
+                                        0x0a, 0x7d, 0xa0, 0x26, 0x1b, 0x86,
+                                        0x67, 0x45};
+    rt_kprintf("======================== Hash Test start ========================\n");
+    rt_kprintf("Hash Test string: \n");
+    dump_hex(hash_input, sizeof(hash_input));
+    
+    /* sh1 test*/
+    rt_kprintf("\n============ SHA1 Test Start ============\n");
+    ctx = rt_hwcrypto_hash_create(rt_hwcrypto_dev_default(), HWCRYPTO_TYPE_SHA1);
+    if (ctx == RT_NULL)
+    {
+        rt_kprintf("create hash[%08x] context err!\n", HWCRYPTO_TYPE_SHA1);
+        return ;
+    }
+    rt_kprintf("Create sha1 type success!\n");
+    rt_kprintf("Except sha1 result:\n");
+    dump_hex(sha1_except, sizeof(sha1_except));
+
+    /* start sha1 */
+    rt_hwcrypto_hash_update(ctx, hash_input, rt_strlen((char const *)hash_input));
+    /* get sha1 result */
+    rt_hwcrypto_hash_finish(ctx, sha1_output, rt_strlen((char const *)sha1_output));
+    
+    rt_kprintf("Actual sha1 result:\n");
+    dump_hex(sha1_output, sizeof(sha1_output));
+
+    if(rt_memcmp(sha1_output, sha1_except, sizeof(sha1_except)/sizeof(sha1_except[0])) != 0)
+    {
+        rt_kprintf("Hash type sha1 Test error, The actual result is not equal to the except result\n");
+    }
+    else
+    {
+        rt_kprintf("Hash type sha1 Test success, The actual result is equal to the except result\n");
+    }
+    /* deinit hash*/
+    rt_hwcrypto_hash_destroy(ctx);
+    rt_kprintf("============ SHA1 Test Over ============\n");
+      
+    /* md5 test*/
+    rt_kprintf("\n============ MD5 Test Start ============\n");
+    ctx = rt_hwcrypto_hash_create(rt_hwcrypto_dev_default(), HWCRYPTO_TYPE_MD5);
+    if (ctx == RT_NULL)
+    {
+        rt_kprintf("create hash[%08x] context err!\n", HWCRYPTO_TYPE_MD5);
+        return ;
+    }
+    rt_kprintf("Create md5 type success!\n");
+    rt_kprintf("Except md5 result:\n");
+    dump_hex(md5_except, sizeof(md5_except));
+
+    /* start md5 */
+    rt_hwcrypto_hash_update(ctx, hash_input, rt_strlen((char const *)hash_input));
+    /* get md5 result */
+    rt_hwcrypto_hash_finish(ctx, md5_output, rt_strlen((char const *)md5_output));
+    
+    rt_kprintf("Actual md5 result:\n");
+    dump_hex(md5_output, sizeof(md5_output));
+
+    if(rt_memcmp(md5_output, md5_except, sizeof(md5_except)/sizeof(md5_except[0])) != 0)
+    {
+        rt_kprintf("Hash type md5 Test error, The actual result is not equal to the except result\n");
+    }
+    else
+    {
+        rt_kprintf("Hash type md5 Test success, The actual result is equal to the except result\n");
+    }
+    /* deinit hash*/
+    rt_hwcrypto_hash_destroy(ctx);
+    rt_kprintf("============ MD5 Test Over ============\n");
+    
+    /* sha224 test */
+    rt_kprintf("\n============ SHA224 Test Start ============\n");
+    ctx = rt_hwcrypto_hash_create(rt_hwcrypto_dev_default(), HWCRYPTO_TYPE_SHA224);
+    if (ctx == RT_NULL)
+    {
+        rt_kprintf("create hash[%08x] context err!\n", HWCRYPTO_TYPE_SHA224);
+        return ;
+    }
+    rt_kprintf("Create sha224 type success!\n");
+    rt_kprintf("Except sha224 result:\n");
+    dump_hex(sha224_except, sizeof(sha224_except));
+
+    /* start sha224 */
+    rt_hwcrypto_hash_update(ctx, hash_input, rt_strlen((char const *)hash_input));
+    /* get sha224 result */
+    rt_hwcrypto_hash_finish(ctx, sha224_output, rt_strlen((char const *)sha224_output));
+    
+    rt_kprintf("Actual sha224 result:\n");
+    dump_hex(sha224_output, sizeof(sha224_output));
+
+    if(rt_memcmp(sha224_output, sha224_except, sizeof(sha224_except)/sizeof(sha224_except[0])) != 0)
+    {
+        rt_kprintf("Hash type sha224 Test error, The actual result is not equal to the except result\n");
+    }
+    else
+    {
+        rt_kprintf("Hash type sha224 Test success, The actual result is equal to the except result\n");
+    }
+    rt_hwcrypto_hash_destroy(ctx);
+    rt_kprintf("============ SHA224 Test Over ============\n");
+
+    /* sha256 test*/
+    rt_kprintf("\n============ SHA256 Test Start ============\n");
+    ctx = rt_hwcrypto_hash_create(rt_hwcrypto_dev_default(), HWCRYPTO_TYPE_SHA256);
+    if (ctx == RT_NULL)
+    {
+        rt_kprintf("create hash[%08x] context err!\n", HWCRYPTO_TYPE_SHA256);
+        return ;
+    }
+    
+    rt_kprintf("Create sha256 type success!\n");
+    rt_kprintf("Except sha256 result:\n");
+    dump_hex(sha256_except, sizeof(sha256_except));
+
+    /* start sha256 */
+    rt_hwcrypto_hash_update(ctx, hash_input, rt_strlen((char const *)hash_input));
+    /* get sha256 result */
+    rt_hwcrypto_hash_finish(ctx, sha256_output, rt_strlen((char const *)sha256_output));
+
+    rt_kprintf("Actual sha256 result\n");
+    dump_hex(sha256_output, sizeof(sha256_output));
+    
+    if(rt_memcmp(sha256_output, sha256_except, sizeof(sha256_except)/sizeof(sha256_except[0])) != 0)
+    {
+        rt_kprintf("Hash type sha256 Test error, The actual result is not equal to the except result\n");
+    }
+    else
+    {
+        rt_kprintf("Hash type sha256 Test success, The actual result is equal to the except result\n");
+    }
+    /* destory */
+    rt_hwcrypto_hash_destroy(ctx);
+    rt_kprintf("============ SHA256 Test Over ============\n");
+    rt_kprintf("======================== Hash Test over! ========================\n");    
+}
+#endif
+
+#if defined(BSP_USING_CRYP)
+/* key*/
+static const rt_uint8_t cryp_key[16] = {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF};
+
+static void hw_aes_cbc(const rt_uint8_t in[32], rt_uint8_t out[32], hwcrypto_mode mode)
+{
+    struct rt_hwcrypto_ctx *ctx;
+
+    ctx = rt_hwcrypto_symmetric_create(rt_hwcrypto_dev_default(), HWCRYPTO_TYPE_AES_CBC);
+    if (ctx == RT_NULL)
+    {
+        rt_kprintf("create AES-CBC context err!");
+        return;
+    }
+    rt_hwcrypto_symmetric_setkey(ctx, cryp_key, 128);
+    rt_hwcrypto_symmetric_crypt(ctx, mode, 32, in, out);
+    rt_hwcrypto_symmetric_destroy(ctx);
+}
+
+static void hw_cryp_sample()
+{
+    rt_uint8_t buf_in[32];
+    rt_uint8_t buf_out[32];
+    int i;
+    
+    /* Populating test data */
+    for (i = 0; i < sizeof(buf_in); i++)
+    {
+        buf_in[i] = i;
+    }
+    
+    /* dump primitive data */
+    rt_kprintf("key : \n");
+    dump_hex(cryp_key, sizeof(cryp_key));
+    rt_kprintf("primitive data : \n");
+    dump_hex(buf_in, sizeof(buf_in));
+    
+    rt_memset(buf_out, 0, sizeof(buf_out));
+    
+    /* encrypt */
+    hw_aes_cbc(buf_in, buf_out, HWCRYPTO_MODE_ENCRYPT);
+    /* dump encrypt data */
+    rt_kprintf("AES-enc : \n");
+    dump_hex(buf_out, sizeof(buf_out));
+  
+    rt_memset(buf_in, 0, sizeof(buf_in));
+    
+    /* decrypt */
+    hw_aes_cbc(buf_out, buf_in, HWCRYPTO_MODE_DECRYPT);
+
+    /* dump decrypt data */
+    rt_kprintf("AES-dec : \n");
+    dump_hex(buf_in, sizeof(buf_in));
+}
+#endif
+
+static int crypto(int argc, char **argv)
+{
+    int result = RT_EOK;
+    static rt_device_t device = RT_NULL;
+    char *result_str;
+    
+    if (argc > 1)
+    {
+        if (!strcmp(argv[1], "probe"))
+        {
+            if (argc == 3)
+            {
+                char *dev_name = argv[2];
+                device = rt_device_find(dev_name);
+                result_str = (device == RT_NULL) ? "failure" : "success";
+                rt_kprintf("probe %s %s \n", argv[2], result_str);
+            }
+            else
+            {
+                rt_kprintf("crypto probe <crypto_name>   - probe crypto by name\n");
+            }
+        }
+        else
+        {
+            if (device == RT_NULL)
+            {
+                rt_kprintf("Please using 'crypto probe <crypto_name>' first\n");
+                return -RT_ERROR;
+            }
+            if (!strcmp(argv[1], "rng"))
+            {
+#if defined (BSP_USING_RNG)
+                if (argc == 3)
+                {
+                    result = hw_rng_sample(atoi(argv[2]));
+                    if(result != RT_EOK)
+                    {
+                        rt_kprintf("please input a  legal number, not <%d>\n", atoi(argv[2]));
+                    }
+                }
+                else
+                {
+                    rt_kprintf("rng <number>        - generate <number> digital\n");
+                }
+                
+#else
+                rt_kprintf("please enable RNG first!\n");
+#endif
+            }
+            else if (!strcmp(argv[1], "crc"))
+            {
+#if defined (BSP_USING_CRC)
+                int size = 0, i = 0; 
+                if (argc > 3)
+                {
+                    size = argc - 2;
+                    uint8_t *data = rt_malloc(size);
+                    if (data)
+                    {
+                        for (i = 0; i < size; i++)
+                        {
+                            data[i] = strtol(argv[2 + i], NULL, 0);
+                        }
+                        hw_crc_sample(data, size);  
+                        rt_free(data);
+                    }
+                    else
+                    {
+                        rt_kprintf("Low memory!\n");
+                    }
+                }
+                else
+                {
+                    rt_kprintf("crypto crc data1 ... dataN          - calculate data1 ... dataN crc\n");
+                }
+#else
+                rt_kprintf("please enable CRC first!\n");
+#endif
+            }
+            else if (!strcmp(argv[1], "hash"))
+            {
+#if defined (BSP_USING_HASH)
+                if (argc == 3)
+                {
+                    hw_hash_sample(); 
+                }
+                else
+                {
+                    rt_kprintf("crypto hash sample          - hash use sample\n");    
+                }
+#else
+         rt_kprintf("please enable CRC first!\n");       
+#endif    
+            }
+            else if (!strcmp(argv[1], "cryp"))
+            {
+#if defined (BSP_USING_CRYP)
+                if (argc == 3)
+                {
+                    hw_cryp_sample(); 
+                }
+                else
+                {
+                    rt_kprintf("crypto cryp sample          - encrypt and decrypt data sample\n");    
+                }
+#else
+         rt_kprintf("please enable CRYP first!\n");       
+#endif    
+            }            
+            else
+            {
+                rt_kprintf("Unknown command. Please enter 'crypto' for help\n");
+            }
+        }
+    }
+    else
+    {
+        rt_kprintf("Usage: \n");
+        rt_kprintf("crypto probe <crypto_name>                  - probe crypto by name\n");
+        rt_kprintf("crypto rng number                           - generate numbers digital\n");
+        rt_kprintf("crypto crc data1 ... dataN                  - calculate data1 ... dataN crc\n");
+        rt_kprintf("crypto hash sample                          - hash use sample\n");
+        rt_kprintf("crypto cryp sample                          - encrypt and decrypt data\n");
+        result = -RT_ERROR;
+    }
+    
+    return result;
+}
+MSH_CMD_EXPORT(crypto, crypto function);

+ 882 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.c

@@ -0,0 +1,882 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author            Notes
+ * 2020-07-20     thread-liu        the first version
+ */
+
+#include "board.h"
+#include "drv_config.h"
+#include <netif/ethernetif.h>
+#include "lwipopts.h"
+#include "drv_eth.h"
+
+#if defined(BSP_USING_GBE)
+
+#define DRV_DEBUG
+//#define ETH_RX_DUMP
+//#define ETH_TX_DUMP
+#define LOG_TAG             "drv.emac"
+#include <drv_log.h>
+
+#define MAX_ADDR_LEN 6
+rt_base_t level;
+
+#define TX_ADD_BASE         0x2FFC3000
+#define RX_ADD_BASE         0x2FFC5000
+#define TX_DMA_ADD_BASE     0x2FFC7000
+#define RX_DMA_ADD_BASE     0x2FFC7100
+
+#if defined(__ICCARM__)
+/* transmit buffer */
+#pragma location = TX_ADD_BASE
+static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE];
+/* Receive buffer */
+#pragma location = RX_ADD_BASE
+static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE];
+/* Transmit DMA descriptors */
+#pragma location = TX_DMA_ADD_BASE
+static TxDmaDesc txDmaDesc[ETH_TXBUFNB];
+/* Receive DMA descriptors */
+#pragma location = RX_DMA_ADD_BASE
+static RxDmaDesc rxDmaDesc[ETH_RXBUFNB];
+
+#elif defined(__CC_ARM) || defined(__CLANG_ARM)
+/* transmit buffer */
+static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE)));
+/* Receive buffer */
+static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE)));
+/* Transmit DMA descriptors */
+static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((at(TX_DMA_ADD_BASE)));
+/* Receive DMA descriptors */
+static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((at(RX_DMA_ADD_BASE)));
+
+#elif defined ( __GNUC__ )
+/* transmit buffer */
+static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE)));
+/* Receive buffer */
+static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE)));
+/* Transmit DMA descriptors */
+static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((at(TX_DMA_ADD_BASE)));
+/* Receive DMA descriptors */
+static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((at(RX_DMA_ADD_BASE)));
+#endif
+
+/* Current transmit descriptor */
+static rt_uint8_t txIndex = 0;
+/* Current receive descriptor */
+static rt_uint8_t rxIndex = 0;
+
+/* eth rx event */
+static struct rt_event rx_event = {0};
+
+#define ETH_TIME_OUT 100000
+
+struct rt_stm32_eth
+{
+    /* inherit from ethernet device */
+    struct eth_device parent;
+#ifndef PHY_USING_INTERRUPT_MODE
+    rt_timer_t poll_link_timer;
+#endif
+    /* interface address info, hw address */
+    rt_uint8_t  dev_addr[MAX_ADDR_LEN];
+    /* eth speed */
+    rt_uint32_t    eth_speed;
+    /* eth duplex mode */
+    rt_uint32_t    eth_mode;
+};
+static struct rt_stm32_eth stm32_eth_device = {0};
+
+#if defined(ETH_RX_DUMP) || defined(ETH_TX_DUMP)
+#define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ')
+static void dump_hex(const rt_uint8_t *ptr, rt_size_t buflen)
+{
+    unsigned char *buf = (unsigned char *)ptr;
+    int i, j;
+
+    for (i = 0; i < buflen; i += 16)
+    {
+        rt_kprintf("%08X: ", i);
+
+        for (j = 0; j < 16; j++)
+        {
+            if (i + j < buflen)
+            {
+                rt_kprintf("%02X ", buf[i + j]);
+            }
+            else
+            {
+                rt_kprintf("   ");
+            }
+        }
+        rt_kprintf(" ");
+
+        for (j = 0; j < 16; j++)
+        {
+            if (i + j < buflen)
+            {
+                rt_kprintf("%c", __is_print(buf[i + j]) ? buf[i + j] : '.');
+            }
+        }
+        rt_kprintf("\n");
+    }
+}
+#endif
+
+static rt_err_t phy_write_reg(uint8_t phy_addr, uint8_t reg_addr, uint16_t reg_value)
+{
+    uint32_t temp;
+    volatile uint32_t tickstart = 0;
+    /* Take care not to alter MDC clock configuration */
+    temp = ETH->MACMDIOAR & ETH_MACMDIOAR_CR;
+    /* Set up a write operation */
+    temp |= ETH_MACMDIOAR_GOC_Val(1) | ETH_MACMDIOAR_GB;
+    /* PHY address */
+    temp |= (phy_addr << 21) & ETH_MACMDIOAR_PA;
+    /* Register address */
+    temp |= (reg_addr << 16) & ETH_MACMDIOAR_RDA;
+
+    /* Data to be written in the PHY register */
+    ETH->MACMDIODR = reg_value & ETH_MACMDIODR_GD;
+
+    /* Start a write operation */
+    ETH->MACMDIOAR = temp;
+    /* Wait for the write to complete */
+    tickstart = rt_tick_get();
+    while((ETH->MACMDIOAR & ETH_MACMDIOAR_GB) != 0)
+    {
+        /* judge timeout */
+        if((rt_tick_get() - tickstart) > ETH_TIME_OUT)
+        {
+            LOG_E("PHY write reg %02x date %04x timeout!", reg_addr, reg_value);
+            return -RT_ETIMEOUT;
+        }
+    }
+    
+    return RT_EOK;
+}
+
+static uint16_t phy_read_reg(uint8_t phy_addr, uint8_t reg_addr)
+{
+    uint16_t reg_value = 0;
+    uint32_t status = 0;
+    volatile uint32_t tickstart = 0;
+    
+    /* Take care not to alter MDC clock configuration */
+    status = ETH->MACMDIOAR & ETH_MACMDIOAR_CR;
+    /* Set up a read operation */
+    status |= ETH_MACMDIOAR_GOC_Val(3) | ETH_MACMDIOAR_GB;
+    /* PHY address */
+    status |= (phy_addr << 21) & ETH_MACMDIOAR_PA;
+    /* Register address */
+    status |= (reg_addr << 16) & ETH_MACMDIOAR_RDA;
+
+    /* Start a read operation */
+    ETH->MACMDIOAR = status;
+    /* Wait for the read to complete */
+    tickstart = rt_tick_get();
+    while((ETH->MACMDIOAR & ETH_MACMDIOAR_GB) != 0)
+    {
+        /* judge timeout */
+        if((rt_tick_get() - tickstart) > ETH_TIME_OUT)
+        {
+            LOG_E("PHY read reg %02x timeout!", reg_addr);
+            return RT_ETIMEOUT;
+        }
+    }
+
+    /* Get register value */
+    reg_value = ETH->MACMDIODR & ETH_MACMDIODR_GD;
+
+    return reg_value;
+}
+
+static rt_err_t update_mac_mode(rt_uint32_t eth_speed, rt_uint32_t eth_mode)
+{
+   uint32_t status;
+
+   /* Read current MAC configuration */
+   status = ETH->MACCR;
+
+   if (eth_speed == PHY_1000M)
+   {
+      status &= ~ETH_MACCR_PS;
+      status &= ~ETH_MACCR_FES;
+   }
+   else if (eth_speed == PHY_100M)
+   {
+      status |= ETH_MACCR_PS;
+      status |= ETH_MACCR_FES;
+   }
+   /* 10M */
+   else
+   {
+      status |= ETH_MACCR_PS;
+      status &= ~ETH_MACCR_FES;
+   }
+
+   if (eth_mode == PHY_FULL_DUPLEX)
+   {
+      status |= ETH_MACCR_DM;
+   }
+   else
+   {
+      status &= ~ETH_MACCR_DM;
+   }
+
+   /* Update MAC configuration register */
+   ETH->MACCR = status;
+
+   return RT_EOK;
+}
+
+static void HAL_ETH_MspInit(void)
+{
+    GPIO_InitTypeDef GPIO_InitStruct = {0};
+    RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+    
+    if(IS_ENGINEERING_BOOT_MODE())
+    {
+        /** Initializes the peripherals clock 
+        */
+        PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ETH;
+        PeriphClkInit.EthClockSelection = RCC_ETHCLKSOURCE_PLL4;
+        if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+        {
+            Error_Handler();
+        }
+    }
+  
+    /* Enable SYSCFG clock */
+    __HAL_RCC_SYSCFG_CLK_ENABLE();
+    
+    /* Enable GPIO clocks */
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOE_CLK_ENABLE();
+    __HAL_RCC_GPIOG_CLK_ENABLE();
+
+    /* Select RGMII interface mode */
+    HAL_SYSCFG_ETHInterfaceSelect(SYSCFG_ETH_RGMII);
+    
+    /* Enable Ethernet MAC clock */
+    __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    __HAL_RCC_ETH1TX_CLK_ENABLE();
+    __HAL_RCC_ETH1RX_CLK_ENABLE();
+    
+    /**ETH1 GPIO Configuration
+    PA1     ------>  ETH1_RX_CLK
+    PA7     ------>  ETH1_RX_CTL
+    PB0     ------>  ETH1_RXD2
+    PB1     ------>  ETH1_RXD3
+    PC4     ------>  ETH1_RXD0
+    PC5     ------>  ETH1_RXD1
+    PA2     ------>  ETH1_MDIO
+    PB11    ------>  ETH1_TX_CTL
+    PC1     ------>  ETH1_MDC
+    PC2     ------>  ETH1_TXD2
+    PE2     ------>  ETH1_TXD3
+    PG4     ------>  ETH1_GTX_CLK
+    PG5     ------>  ETH1_CLK125
+    PG13    ------>  ETH1_TXD0
+    PG14    ------>  ETH1_TXD1
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_7;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF11_ETH;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_11;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_4|GPIO_PIN_5;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_2;
+    HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_13|GPIO_PIN_14;
+    HAL_GPIO_Init(GPIOG, &GPIO_InitStruct); 
+
+    /* ETH interrupt Init */
+    HAL_NVIC_SetPriority(ETH1_IRQn, 0x01, 0x00);
+    HAL_NVIC_EnableIRQ(ETH1_IRQn);
+    
+    /* Configure PHY_RST (PG0) */
+    GPIO_InitStruct.Pin = GPIO_PIN_0;
+    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    HAL_GPIO_Init(GPIOG, &GPIO_InitStruct);
+
+    /* Reset PHY transceiver */
+    HAL_GPIO_WritePin(GPIOG, GPIO_PIN_0, GPIO_PIN_RESET);
+    rt_thread_mdelay(20);
+    HAL_GPIO_WritePin(GPIOG, GPIO_PIN_0, GPIO_PIN_SET);
+    rt_thread_mdelay(20);
+}
+
+static rt_err_t rt_stm32_eth_init(rt_device_t dev)
+{
+    RT_ASSERT(dev != RT_NULL);
+    
+    rt_uint32_t status, i;
+    volatile rt_uint32_t tickstart = 0;
+    rt_uint8_t  *macAddr = &stm32_eth_device.dev_addr[0];
+    
+    /* Initialize TX descriptor index */
+    txIndex = 0;
+    /* Initialize RX descriptor index */
+    rxIndex = 0;
+
+    HAL_ETH_MspInit();
+
+    /* Reset Ethernet MAC peripheral */
+    __HAL_RCC_ETH1MAC_FORCE_RESET();
+    __HAL_RCC_ETH1MAC_RELEASE_RESET();
+
+    /* Ethernet Software reset */
+    ETH->DMAMR |= ETH_DMAMR_SWR;
+    /* Wait for the reset to complete */
+    tickstart = rt_tick_get();
+    while (READ_BIT(ETH->DMAMR, ETH_DMAMR_SWR))
+    {
+        if(((HAL_GetTick() - tickstart ) > ETH_TIME_OUT))
+        {
+            LOG_E("ETH software reset timeout!");
+            return RT_ERROR;
+        }
+    }
+
+    /* Adjust MDC clock range depending on HCLK frequency */
+    ETH->MACMDIOAR = ETH_MACMDIOAR_CR_Val(5);
+
+    /* Use default MAC configuration */
+    ETH->MACCR = ETH_MACCR_DO;
+
+    /* Set the MAC address of the station */
+    ETH->MACA0LR = ((macAddr[3] << 24) | (macAddr[2] << 16) | (macAddr[1] << 8) | macAddr[0]);
+    ETH->MACA0HR = ((macAddr[5] << 8) | macAddr[4]);
+
+    /* The MAC supports 3 additional addresses for unicast perfect filtering */
+    ETH->MACA1LR = 0;
+    ETH->MACA1HR = 0;
+    ETH->MACA2LR = 0;
+    ETH->MACA2HR = 0;
+    ETH->MACA3LR = 0;
+    ETH->MACA3HR = 0;
+    
+    /* Initialize hash table */
+    ETH->MACHT0R = 0;
+    ETH->MACHT1R = 0;
+    
+    /* Configure the receive filter */
+    ETH->MACPFR = ETH_MACPFR_HPF | ETH_MACPFR_HMC;
+    
+    /* Disable flow control */
+    ETH->MACQ0TXFCR = 0;
+    ETH->MACRXFCR   = 0;
+    
+    /* Enable the first RX queue */
+    ETH->MACRXQC0R = ETH_MACRXQC0R_RXQ0EN_Val(1);
+    
+    /* Configure DMA operating mode */
+    ETH->DMAMR = ETH_DMAMR_INTM_Val(0) | ETH_DMAMR_PR_Val(0);
+    
+    /* Configure system bus mode */
+    ETH->DMASBMR |= ETH_DMASBMR_AAL;
+    
+    /* The DMA takes the descriptor table as contiguous */
+    ETH->DMAC0CR = ETH_DMAC0CR_DSL_Val(0);
+    
+    /* Configure TX features */
+    ETH->DMAC0TXCR = ETH_DMAC0TXCR_TXPBL_Val(1);
+
+    /* Configure RX features */
+    ETH->DMAC0RXCR = ETH_DMAC0RXCR_RXPBL_Val(1) | ETH_DMAC0RXCR_RBSZ_Val(ETH_RX_BUF_SIZE);
+
+    /* Enable store and forward mode for transmission */
+    ETH->MTLTXQ0OMR = ETH_MTLTXQ0OMR_TQS_Val(7) | ETH_MTLTXQ0OMR_TXQEN_Val(2) | ETH_MTLTXQ0OMR_TSF;
+
+    /* Enable store and forward mode for reception */
+    ETH->MTLRXQ0OMR = ETH_MTLRXQ0OMR_RQS_Val(7) | ETH_MTLRXQ0OMR_RSF;
+
+    /* Initialize TX DMA descriptor list */
+    for (i = 0; i < ETH_TXBUFNB; i++)
+    {
+        /* The descriptor is initially owned by the application */
+        txDmaDesc[i].tdes0 = 0;
+        txDmaDesc[i].tdes1 = 0;
+        txDmaDesc[i].tdes2 = 0;
+        txDmaDesc[i].tdes3 = 0;
+    }
+
+    /* Initialize RX DMA descriptor list */
+    for (i = 0; i < ETH_RXBUFNB; i++)
+    {
+        /* The descriptor is initially owned by the DMA */
+        rxDmaDesc[i].rdes0 = (uint32_t) rxBuffer[i];
+        rxDmaDesc[i].rdes1 = 0;
+        rxDmaDesc[i].rdes2 = 0;
+        rxDmaDesc[i].rdes3 = ETH_RDES3_OWN | ETH_RDES3_IOC | ETH_RDES3_BUF1V;
+    }
+    
+    /* Set Transmit Descriptor List Address Register */
+    ETH->DMAC0TXDLAR = (uint32_t) &txDmaDesc[0];
+    /* Length of the transmit descriptor ring */
+    ETH->DMAC0TXRLR = ETH_TXBUFNB - 1;
+    
+    /* Set Receive Descriptor List Address Register */
+    ETH->DMAC0RXDLAR = (uint32_t) &rxDmaDesc[0];
+    /* Length of the receive descriptor ring */
+    ETH->DMAC0RXRLR = ETH_RXBUFNB - 1;
+
+    /* Prevent interrupts from being generated when the transmit statistic
+     * counters reach half their maximum value */
+    ETH->MMCTXIMR = ETH_MMCTXIMR_TXLPITRCIM | ETH_MMCTXIMR_TXLPIUSCIM | ETH_MMCTXIMR_TXGPKTIM | ETH_MMCTXIMR_TXMCOLGPIM | ETH_MMCTXIMR_TXSCOLGPIM;
+    
+    /* Prevent interrupts from being generated when the receive statistic
+     * counters reach half their maximum value */
+    ETH->MMCRXIMR = ETH_MMCRXIMR_RXLPITRCIM | ETH_MMCRXIMR_RXLPIUSCIM | ETH_MMCRXIMR_RXUCGPIM | ETH_MMCRXIMR_RXALGNERPIM | ETH_MMCRXIMR_RXCRCERPIM;
+   
+    /* Disable MAC interrupts */
+    ETH->MACIER = 0;
+    
+    /* Enable the desired DMA interrupts */
+    ETH->DMAC0IER = ETH_DMAC0IER_NIE | ETH_DMAC0IER_RIE | ETH_DMAC0IER_TIE;
+    
+    /* Enable MAC transmission and reception */
+    ETH->MACCR |= ETH_MACCR_TE | ETH_MACCR_RE;
+   
+    /* Enable DMA transmission and reception */
+    ETH->DMAC0TXCR |= ETH_DMAC0TXCR_ST;
+    ETH->DMAC0RXCR |= ETH_DMAC0RXCR_SR;
+   
+    /* Reset PHY transceiver */
+    phy_write_reg(RTL8211F_PHY_ADDR, RTL8211F_BMCR, RTL8211F_BMCR_RESET);
+    status = phy_read_reg(RTL8211F_PHY_ADDR, RTL8211F_BMCR);
+    /* Wait for the reset to complete */
+    tickstart = rt_tick_get();
+    while (status & RTL8211F_BMCR_RESET)
+    {
+        if((rt_tick_get() - tickstart) > ETH_TIME_OUT)
+        {
+            LOG_E("PHY software reset timeout!");
+            return RT_ETIMEOUT;
+        }
+        else
+        {
+            status = phy_read_reg(RTL8211F_PHY_ADDR, RTL8211F_BMCR);
+        } 
+    }
+    
+    /* The PHY will generate interrupts when link status changes are detected */
+    phy_write_reg(RTL8211F_PHY_ADDR, RTL8211F_INER, RTL8211F_INER_AN_COMPLETE | RTL8211F_INER_LINK_STATUS);
+
+    return RT_EOK;
+}
+
+static rt_err_t rt_stm32_eth_open(rt_device_t dev, rt_uint16_t oflag)
+{
+    LOG_D("emac open");
+    return RT_EOK;
+}
+
+static rt_err_t rt_stm32_eth_close(rt_device_t dev)
+{
+    LOG_D("emac close");
+    return RT_EOK;
+}
+
+static rt_size_t rt_stm32_eth_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
+{
+    LOG_D("emac read");
+    rt_set_errno(-RT_ENOSYS);
+    return 0;
+}
+
+static rt_size_t rt_stm32_eth_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
+{
+    LOG_D("emac write");
+    rt_set_errno(-RT_ENOSYS);
+    return 0;
+}
+
+static rt_err_t rt_stm32_eth_control(rt_device_t dev, int cmd, void *args)
+{
+    switch (cmd)
+    {
+    case NIOCTL_GADDR:
+        /* get mac address */
+        if (args) 
+        {
+            rt_memcpy(args, stm32_eth_device.dev_addr, 6);
+        }
+        else 
+        {
+            return -RT_ERROR;
+        }
+        break;
+
+    default :
+        break;
+    }
+
+    return RT_EOK;
+}
+
+rt_err_t rt_stm32_eth_tx(rt_device_t dev, struct pbuf *p)
+{
+    uint32_t framelen = 0;
+    struct pbuf *q = RT_NULL;
+    
+    /* Copy user data to the transmit buffer */
+    for (q = p; q != NULL; q = q->next)
+    {
+        /* Make sure the current buffer is available for writing */
+        if((txDmaDesc[txIndex].tdes3 & ETH_TDES3_OWN) != 0)
+        {
+            LOG_D("buffer not valid");
+            return ERR_USE;
+        }
+        
+        level = rt_hw_interrupt_disable();
+        rt_memcpy(&txBuffer[txIndex][framelen], q->payload, q->len);
+        framelen += q->len;
+        rt_hw_interrupt_enable(level);
+        
+        /* Check the frame length */
+        if (framelen > ETH_TX_BUF_SIZE - 1)
+        {
+            LOG_D(" tx buffer frame length over : %d", framelen);
+            return ERR_USE;
+        }
+    }
+    
+#ifdef ETH_TX_DUMP
+        rt_kprintf("Tx dump, len= %d\r\n", framelen);
+        dump_hex(txBuffer[txIndex], framelen);
+#endif
+
+    /* Set the start address of the buffer */
+    txDmaDesc[txIndex].tdes0 = (uint32_t)txBuffer[txIndex];
+    /* Write the number of bytes to send */
+    txDmaDesc[txIndex].tdes2 = ETH_TDES2_IOC | (framelen & ETH_TDES2_B1L);
+    /* Give the ownership of the descriptor to the DMA */
+    txDmaDesc[txIndex].tdes3 = ETH_TDES3_OWN | ETH_TDES3_FD | ETH_TDES3_LD;
+
+    /* Data synchronization barrier */
+    __DSB();
+
+    /* Clear TBU flag to resume processing */
+    ETH->DMAC0SR = ETH_DMAC0SR_TBU;
+    /* Instruct the DMA to poll the transmit descriptor list */
+    ETH->DMAC0TXDTPR = 0;
+    
+    if (++txIndex > ETH_TXBUFNB - 1)
+    {
+        txIndex = 0;
+    }
+
+    return ERR_OK;
+}
+
+struct pbuf *rt_stm32_eth_rx(rt_device_t dev)
+{
+    rt_uint32_t framelength = 0;
+    uint32_t framelen = 0;
+    struct pbuf *p = RT_NULL, *q = RT_NULL;
+
+    /* The current buffer is available for reading */
+    if (!(rxDmaDesc[rxIndex].rdes3 & ETH_RDES3_OWN)) 
+    {
+        /* FD and LD flags should be set */
+        if ((rxDmaDesc[rxIndex].rdes3 & ETH_RDES3_FD) && (rxDmaDesc[rxIndex].rdes3 & ETH_RDES3_LD))
+            {
+                /* Make sure no error occurred */
+                if(!(rxDmaDesc[rxIndex].rdes3 & ETH_RDES3_ES))
+                {
+                    /* Retrieve the length of the frame */
+                    framelength = rxDmaDesc[rxIndex].rdes3 & ETH_RDES3_PL;
+                    /* check the frame length */
+                    framelength = (framelength > ETH_RX_BUF_SIZE) ? ETH_RX_BUF_SIZE : framelength;
+
+                    p = pbuf_alloc(PBUF_RAW, framelength, PBUF_RAM);
+                    if (p != NULL)
+                    {
+                        for (q = p; q != NULL; q = q->next)
+                        {
+                            level=rt_hw_interrupt_disable();
+                            rt_memcpy(q->payload, &rxBuffer[rxIndex][framelen], q->len);
+                            framelen += q->len;
+                            rt_hw_interrupt_enable(level);
+                            
+                            if (framelen > framelength)
+                            {
+                                LOG_E("frame len is too long!");
+                                return RT_NULL;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    /* The received packet contains an error */
+                    LOG_D("the received packet contains an error!");
+                    return RT_NULL;
+                }
+                
+            }
+        else
+        {
+            /* The packet is not valid */
+            LOG_D("the packet is not valid");
+            return RT_NULL;
+        }
+
+        /* Set the start address of the buffer */
+        rxDmaDesc[rxIndex].rdes0 = (uint32_t)rxBuffer[rxIndex];
+        /* Give the ownership of the descriptor back to the DMA */
+        rxDmaDesc[rxIndex].rdes3 = ETH_RDES3_OWN | ETH_RDES3_IOC | ETH_RDES3_BUF1V;
+        
+#ifdef ETH_RX_DUMP
+        rt_kprintf("Rx dump, len= %d\r\n", framelen);
+        dump_hex(rxBuffer[rxIndex], framelen);
+#endif
+        /* Increment index and wrap around if necessary */
+        if (++rxIndex > ETH_RXBUFNB - 1)
+        {
+            rxIndex = 0;
+        }
+        /* Clear RBU flag to resume processing */
+        ETH->DMAC0SR = ETH_DMAC0SR_RBU;
+        /* Instruct the DMA to poll the receive descriptor list */
+        ETH->DMAC0RXDTPR = 0;
+    }
+    
+    return p;
+}
+
+void ETH1_IRQHandler(void)
+{
+    rt_uint32_t status = 0;
+    
+    /* enter interrupt */
+    rt_interrupt_enter();
+    /* Read DMA status register */
+    status = ETH->DMAC0SR;
+    /* Frame transmitted */
+    if (status & ETH_DMAC0SR_TI)
+    {
+        /* Clear the Eth DMA Tx IT pending bits */
+        ETH->DMAC0SR = ETH_DMAC0SR_TI;
+    }
+    /* Frame received */
+    else if (status & ETH_DMAC0SR_RI)
+    {
+        /* Disable RIE interrupt */
+        ETH->DMAC0IER &= ~ETH_DMAC0IER_RIE;
+        
+        rt_event_send(&rx_event, status);
+    }
+    /* ETH DMA Error */
+    if (status & ETH_DMAC0SR_AIS)
+    {
+        ETH->DMAC0IER &= ~ETH_DMAC0IER_AIE;
+        LOG_E("eth dam err");
+    }
+    /* Clear the interrupt flags */
+    ETH->DMAC0SR = ETH_DMAC0SR_NIS;
+    
+    /* leave interrupt */
+    rt_interrupt_leave();
+
+}
+
+static void phy_linkchange()
+{
+    rt_uint32_t status = 0;
+
+	/* Read status register to acknowledge the interrupt */
+    status = phy_read_reg(RTL8211F_PHY_ADDR, RTL8211F_INSR);
+	
+
+    if (status & (RTL8211F_BMSR_LINK_STATUS | RTL8211F_INSR_AN_COMPLETE))
+    {
+	    status = phy_read_reg(RTL8211F_PHY_ADDR, RTL8211F_BMSR);
+    	status = phy_read_reg(RTL8211F_PHY_ADDR, RTL8211F_BMSR);
+        if (status & RTL8211F_BMSR_LINK_STATUS)
+        {
+            LOG_D("link up");  
+
+			status = phy_read_reg(RTL8211F_PHY_ADDR, RTL8211F_PHYSR);
+            switch (status & RTL8211F_PHYSR_SPEED)
+            {
+            case RTL8211F_PHYSR_SPEED_10MBPS:
+              {
+                LOG_D("speed: 10M");
+                stm32_eth_device.eth_speed |= PHY_10M;
+              }
+            break;
+            
+            case RTL8211F_PHYSR_SPEED_100MBPS:
+              {
+                LOG_D("speed: 100M");
+                stm32_eth_device.eth_speed |= PHY_100M;
+              }
+            break;
+            
+            case RTL8211F_PHYSR_SPEED_1000MBPS:
+              {
+                LOG_D("speed: 1000M");
+                stm32_eth_device.eth_speed |= PHY_1000M;
+              }
+            break;
+            
+            /* Unknown speed */
+            default:
+                rt_kprintf("Invalid speed.");
+            break;    
+            }
+
+            stm32_eth_device.eth_mode = (status & RTL8211F_PHYSR_DUPLEX)? PHY_FULL_DUPLEX : PHY_HALF_DUPLEX ;
+
+            update_mac_mode(stm32_eth_device.eth_speed, stm32_eth_device.eth_mode);
+            /* send link up. */
+            eth_device_linkchange(&stm32_eth_device.parent, RT_TRUE);
+        }
+        else
+        {
+            LOG_I("link down");
+            eth_device_linkchange(&stm32_eth_device.parent, RT_FALSE);
+        }
+    }
+}
+
+#ifdef PHY_USING_INTERRUPT_MODE
+static void eth_phy_isr(void *args)
+{
+    rt_uint32_t status = 0;
+
+    phy_read_reg(RTL8211F_PHY_ADDR, PHY_INTERRUPT_FLAG_REG, (uint32_t *)&status);
+    LOG_D("phy interrupt status reg is 0x%X", status);
+
+    phy_linkchange();
+}
+#endif /* PHY_USING_INTERRUPT_MODE */
+
+static void phy_monitor_thread_entry(void *parameter)
+{
+    rt_uint32_t status = 0;
+    phy_linkchange();
+#ifdef PHY_USING_INTERRUPT_MODE
+    /* configuration intterrupt pin */
+    rt_pin_mode(PHY_INT_PIN, PIN_MODE_INPUT_PULLUP);
+    rt_pin_attach_irq(PHY_INT_PIN, PIN_IRQ_MODE_FALLING, eth_phy_isr, (void *)"callbackargs");
+    rt_pin_irq_enable(PHY_INT_PIN, PIN_IRQ_ENABLE);
+
+    /* enable phy interrupt */
+    phy_write_reg(RTL8211F_PHY_ADDR, PHY_INTERRUPT_MASK_REG, PHY_INT_MASK);
+#if defined(PHY_INTERRUPT_CTRL_REG)
+    phy_write_reg( RTL8211F_PHY_ADDR, PHY_INTERRUPT_CTRL_REG, PHY_INTERRUPT_EN);
+#endif
+#else /* PHY_USING_INTERRUPT_MODE */
+    stm32_eth_device.poll_link_timer = rt_timer_create("phylnk", (void (*)(void*))phy_linkchange,
+                                        NULL, RT_TICK_PER_SECOND, RT_TIMER_FLAG_PERIODIC);
+    if (!stm32_eth_device.poll_link_timer || rt_timer_start(stm32_eth_device.poll_link_timer) != RT_EOK)
+    {
+        LOG_E("Start link change detection timer failed");
+    }
+#endif /* PHY_USING_INTERRUPT_MODE */
+    while(1)
+    {
+        if (rt_event_recv(&rx_event, 0xffffffff, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
+                      RT_WAITING_FOREVER, &status) == RT_EOK)
+        {
+            /* check dma rx buffer */
+            if (ETH->DMAC0SR & ETH_DMAC0SR_RI)
+            {
+                /* Clear interrupt flag */
+                ETH->DMAC0SR = ETH_DMAC0SR_RI;
+                /* Process all pending packets */
+                while (rxDmaDesc[rxIndex].rdes3 & ETH_RDES3_PL)
+                {
+                    /* trigger lwip receive thread */
+                    eth_device_ready(&(stm32_eth_device.parent));
+                }
+            }
+            
+            /* enable DMA interrupts */
+            ETH->DMAC0IER = ETH_DMAC0IER_NIE | ETH_DMAC0IER_RIE | ETH_DMAC0IER_TIE; 
+        }
+    }
+}
+
+/* Register the EMAC device */
+static int rt_hw_stm32_eth_init(void)
+{
+    rt_err_t state = RT_EOK;
+    
+    /* OUI 00-80-E1 STMICROELECTRONICS. */
+    stm32_eth_device.dev_addr[0] = 0x00;
+    stm32_eth_device.dev_addr[1] = 0x80;
+    stm32_eth_device.dev_addr[2] = 0xE1;
+    /* generate MAC addr from 96bit unique ID (only for test). */
+    stm32_eth_device.dev_addr[3] = *(rt_uint8_t *)(UID_BASE + 4);
+    stm32_eth_device.dev_addr[4] = *(rt_uint8_t *)(UID_BASE + 2);
+    stm32_eth_device.dev_addr[5] = *(rt_uint8_t *)(UID_BASE + 0);
+
+    stm32_eth_device.parent.parent.init      = rt_stm32_eth_init;
+    stm32_eth_device.parent.parent.open      = rt_stm32_eth_open;
+    stm32_eth_device.parent.parent.close     = rt_stm32_eth_close;
+    stm32_eth_device.parent.parent.read      = rt_stm32_eth_read;
+    stm32_eth_device.parent.parent.write     = rt_stm32_eth_write;
+    stm32_eth_device.parent.parent.control   = rt_stm32_eth_control;
+    stm32_eth_device.parent.parent.user_data = RT_NULL;
+
+    stm32_eth_device.parent.eth_rx = rt_stm32_eth_rx;
+    stm32_eth_device.parent.eth_tx = rt_stm32_eth_tx;
+
+    rt_event_init(&rx_event, "eth_rx", RT_IPC_FLAG_FIFO);
+    
+    /* register eth device */
+    state = eth_device_init(&(stm32_eth_device.parent), "e0");
+    if (RT_EOK == state)
+    {
+        LOG_D("emac device init success");
+    }
+    else
+    {
+        LOG_E("emac device init faild: %d", state);
+        state = -RT_ERROR;
+    }
+
+    /* start phy monitor */
+    rt_thread_t tid;
+    tid = rt_thread_create("phy",
+                           phy_monitor_thread_entry,
+                           RT_NULL,
+                           1024,
+                           RT_THREAD_PRIORITY_MAX - 2,
+                           2);
+    if (tid != RT_NULL)
+    {
+        rt_thread_startup(tid);
+    }
+    else
+    {
+        state = -RT_ERROR;
+    }
+
+    return state;
+}
+INIT_DEVICE_EXPORT(rt_hw_stm32_eth_init);
+
+#endif

+ 404 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.h

@@ -0,0 +1,404 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author            Notes
+ * 2020-07-20     thread-liu        the first version
+ */
+
+#ifndef __DRV_ETH_H__
+#define __DRV_ETH_H__
+
+#include <rtthread.h>
+#include <rthw.h>
+#include <rtdevice.h>
+#include <board.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct
+{
+  uint32_t         Speed;                       /*!< Sets the Ethernet speed: 10/100/1000 Mbps.
+                                                           This parameter can be a value of @ref ETH_Speed */
+  uint32_t         DuplexMode;                  /*!< Selects the MAC duplex mode: Half-Duplex or Full-Duplex mode
+                                                           This parameter can be a value of @ref ETH_Duplex_Mode */
+} ETH_MACConfigTypeDef;
+
+/**
+ * @brief Transmit descriptor
+ **/
+typedef struct
+{
+   uint32_t tdes0;
+   uint32_t tdes1;
+   uint32_t tdes2;
+   uint32_t tdes3;
+} TxDmaDesc;
+
+/**
+ * @brief Receive descriptor
+ **/
+typedef struct
+{
+   uint32_t rdes0;
+   uint32_t rdes1;
+   uint32_t rdes2;
+   uint32_t rdes3;
+} RxDmaDesc;
+
+enum {
+    PHY_LINK        = (1 << 0),
+    PHY_10M         = (1 << 1),
+    PHY_100M        = (1 << 2),
+    PHY_1000M       = (1 << 3),
+    PHY_FULL_DUPLEX = (1 << 4),
+    PHY_HALF_DUPLEX = (1 << 5)
+};
+
+
+#define RTL8211F_PHY_ADDR       1           /* PHY address */
+
+#define ETH_TXBUFNB             4           /* 4 Tx buffers of size ETH_TX_BUF_SIZE */
+#define ETH_TX_BUF_SIZE         1536        /* buffer size for transmit */
+#define ETH_RXBUFNB             4           /* 4 Rx buffers of size ETH_RX_BUF_SIZE */
+#define ETH_RX_BUF_SIZE         1536        /* buffer size for receive */
+
+#define ETH_MMC_INTERRUPT_MASK_TXLPITRCIM_Msk ETH_MMCTXIMR_TXLPITRCIM_Msk /* ETH_MMCTXIMR register  */
+
+/* Register access macros */
+#define ETH_MACRXQC0R_RXQ0EN_Val(n)     (((n) << ETH_MACRXQC0R_RXQ0EN_Pos) & ETH_MACRXQC0R_RXQ0EN_Msk)
+#define ETH_MACMDIOAR_CR_Val(n)         (((n) << ETH_MACMDIOAR_CR_Pos) & ETH_MACMDIOAR_CR_Msk)
+#define ETH_MACMDIOAR_GOC_Val(n)        (((n) << ETH_MACMDIOAR_GOC_Pos) & ETH_MACMDIOAR_GOC_Msk)
+#define ETH_MTLTXQ0OMR_TQS_Val(n)       (((n) << ETH_MTLTXQ0OMR_TQS_Pos) & ETH_MTLTXQ0OMR_TQS_Msk)
+#define ETH_MTLTXQ0OMR_TXQEN_Val(n)     (((n) << ETH_MTLTXQ0OMR_TXQEN_Pos) & ETH_MTLTXQ0OMR_TXQEN_Msk)
+#define ETH_MTLRXQ0OMR_RQS_Val(n)       (((n) << ETH_MTLRXQ0OMR_RQS_Pos) & ETH_MTLRXQ0OMR_RQS_Msk)
+#define ETH_DMAMR_INTM_Val(n)           (((n) << ETH_DMAMR_INTM_Pos) & ETH_DMAMR_INTM_Msk)
+#define ETH_DMAMR_PR_Val(n)             (((n) << ETH_DMAMR_PR_Pos) & ETH_DMAMR_PR_Msk)
+#define ETH_DMAC0CR_DSL_Val(n)          (((n) << ETH_DMAC0CR_DSL_Pos) & ETH_DMAC0CR_DSL_Msk)
+#define ETH_DMAC0TXCR_TXPBL_Val(n)      (((n) << ETH_DMAC0TXCR_TXPBL_Pos) & ETH_DMAC0TXCR_TXPBL_Msk)
+#define ETH_DMAC0RXCR_RXPBL_Val(n)      (((n) << ETH_DMAC0RXCR_RXPBL_Pos) & ETH_DMAC0RXCR_RXPBL_Msk)
+#define ETH_DMAC0RXCR_RBSZ_Val(n)       (((n) << ETH_DMAC0RXCR_RBSZ_Pos) & ETH_DMAC0RXCR_RBSZ_Msk)
+
+/* Transmit normal descriptor (read format) */
+#define ETH_TDES0_BUF1AP        0xFFFFFFFF
+#define ETH_TDES1_BUF2AP        0xFFFFFFFF
+#define ETH_TDES2_IOC           0x80000000
+#define ETH_TDES2_TTSE          0x40000000
+#define ETH_TDES2_B2L           0x3FFF0000
+#define ETH_TDES2_VTIR          0x0000C000
+#define ETH_TDES2_B1L           0x00003FFF
+#define ETH_TDES3_OWN           0x80000000
+#define ETH_TDES3_CTXT          0x40000000
+#define ETH_TDES3_FD            0x20000000
+#define ETH_TDES3_LD            0x10000000
+#define ETH_TDES3_CPC           0x0C000000
+#define ETH_TDES3_SAIC          0x03800000
+#define ETH_TDES3_THL           0x00780000
+#define ETH_TDES3_TSE           0x00040000
+#define ETH_TDES3_CIC           0x00030000
+#define ETH_TDES3_FL            0x00007FFF
+
+/* Transmit normal descriptor (write-back format) */
+#define ETH_TDES0_TTSL          0xFFFFFFFF
+#define ETH_TDES1_TTSH          0xFFFFFFFF
+#define ETH_TDES3_OWN           0x80000000
+#define ETH_TDES3_CTXT          0x40000000
+#define ETH_TDES3_FD            0x20000000
+#define ETH_TDES3_LD            0x10000000
+#define ETH_TDES3_TTSS          0x00020000
+#define ETH_TDES3_ES            0x00008000
+#define ETH_TDES3_JT            0x00004000
+#define ETH_TDES3_FF            0x00002000
+#define ETH_TDES3_PCE           0x00001000
+#define ETH_TDES3_LOC           0x00000800
+#define ETH_TDES3_NC            0x00000400
+#define ETH_TDES3_LC            0x00000200
+#define ETH_TDES3_EC            0x00000100
+#define ETH_TDES3_CC            0x000000F0
+#define ETH_TDES3_ED            0x00000008
+#define ETH_TDES3_UF            0x00000004
+#define ETH_TDES3_DB            0x00000002
+#define ETH_TDES3_IHE           0x00000001
+
+/* Transmit context descriptor           */
+#define ETH_TDES0_TTSL          0xFFFFFFFF
+#define ETH_TDES1_TTSH          0xFFFFFFFF
+#define ETH_TDES2_IVT           0xFFFF0000
+#define ETH_TDES2_MSS           0x00003FFF
+#define ETH_TDES3_OWN           0x80000000
+#define ETH_TDES3_CTXT          0x40000000
+#define ETH_TDES3_OSTC          0x08000000
+#define ETH_TDES3_TCMSSV        0x04000000
+#define ETH_TDES3_CDE           0x00800000
+#define ETH_TDES3_IVLTV         0x00020000
+#define ETH_TDES3_VLTV          0x00010000
+#define ETH_TDES3_VT            0x0000FFFF
+
+/* Receive normal descriptor (read format) */
+#define ETH_RDES0_BUF1AP        0xFFFFFFFF
+#define ETH_RDES2_BUF2AP        0xFFFFFFFF
+#define ETH_RDES3_OWN           0x80000000
+#define ETH_RDES3_IOC           0x40000000
+#define ETH_RDES3_BUF2V         0x02000000
+#define ETH_RDES3_BUF1V         0x01000000
+
+/* Receive normal descriptor (write-back format) */
+#define ETH_RDES0_IVT           0xFFFF0000
+#define ETH_RDES0_OVT           0x0000FFFF
+#define ETH_RDES1_OPC           0xFFFF0000
+#define ETH_RDES1_TD            0x00008000
+#define ETH_RDES1_TSA           0x00004000
+#define ETH_RDES1_PV            0x00002000
+#define ETH_RDES1_PFT           0x00001000
+#define ETH_RDES1_PMT           0x00000F00
+#define ETH_RDES1_IPCE          0x00000080
+#define ETH_RDES1_IPCB          0x00000040
+#define ETH_RDES1_IPV6          0x00000020
+#define ETH_RDES1_IPV4          0x00000010
+#define ETH_RDES1_IPHE          0x00000008
+#define ETH_RDES1_PT            0x00000007
+#define ETH_RDES2_L3L4FM        0xE0000000
+#define ETH_RDES2_L4FM          0x10000000
+#define ETH_RDES2_L3FM          0x08000000
+#define ETH_RDES2_MADRM         0x07F80000
+#define ETH_RDES2_HF            0x00040000
+#define ETH_RDES2_DAF           0x00020000
+#define ETH_RDES2_SAF           0x00010000
+#define ETH_RDES2_VF            0x00008000
+#define ETH_RDES2_ARPRN         0x00000400
+#define ETH_RDES3_OWN           0x80000000
+#define ETH_RDES3_CTXT          0x40000000
+#define ETH_RDES3_FD            0x20000000
+#define ETH_RDES3_LD            0x10000000
+#define ETH_RDES3_RS2V          0x08000000
+#define ETH_RDES3_RS1V          0x04000000
+#define ETH_RDES3_RS0V          0x02000000
+#define ETH_RDES3_CE            0x01000000
+#define ETH_RDES3_GP            0x00800000
+#define ETH_RDES3_RWT           0x00400000
+#define ETH_RDES3_OE            0x00200000
+#define ETH_RDES3_RE            0x00100000
+#define ETH_RDES3_DE            0x00080000
+#define ETH_RDES3_LT            0x00070000
+#define ETH_RDES3_ES            0x00008000
+#define ETH_RDES3_PL            0x00007FFF
+
+/* Receive context descriptor */
+#define ETH_RDES0_RTSL          0xFFFFFFFF
+#define ETH_RDES1_RTSH          0xFFFFFFFF
+#define ETH_RDES3_OWN           0x80000000
+#define ETH_RDES3_CTXT          0x40000000
+
+#define RTL8211F_BMCR     ((uint16_t)0x0000U) /* Basic Mode Control Register. */
+#define RTL8211F_BMSR     ((uint16_t)0x0001U) /* Basic Mode Status Register. */
+#define RTL8211F_PHYID1   ((uint16_t)0x0002U) /* PHY Identifier Register 1. */
+#define RTL8211F_PHYID2   ((uint16_t)0x0003U) /* PHY Identifier Register 2. */
+#define RTL8211F_ANAR     ((uint16_t)0x0004U) /* Auto-Negotiation Advertising Register. */
+#define RTL8211F_ANLPAR   ((uint16_t)0x0005U) /* Auto-Negotiation Link Partner Ability Register. */
+#define RTL8211F_ANER     ((uint16_t)0x0006U) /* Auto-Negotiation Expansion Register.*/
+#define RTL8211F_ANNPTR   ((uint16_t)0x0007U) /* Auto-Negotiation Next Page Transmit Register.*/
+#define RTL8211F_ANNPRR   ((uint16_t)0x0008U) /* Auto-Negotiation Next Page Receive Register. */
+#define RTL8211F_GBCR     ((uint16_t)0x0009U) /* 1000Base-T Control Register. */
+#define RTL8211F_GBSR     ((uint16_t)0x000AU) /* 1000Base-T Status Register. */
+#define RTL8211F_MMDACR   ((uint16_t)0x000DU) /* MMD Access Control Register. */
+#define RTL8211F_MMDAADR  ((uint16_t)0x000EU) /* MMD Access Address Data Register. */
+#define RTL8211F_GBESR    ((uint16_t)0x000FU) /* 1000Base-T Extended Status Register. */
+#define RTL8211F_LCR      ((uint16_t)0x0010U) /* LED Control Register. */
+#define RTL8211F_INER     ((uint16_t)0x0012U) /* Interrupt Enable Register. */
+#define RTL8211F_PHYSCR   ((uint16_t)0x0014U) /* PHY Special Cofig Register */
+#define RTL8211F_PHYCR1   ((uint16_t)0x0018U) /* PHY Specific Control Register 1. */
+#define RTL8211F_PHYCR2   ((uint16_t)0x0019U) /* PHY Specific Control Register 2. */
+#define RTL8211F_PHYSR    ((uint16_t)0x001AU) /* PHY Specific Status Register. */
+#define RTL8211F_INSR     ((uint16_t)0x001DU) /* Interrupt Status Register. */
+#define RTL8211F_PAGSR    ((uint16_t)0x001FU) /* Page Select Register. */
+
+/* Basic Mode Control register */
+#define RTL8211F_BMCR_RESET                    0x8000
+#define RTL8211F_BMCR_LOOPBACK                 0x4000
+#define RTL8211F_BMCR_SPEED_SEL_LSB            0x2000
+#define RTL8211F_BMCR_AN_EN                    0x1000
+#define RTL8211F_BMCR_POWER_DOWN               0x0800
+#define RTL8211F_BMCR_ISOLATE                  0x0400
+#define RTL8211F_BMCR_RESTART_AN               0x0200
+#define RTL8211F_BMCR_DUPLEX_MODE              0x0100
+#define RTL8211F_BMCR_COL_TEST                 0x0080
+#define RTL8211F_BMCR_SPEED_SEL_MSB            0x0040
+#define RTL8211F_BMCR_UNI_DIR_EN               0x0020
+
+/* Basic Mode Status register */
+#define RTL8211F_BMSR_100BT4                   0x8000
+#define RTL8211F_BMSR_100BTX_FD                0x4000
+#define RTL8211F_BMSR_100BTX_HD                0x2000
+#define RTL8211F_BMSR_10BT_FD                  0x1000
+#define RTL8211F_BMSR_10BT_HD                  0x0800
+#define RTL8211F_BMSR_100BT2_FD                0x0400
+#define RTL8211F_BMSR_100BT2_HD                0x0200
+#define RTL8211F_BMSR_EXTENDED_STATUS          0x0100
+#define RTL8211F_BMSR_UNI_DIR_CAPABLE          0x0080
+#define RTL8211F_BMSR_PREAMBLE_SUPPR           0x0040
+#define RTL8211F_BMSR_AN_COMPLETE              0x0020
+#define RTL8211F_BMSR_REMOTE_FAULT             0x0010
+#define RTL8211F_BMSR_AN_CAPABLE               0x0008
+#define RTL8211F_BMSR_LINK_STATUS              0x0004
+#define RTL8211F_BMSR_JABBER_DETECT            0x0002
+#define RTL8211F_BMSR_EXTENDED_CAPABLE         0x0001
+
+/* PHY Identifier 1 register */
+#define RTL8211F_PHYID1_OUI_MSB                0xFFFF
+#define RTL8211F_PHYID1_OUI_MSB_DEFAULT        0x001C
+
+/* PHY Identifier 2 register */
+#define RTL8211F_PHYID2_OUI_LSB                0xFC00
+#define RTL8211F_PHYID2_OUI_LSB_DEFAULT        0xC800
+#define RTL8211F_PHYID2_MODEL_NUM              0x03F0
+#define RTL8211F_PHYID2_MODEL_NUM_DEFAULT      0x0110
+#define RTL8211F_PHYID2_REVISION_NUM           0x000F
+#define RTL8211F_PHYID2_REVISION_NUM_DEFAULT   0x0006
+
+/* Auto-Negotiation Advertisement register */
+#define RTL8211F_ANAR_NEXT_PAGE                0x8000
+#define RTL8211F_ANAR_REMOTE_FAULT             0x2000
+#define RTL8211F_ANAR_ASYM_PAUSE               0x0800
+#define RTL8211F_ANAR_PAUSE                    0x0400
+#define RTL8211F_ANAR_100BT4                   0x0200
+#define RTL8211F_ANAR_100BTX_FD                0x0100
+#define RTL8211F_ANAR_100BTX_HD                0x0080
+#define RTL8211F_ANAR_10BT_FD                  0x0040
+#define RTL8211F_ANAR_10BT_HD                  0x0020
+#define RTL8211F_ANAR_SELECTOR                 0x001F
+#define RTL8211F_ANAR_SELECTOR_DEFAULT         0x0001
+
+/* Auto-Negotiation Link Partner Ability register */
+#define RTL8211F_ANLPAR_NEXT_PAGE              0x8000
+#define RTL8211F_ANLPAR_ACK                    0x4000
+#define RTL8211F_ANLPAR_REMOTE_FAULT           0x2000
+#define RTL8211F_ANLPAR_ASYM_PAUSE             0x0800
+#define RTL8211F_ANLPAR_PAUSE                  0x0400
+#define RTL8211F_ANLPAR_100BT4                 0x0200
+#define RTL8211F_ANLPAR_100BTX_FD              0x0100
+#define RTL8211F_ANLPAR_100BTX_HD              0x0080
+#define RTL8211F_ANLPAR_10BT_FD                0x0040
+#define RTL8211F_ANLPAR_10BT_HD                0x0020
+#define RTL8211F_ANLPAR_SELECTOR               0x001F
+#define RTL8211F_ANLPAR_SELECTOR_DEFAULT       0x0001
+
+/* Auto-Negotiation Expansion register */
+#define RTL8211F_ANER_RX_NP_LOCATION_ABLE      0x0040
+#define RTL8211F_ANER_RX_NP_LOCATION           0x0020
+#define RTL8211F_ANER_PAR_DETECT_FAULT         0x0010
+#define RTL8211F_ANER_LP_NEXT_PAGE_ABLE        0x0008
+#define RTL8211F_ANER_NEXT_PAGE_ABLE           0x0004
+#define RTL8211F_ANER_PAGE_RECEIVED            0x0002
+#define RTL8211F_ANER_LP_AN_ABLE               0x0001
+
+/* Auto-Negotiation Next Page Transmit register */
+#define RTL8211F_ANNPTR_NEXT_PAGE              0x8000
+#define RTL8211F_ANNPTR_MSG_PAGE               0x2000
+#define RTL8211F_ANNPTR_ACK2                   0x1000
+#define RTL8211F_ANNPTR_TOGGLE                 0x0800
+#define RTL8211F_ANNPTR_MESSAGE                0x07FF
+
+/* Auto-Negotiation Next Page Receive register */
+#define RTL8211F_ANNPRR_NEXT_PAGE              0x8000
+#define RTL8211F_ANNPRR_ACK                    0x4000
+#define RTL8211F_ANNPRR_MSG_PAGE               0x2000
+#define RTL8211F_ANNPRR_ACK2                   0x1000
+#define RTL8211F_ANNPRR_TOGGLE                 0x0800
+#define RTL8211F_ANNPRR_MESSAGE                0x07FF
+
+/* 1000Base-T Control register */
+#define RTL8211F_GBCR_TEST_MODE                0xE000
+#define RTL8211F_GBCR_MS_MAN_CONF_EN           0x1000
+#define RTL8211F_GBCR_MS_MAN_CONF_VAL          0x0800
+#define RTL8211F_GBCR_PORT_TYPE                0x0400
+#define RTL8211F_GBCR_1000BT_FD                0x0200
+
+/* 1000Base-T Status register */
+#define RTL8211F_GBSR_MS_CONF_FAULT            0x8000
+#define RTL8211F_GBSR_MS_CONF_RES              0x4000
+#define RTL8211F_GBSR_LOCAL_RECEIVER_STATUS    0x2000
+#define RTL8211F_GBSR_REMOTE_RECEIVER_STATUS   0x1000
+#define RTL8211F_GBSR_LP_1000BT_FD             0x0800
+#define RTL8211F_GBSR_LP_1000BT_HD             0x0400
+#define RTL8211F_GBSR_IDLE_ERR_COUNT           0x00FF
+
+/* MMD Access Control register */
+#define RTL8211F_MMDACR_FUNC                   0xC000
+#define RTL8211F_MMDACR_FUNC_ADDR              0x0000
+#define RTL8211F_MMDACR_FUNC_DATA_NO_POST_INC  0x4000
+#define RTL8211F_MMDACR_FUNC_DATA_POST_INC_RW  0x8000
+#define RTL8211F_MMDACR_FUNC_DATA_POST_INC_W   0xC000
+#define RTL8211F_MMDACR_DEVAD                  0x001F
+
+/* 1000Base-T Extended Status register */
+#define RTL8211F_GBESR_1000BX_FD               0x8000
+#define RTL8211F_GBESR_1000BX_HD               0x4000
+#define RTL8211F_GBESR_1000BT_FD               0x2000
+#define RTL8211F_GBESR_1000BT_HD               0x1000
+
+/* Interrupt Enable register */
+#define RTL8211F_INER_JABBER                   0x0400
+#define RTL8211F_INER_ALDPS_STATE              0x0200
+#define RTL8211F_INER_PME                      0x0080
+#define RTL8211F_INER_PHY_REG_ACCESS           0x0020
+#define RTL8211F_INER_LINK_STATUS              0x0010
+#define RTL8211F_INER_AN_COMPLETE              0x0008
+#define RTL8211F_INER_PAGE_RECEIVED            0x0004
+#define RTL8211F_INER_AN_ERROR                 0x0001
+
+/* PHY Specific Control 1 register */
+#define RTL8211F_PHYCR1_PHYAD_0_EN             0x2000
+#define RTL8211F_PHYCR1_MDI_MODE_MANUAL_CONFIG 0x0200
+#define RTL8211F_PHYCR1_MDI_MODE               0x0100
+#define RTL8211F_PHYCR1_TX_CRS_EN              0x0080
+#define RTL8211F_PHYCR1_PHYAD_NON_ZERO_DETECT  0x0040
+#define RTL8211F_PHYCR1_PREAMBLE_CHECK_EN      0x0010
+#define RTL8211F_PHYCR1_JABBER_DETECT_EN       0x0008
+#define RTL8211F_PHYCR1_ALDPS_EN               0x0004
+
+/* PHY Specific Control 2 register */
+#define RTL8211F_PHYCR2_CLKOUT_FREQ_SEL        0x0800
+#define RTL8211F_PHYCR2_CLKOUT_SSC_EN          0x0080
+#define RTL8211F_PHYCR2_RXC_SSC_EN             0x0008
+#define RTL8211F_PHYCR2_RXC_EN                 0x0002
+#define RTL8211F_PHYCR2_CLKOUT_EN              0x0001
+
+/* PHY Specific Status register */
+#define RTL8211F_PHYSR_ALDPS_STATE             0x4000
+#define RTL8211F_PHYSR_MDI_PLUG                0x2000
+#define RTL8211F_PHYSR_NWAY_EN                 0x1000
+#define RTL8211F_PHYSR_MASTER_MODE             0x0800
+#define RTL8211F_PHYSR_EEE_CAPABLE             0x0100
+#define RTL8211F_PHYSR_RX_FLOW_EN              0x0080
+#define RTL8211F_PHYSR_TX_FLOW_EN              0x0040
+#define RTL8211F_PHYSR_SPEED                   0x0030
+#define RTL8211F_PHYSR_SPEED_10MBPS            0x0000
+#define RTL8211F_PHYSR_SPEED_100MBPS           0x0010
+#define RTL8211F_PHYSR_SPEED_1000MBPS          0x0020
+#define RTL8211F_PHYSR_DUPLEX                  0x0008
+#define RTL8211F_PHYSR_LINK                    0x0004
+#define RTL8211F_PHYSR_MDI_CROSSOVER_STATUS    0x0002
+#define RTL8211F_PHYSR_JABBER                  0x0001
+
+/* Interrupt Status register */
+#define RTL8211F_INSR_JABBER                   0x0400
+#define RTL8211F_INSR_ALDPS_STATE              0x0200
+#define RTL8211F_INSR_PME                      0x0080
+#define RTL8211F_INSR_PHY_REG_ACCESS           0x0020
+#define RTL8211F_INSR_LINK_STATUS              0x0010
+#define RTL8211F_INSR_AN_COMPLETE              0x0008
+#define RTL8211F_INSR_PAGE_RECEIVED            0x0004
+#define RTL8211F_INSR_AN_ERROR                 0x0001
+
+/* Page Select register */
+#define RTL8211F_PAGSR_PAGE_SEL                0x0007
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

+ 35 - 36
bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_pmic.c

@@ -19,6 +19,8 @@
 #define LOG_TAG              "drv.pmic"
 #include <drv_log.h>
 
+#define I2C_NAME  "i2c3"
+
 static struct rt_i2c_bus_device *pmic_dev = RT_NULL;
 
 /* i2c read reg */
@@ -796,47 +798,47 @@ static rt_err_t rt_hw_pmic_init_register(void)
     stpmu1_write_reg(BUCK_ICC_TURNOFF_REG, 0x30);
     stpmu1_write_reg(LDO_ICC_TURNOFF_REG, 0x3b);
 
-  /* vddcore */
-  STPMU1_Regulator_Voltage_Set(STPMU1_BUCK1, 1200);
-  STPMU1_Regulator_Enable(STPMU1_BUCK1);
+    /* vddcore */
+    STPMU1_Regulator_Voltage_Set(STPMU1_BUCK1, 1200);
+    STPMU1_Regulator_Enable(STPMU1_BUCK1);
 
-  /* vddddr */
-  STPMU1_Regulator_Voltage_Set(STPMU1_BUCK2, 1350);
-  STPMU1_Regulator_Enable(STPMU1_BUCK2);
+    /* vddddr */
+    STPMU1_Regulator_Voltage_Set(STPMU1_BUCK2, 1350);
+    STPMU1_Regulator_Enable(STPMU1_BUCK2);
 
-  /* vdd */
-  STPMU1_Regulator_Voltage_Set(STPMU1_BUCK3, 3300);
-  STPMU1_Regulator_Enable(STPMU1_BUCK3);
+    /* vdd */
+    STPMU1_Regulator_Voltage_Set(STPMU1_BUCK3, 3300);
+    STPMU1_Regulator_Enable(STPMU1_BUCK3);
 
-  /* 3v3 */
-  STPMU1_Regulator_Voltage_Set(STPMU1_BUCK4, 3300);
-  STPMU1_Regulator_Enable(STPMU1_BUCK4);
+//    /* 3v3 */
+//    STPMU1_Regulator_Voltage_Set(STPMU1_BUCK4, 3300);
+//    STPMU1_Regulator_Enable(STPMU1_BUCK4);
 
-  /* vdda */
-  STPMU1_Regulator_Voltage_Set(STPMU1_LDO1, 2900);
-  STPMU1_Regulator_Enable(STPMU1_LDO1);
+    /* 1v8_audio */
+    STPMU1_Regulator_Voltage_Set(STPMU1_LDO1, 1800);
+    STPMU1_Regulator_Enable(STPMU1_LDO1);
 
-  /* 2v8 */
-  STPMU1_Regulator_Voltage_Set(STPMU1_LDO2, 2800);
-  STPMU1_Regulator_Enable(STPMU1_LDO2);
+    /* vdd_emmc */
+    STPMU1_Regulator_Voltage_Set(STPMU1_LDO2, 2900);
+    STPMU1_Regulator_Enable(STPMU1_LDO2);
 
-  /* vtt_ddr  lod3 mode buck2/2 */
-  STPMU1_Regulator_Voltage_Set(STPMU1_LDO3, 0xFFFF);
-  STPMU1_Regulator_Enable(STPMU1_LDO3);
+    /* vdd1_ddr */
+    STPMU1_Regulator_Voltage_Set(STPMU1_LDO3, 0xFFFF);
+    STPMU1_Regulator_Enable(STPMU1_LDO3);
 
-  /* vdd_usb */
-  STPMU1_Regulator_Voltage_Set(STPMU1_LDO4, 3300);
-  STPMU1_Regulator_Enable(STPMU1_LDO4);
+    /* vdd_usb */
+    STPMU1_Regulator_Voltage_Set(STPMU1_LDO4, 3300);
+    STPMU1_Regulator_Enable(STPMU1_LDO4);
 
-  /* vdd_sd */
-  STPMU1_Regulator_Voltage_Set(STPMU1_LDO5, 2900);
-  STPMU1_Regulator_Enable(STPMU1_LDO5);
+    /* vdda */
+    STPMU1_Regulator_Voltage_Set(STPMU1_LDO5, 2900);
+    STPMU1_Regulator_Enable(STPMU1_LDO5);
 
-  /* 1v8 */
-  STPMU1_Regulator_Voltage_Set(STPMU1_LDO6, 1800);
-  STPMU1_Regulator_Enable(STPMU1_LDO6);
+    /* 2v8 */
+    STPMU1_Regulator_Voltage_Set(STPMU1_LDO6, 2800);
+    STPMU1_Regulator_Enable(STPMU1_LDO6);
 
-  STPMU1_Regulator_Enable(STPMU1_VREFDDR);
+    STPMU1_Regulator_Enable(STPMU1_VREFDDR);
 
     return RT_EOK;
 }
@@ -884,7 +886,7 @@ static int pmic_init(void)
     {
         BSP_PMIC_MspInit();
         
-        result = rt_hw_pmic_init("i2c3");
+        result = rt_hw_pmic_init(I2C_NAME);
         if(result != RT_EOK)
         {
             LOG_D("stpmic init failed: %02x", result);
@@ -893,10 +895,7 @@ static int pmic_init(void)
         }
         
         rt_hw_pmic_init_register();
-    }
-    
-    if(IS_ENGINEERING_BOOT_MODE())
-    {
+        
         __HAL_RCC_VREF_CLK_ENABLE();
         HAL_SYSCFG_VREFBUF_HighImpedanceConfig(SYSCFG_VREFBUF_HIGH_IMPEDANCE_DISABLE);
         HAL_SYSCFG_EnableVREFBUF();

+ 555 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c

@@ -0,0 +1,555 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-07-16     thread-liu   first version
+ */
+
+#include "board.h"
+#include "drv_sdio.h"
+#include <dfs_fs.h>
+
+#ifdef BSP_USING_SDMMC
+
+//#define DRV_DEBUG
+#define DBG_TAG              "drv.sdio"
+#ifdef DRV_DEBUG
+#define DBG_LVL               DBG_LOG
+#else
+#define DBG_LVL               DBG_INFO
+#endif /* DRV_DEBUG */
+#include <rtdbg.h>
+
+static SD_HandleTypeDef hsd;
+static struct rt_mmcsd_host *host;
+#define SDIO_TX_RX_COMPLETE_TIMEOUT_LOOPS    (100000)
+
+#define RTHW_SDIO_LOCK(_sdio)   rt_mutex_take(&_sdio->mutex, RT_WAITING_FOREVER)
+#define RTHW_SDIO_UNLOCK(_sdio) rt_mutex_release(&_sdio->mutex);
+
+struct sdio_pkg
+{
+    struct rt_mmcsd_cmd *cmd;
+    void *buff;
+    rt_uint32_t flag;
+};
+
+struct rthw_sdio
+{
+    struct rt_mmcsd_host *host;
+    struct stm32_sdio_des sdio_des;
+    struct rt_event event;
+    struct rt_mutex mutex;
+    struct sdio_pkg *pkg;
+};
+
+/* SYSRAM SDMMC1/2 accesses */
+#if defined(__CC_ARM) || defined(__CLANG_ARM)
+rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((at(0x2FFC0000)));
+#elif defined(__ICCARM__)
+#pragma location=0x2FFC0000
+rt_uint8_t cache_buf[SDIO_BUFF_SIZE];
+#elif defined(__GNUC__)
+rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((at(0x2FFC0000)));
+#endif
+
+/**
+  * @brief  This function get order from sdio.
+  * @param  data
+  * @retval sdio order
+  */
+static int get_order(rt_uint32_t data)
+{
+    int order = 0;
+
+    switch (data)
+    {
+    case 1:
+        order = 0;
+        break;
+    case 2:
+        order = 1;
+        break;
+    case 4:
+        order = 2;
+        break;
+    case 8:
+        order = 3;
+        break;
+    case 16:
+        order = 4;
+        break;
+    case 32:
+        order = 5;
+        break;
+    case 64:
+        order = 6;
+        break;
+    case 128:
+        order = 7;
+        break;
+    case 256:
+        order = 8;
+        break;
+    case 512:
+        order = 9;
+        break;
+    case 1024:
+        order = 10;
+        break;
+    case 2048:
+        order = 11;
+        break;
+    case 4096:
+        order = 12;
+        break;
+    case 8192:
+        order = 13;
+        break;
+    case 16384:
+        order = 14;
+        break;
+    default :
+        order = 0;
+        break;
+    }
+    return order;
+}
+
+/**
+  * @brief  This function wait sdio cmd completed.
+  * @param  sdio rthw_sdio
+  * @retval None
+  */
+static void rthw_sdio_wait_completed(struct rthw_sdio *sdio)
+{
+    rt_uint32_t status;
+    struct rt_mmcsd_cmd *cmd = sdio->pkg->cmd;
+    struct rt_mmcsd_data *data = cmd->data;
+    struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
+
+    if (rt_event_recv(&sdio->event, 0xffffffff, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
+                      rt_tick_from_millisecond(5000), &status) != RT_EOK)
+    {
+        LOG_E("wait cmd completed timeout");
+        cmd->err = -RT_ETIMEOUT;
+        return;
+    }
+
+    if (sdio->pkg == RT_NULL)
+    {
+        return;
+    }
+    
+    cmd->resp[0] = hw_sdio->resp1;
+    cmd->resp[1] = hw_sdio->resp2;
+    cmd->resp[2] = hw_sdio->resp3;
+    cmd->resp[3] = hw_sdio->resp4;
+
+    if (status & SDIO_ERRORS)
+    {
+        if ((status & SDMMC_STA_CCRCFAIL) && (resp_type(cmd) & (RESP_R3 | RESP_R4)))
+        {
+            cmd->err = RT_EOK;
+        }
+        else
+        {
+            cmd->err = -RT_ERROR;
+        }
+        
+        if (status & SDMMC_STA_CTIMEOUT)
+        {
+            cmd->err = -RT_ETIMEOUT;
+        }
+        
+        if (status & SDMMC_STA_DCRCFAIL)
+        {
+            data->err = -RT_ERROR;
+        }
+        
+        if (status & SDMMC_STA_DTIMEOUT)
+        {
+            data->err = -RT_ETIMEOUT;
+        }
+        
+        if (cmd->err == RT_EOK)
+        {
+            LOG_D("sta:0x%08X [%08X %08X %08X %08X]", status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
+        }
+        else
+        {
+            LOG_D("err:0x%08x, %s%s%s%s%s%s%s cmd:%d arg:0x%08x rw:%c len:%d blksize:%d",
+                  status,
+                  status & SDMMC_STA_CCRCFAIL  ? "CCRCFAIL "    : "",
+                  status & SDMMC_STA_DCRCFAIL  ? "DCRCFAIL "    : "",
+                  status & SDMMC_STA_CTIMEOUT  ? "CTIMEOUT "    : "",
+                  status & SDMMC_STA_DTIMEOUT  ? "DTIMEOUT "    : "",
+                  status & SDMMC_STA_TXUNDERR  ? "TXUNDERR "    : "",
+                  status & SDMMC_STA_RXOVERR   ? "RXOVERR "     : "",
+                  status == 0                   ? "NULL"         : "",
+                  cmd->cmd_code,
+                  cmd->arg,
+                  data ? (data->flags & DATA_DIR_WRITE ?  'w' : 'r') : '-',
+                  data ? data->blks * data->blksize : 0,
+                  data ? data->blksize : 0
+                 );
+        }
+        
+    }
+    else
+    {
+        cmd->err = RT_EOK;
+        LOG_D("sta:0x%08X [%08X %08X %08X %08X]", status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
+    }
+}
+
+/**
+  * @brief  This function send command.
+  * @param  sdio rthw_sdio
+  * @param  pkg  sdio package
+  * @retval None
+  */
+static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
+{
+    struct rt_mmcsd_cmd *cmd = pkg->cmd;
+    struct rt_mmcsd_data *data = cmd->data;
+    struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
+    rt_uint32_t reg_cmd;
+    
+    sdio->pkg = pkg;
+
+    LOG_D("CMD:%d ARG:0x%08x RES:%s%s%s%s%s%s%s%s%s rw:%c len:%d blksize:%d\n",
+          cmd->cmd_code,
+          cmd->arg,
+          resp_type(cmd) == RESP_NONE ? "NONE"  : "",
+          resp_type(cmd) == RESP_R1  ? "R1"  : "",
+          resp_type(cmd) == RESP_R1B ? "R1B"  : "",
+          resp_type(cmd) == RESP_R2  ? "R2"  : "",
+          resp_type(cmd) == RESP_R3  ? "R3"  : "",
+          resp_type(cmd) == RESP_R4  ? "R4"  : "",
+          resp_type(cmd) == RESP_R5  ? "R5"  : "",
+          resp_type(cmd) == RESP_R6  ? "R6"  : "",
+          resp_type(cmd) == RESP_R7  ? "R7"  : "",
+          data ? (data->flags & DATA_DIR_WRITE ?  'w' : 'r') : '-',
+          data ? data->blks * data->blksize : 0,
+          data ? data->blksize : 0
+         );
+
+    /* config cmd reg */
+    reg_cmd = cmd->cmd_code | SDMMC_CMD_CPSMEN;
+    if (resp_type(cmd) == RESP_NONE)
+        reg_cmd |= SDMMC_RESPONSE_NO;
+    else if (resp_type(cmd) == RESP_R2)
+        reg_cmd |= SDMMC_RESPONSE_LONG;
+    else
+        reg_cmd |= SDMMC_RESPONSE_SHORT;
+    
+    hw_sdio->mask |= SDIO_MASKR_ALL;
+        
+    /* data pre configuration */
+    if (data != RT_NULL)
+    {
+        hw_sdio->dctrl = 0;
+        hw_sdio->mask &= ~(SDMMC_MASK_CMDRENDIE | SDMMC_MASK_CMDSENTIE);
+        reg_cmd |= SDMMC_CMD_CMDTRANS;
+        hw_sdio->dtimer = HW_SDIO_DATATIMEOUT;
+        hw_sdio->dlen = data->blks * data->blksize;
+        hw_sdio->dctrl = (get_order(data->blksize)<<4) | (data->flags & DATA_DIR_READ ? SDMMC_DCTRL_DTDIR : 0);
+        hw_sdio->idmabase0r = (rt_uint32_t)cache_buf;
+        hw_sdio->idmatrlr = SDMMC_ENABLE_IDMA_SINGLE_BUFF;
+    }
+
+    hw_sdio->arg = cmd->arg;
+    hw_sdio->cmd = reg_cmd;
+    /* wait completed */
+    rthw_sdio_wait_completed(sdio);
+
+    /* Waiting for data to be sent to completion */
+    if (data != RT_NULL)
+    {
+        volatile rt_uint32_t count = SDIO_TX_RX_COMPLETE_TIMEOUT_LOOPS;
+
+        while (count && (hw_sdio->sta & SDMMC_STA_DPSMACT))
+        {
+            count--;
+        }
+        if ((count == 0) || (hw_sdio->sta & SDIO_ERRORS))
+        {
+            cmd->err = -RT_ERROR;
+        }
+    }
+
+    /* close irq, keep sdio irq */
+    hw_sdio->mask = hw_sdio->mask & SDMMC_IT_SDIOIT ? SDMMC_IT_SDIOIT : 0x00;
+    
+    /* data post configuration */
+    if (data != RT_NULL)
+    {
+        if (data->flags & DATA_DIR_READ)
+        {
+            rt_memcpy(data->buf, cache_buf, data->blks * data->blksize);
+        }
+    }
+}
+
+/**
+  * @brief  This function send sdio request.
+  * @param  sdio  rthw_sdio
+  * @param  req   request
+  * @retval None
+  */
+static void rthw_sdio_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
+{
+    struct sdio_pkg pkg;
+    struct rthw_sdio *sdio = host->private_data;
+    struct rt_mmcsd_data *data;
+
+    RTHW_SDIO_LOCK(sdio);
+    
+    if (req->cmd != RT_NULL)
+    {
+        rt_memset(&pkg, 0, sizeof(pkg));
+        data = req->cmd->data;
+        pkg.cmd = req->cmd;
+
+        if (data != RT_NULL)
+        {
+            rt_uint32_t size = data->blks * data->blksize;
+
+            RT_ASSERT(size <= SDIO_BUFF_SIZE);
+
+            if (data->flags & DATA_DIR_WRITE)
+            {
+                rt_memcpy(cache_buf, data->buf, size);
+            }
+        }
+
+        rthw_sdio_send_command(sdio, &pkg);
+    }
+
+    if (req->stop != RT_NULL)
+    {
+        rt_memset(&pkg, 0, sizeof(pkg));
+        pkg.cmd = req->stop;
+        rthw_sdio_send_command(sdio, &pkg);
+    }
+
+    RTHW_SDIO_UNLOCK(sdio);
+    
+    mmcsd_req_complete(sdio->host);
+}
+
+
+/**
+  * @brief  This function interrupt process function.
+  * @param  host  rt_mmcsd_host
+  * @retval None
+  */
+void rthw_sdio_irq_process(struct rt_mmcsd_host *host)
+{
+    struct rthw_sdio *sdio = host->private_data;
+    struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
+    rt_uint32_t intstatus = hw_sdio->sta;
+
+    /* clear irq flag*/
+    hw_sdio->icr = intstatus;
+
+    rt_event_send(&sdio->event, intstatus);
+}
+
+/**
+  * @brief  This function config sdio.
+  * @param  host    rt_mmcsd_host
+  * @param  io_cfg  rt_mmcsd_io_cfg
+  * @retval None
+  */
+static void rthw_sdio_iocfg(struct rt_mmcsd_host *host, struct rt_mmcsd_io_cfg *io_cfg)
+{
+    rt_uint32_t temp, clk_src;
+    rt_uint32_t clk = io_cfg->clock;
+    struct rthw_sdio *sdio = host->private_data;
+    struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
+
+    LOG_D("clk:%dK width:%s%s%s power:%s%s%s",
+          clk/1000,
+          io_cfg->bus_width == MMCSD_BUS_WIDTH_8 ? "8" : "",
+          io_cfg->bus_width == MMCSD_BUS_WIDTH_4 ? "4" : "",
+          io_cfg->bus_width == MMCSD_BUS_WIDTH_1 ? "1" : "",
+          io_cfg->power_mode == MMCSD_POWER_OFF ? "OFF" : "",
+          io_cfg->power_mode == MMCSD_POWER_UP ? "UP" : "",
+          io_cfg->power_mode == MMCSD_POWER_ON ? "ON" : ""
+         );
+
+    RTHW_SDIO_LOCK(sdio);
+    
+    clk_src = SDIO_CLOCK_FREQ;
+
+    if (clk > 0)
+    {
+        if (clk > host->freq_max)
+        {
+            clk = host->freq_max;
+        }
+        temp = DIV_ROUND_UP(clk_src, 2 * clk);
+        if (temp > 0x3FF)
+        {
+            temp = 0x3FF;
+        }
+    }
+
+    if (io_cfg->bus_width == MMCSD_BUS_WIDTH_8)
+    {
+        temp |= SDMMC_BUS_WIDE_8B;
+    }
+    else if (io_cfg->bus_width == MMCSD_BUS_WIDTH_4)
+    {
+        temp |= SDMMC_BUS_WIDE_4B;
+    }
+    else
+    {
+        temp |= SDMMC_BUS_WIDE_1B;
+    }
+
+    hw_sdio->clkcr = temp;
+
+    if (io_cfg->power_mode == MMCSD_POWER_ON)
+        hw_sdio->power |= SDMMC_POWER_PWRCTRL;
+    
+    RTHW_SDIO_UNLOCK(sdio);
+}
+
+static const struct rt_mmcsd_host_ops ops =
+{
+    rthw_sdio_request,
+    rthw_sdio_iocfg,
+    RT_NULL,
+    RT_NULL,
+};
+
+/**
+  * @brief  This function create mmcsd host.
+  * @param  sdio_des stm32_sdio_des
+  * @retval rt_mmcsd_host
+  */
+struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
+{
+    struct rt_mmcsd_host *host;
+    struct rthw_sdio *sdio = RT_NULL;
+
+    if (sdio_des == RT_NULL)
+    {
+        return RT_NULL;
+    }
+
+    sdio = rt_malloc(sizeof(struct rthw_sdio));
+    if (sdio == RT_NULL)
+    {
+        LOG_E("malloc rthw_sdio fail");
+        return RT_NULL;
+    }
+    rt_memset(sdio, 0, sizeof(struct rthw_sdio));
+
+    host = mmcsd_alloc_host();
+    if (host == RT_NULL)
+    {
+        LOG_E("alloc host fail");
+        goto err;
+    }
+
+    rt_memcpy(&sdio->sdio_des, sdio_des, sizeof(struct stm32_sdio_des));
+
+    sdio->sdio_des.hw_sdio = (struct stm32_sdio *)SDIO_BASE_ADDRESS;
+
+    rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
+    rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
+    /* set host default attributes */
+    host->ops = &ops;
+    host->freq_min = 400 * 1000;
+    host->freq_max = SDIO_MAX_FREQ;
+    host->valid_ocr = 0X00FFFF80;/* The voltage range supported is 1.65v-3.6v */
+#ifndef SDIO_USING_1_BIT
+    host->flags = MMCSD_BUSWIDTH_4 | MMCSD_MUTBLKWRITE | MMCSD_SUP_HIGHSPEED;
+#else
+    host->flags = MMCSD_MUTBLKWRITE | MMCSD_SUP_HIGHSPEED;
+#endif
+
+    host->max_seg_size = SDIO_BUFF_SIZE;
+    host->max_dma_segs = 1;
+    host->max_blk_size = 512;
+    host->max_blk_count = 512;
+
+    /* link up host and sdio */
+    sdio->host = host;
+    host->private_data = sdio;
+
+    /* ready to change */
+    mmcsd_change(host);
+
+    return host;
+
+err:
+    if (sdio)
+    {
+        rt_free(sdio);
+    }
+    
+    return RT_NULL;
+}
+
+void SDMMC1_IRQHandler(void)
+{
+    rt_interrupt_enter();
+    /* Process All SDIO Interrupt Sources */
+    rthw_sdio_irq_process(host);
+    
+    rt_interrupt_leave();
+}
+
+int rt_hw_sdio_init(void)
+{
+    struct stm32_sdio_des sdio_des;
+    
+    hsd.Instance = SDMMC1;
+    HAL_SD_MspInit(&hsd);
+
+    host = sdio_host_create(&sdio_des);
+    if (host == RT_NULL)
+    {
+        LOG_E("host create fail");
+        return RT_NULL;
+    }
+    
+    return RT_EOK;
+}
+INIT_DEVICE_EXPORT(rt_hw_sdio_init);
+
+int mnt_init(void)
+{
+    rt_device_t sd = RT_NULL;
+    
+    rt_thread_delay(RT_TICK_PER_SECOND);
+
+    sd = rt_device_find("sd0");
+    if (sd == RT_NULL)
+    {
+        rt_kprintf("can't find sd0 device!\n");
+        return RT_ERROR;
+    }
+    
+    if (dfs_mount("sd0", "/", "elm", 0, 0) != 0)
+    {
+        rt_kprintf("file system mount failed!\n");
+    }
+    else
+    {
+        rt_kprintf("file system mount success!\n");
+    }
+
+    return RT_EOK;
+}
+INIT_ENV_EXPORT(mnt_init);
+
+#endif /* BSP_USING_SDMMC */

+ 117 - 0
bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.h

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2006-2020, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-07-16     thread-liu   first version
+ */
+
+#ifndef __DRV_SDIO_H__
+#define __DRV_SDIO_H__
+
+#include <rtthread.h>
+#include "rtdevice.h"
+#include <rthw.h>
+#include <drv_common.h>
+#include <string.h>
+#include <drivers/mmcsd_core.h>
+#include <drivers/sdio.h>
+
+#define SDIO_BUFF_SIZE       4096
+#define SDIO_ALIGN_LEN       32
+
+#ifndef SDIO_BASE_ADDRESS
+#define SDIO_BASE_ADDRESS    (SDMMC1)
+#endif
+
+#ifndef SDIO_CLOCK_FREQ
+#define SDIO_CLOCK_FREQ      (99U * 1000 * 1000)
+#endif
+
+#ifndef SDIO_BUFF_SIZE
+#define SDIO_BUFF_SIZE       (4096)
+#endif
+
+#ifndef SDIO_ALIGN_LEN
+#define SDIO_ALIGN_LEN       (32)
+#endif
+
+#ifndef SDIO_MAX_FREQ
+#define SDIO_MAX_FREQ        (50 * 1000 * 1000)
+#endif
+
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+
+#define SDMMC_POWER_OFF                      (0x00U)
+#define SDMMC_POWER_UP                       (0x02U)
+#define SDMMC_POWER_ON                       (0x03U)
+
+#define SDIO_ERRORS \
+    (SDMMC_STA_IDMATE | SDMMC_STA_ACKTIMEOUT | \
+     SDMMC_STA_RXOVERR | SDMMC_STA_TXUNDERR | \
+     SDMMC_STA_DTIMEOUT | SDMMC_STA_CTIMEOUT | \
+     SDMMC_STA_DCRCFAIL | SDMMC_STA_CCRCFAIL)
+
+#define SDIO_MASKR_ALL \
+    (SDMMC_MASK_CCRCFAILIE | SDMMC_MASK_DCRCFAILIE | SDMMC_MASK_CTIMEOUTIE | \
+     SDMMC_MASK_TXUNDERRIE | SDMMC_MASK_RXOVERRIE | SDMMC_MASK_CMDRENDIE | \
+     SDMMC_MASK_CMDSENTIE | SDMMC_MASK_DATAENDIE | SDMMC_MASK_ACKTIMEOUTIE)
+
+#define HW_SDIO_DATATIMEOUT                 (0xFFFFFFFFU)
+
+struct stm32_sdio
+{
+    volatile rt_uint32_t power;         /* offset 0x00 */
+    volatile rt_uint32_t clkcr;         /* offset 0x04 */
+    volatile rt_uint32_t arg;           /* offset 0x08 */
+    volatile rt_uint32_t cmd;           /* offset 0x0C */
+    volatile rt_uint32_t respcmd;       /* offset 0x10 */
+    volatile rt_uint32_t resp1;         /* offset 0x14 */
+    volatile rt_uint32_t resp2;         /* offset 0x18 */
+    volatile rt_uint32_t resp3;         /* offset 0x1C */
+    volatile rt_uint32_t resp4;         /* offset 0x20 */
+    volatile rt_uint32_t dtimer;        /* offset 0x24 */
+    volatile rt_uint32_t dlen;          /* offset 0x28 */
+    volatile rt_uint32_t dctrl;         /* offset 0x2C */
+    volatile rt_uint32_t dcount;        /* offset 0x30 */
+    volatile rt_uint32_t sta;           /* offset 0x34 */
+    volatile rt_uint32_t icr;           /* offset 0x38 */
+    volatile rt_uint32_t mask;          /* offset 0x3C */
+    volatile rt_uint32_t acktimer;      /* offset 0x40 */
+    volatile rt_uint32_t reserved0[3];  /* offset 0x44 ~ 0x4C */
+    volatile rt_uint32_t idmatrlr;      /* offset 0x50 */
+    volatile rt_uint32_t idmabsizer;    /* offset 0x54 */
+    volatile rt_uint32_t idmabase0r;    /* offset 0x58 */
+    volatile rt_uint32_t idmabase1r;    /* offset 0x5C */
+    volatile rt_uint32_t reserved1[1];  /* offset 0x60 */
+    volatile rt_uint32_t idmalar;
+    volatile rt_uint32_t idmabar;
+    volatile rt_uint32_t reserved2[5];
+    volatile rt_uint32_t fifo;          
+    volatile rt_uint32_t reserved3[220];
+    volatile rt_uint32_t verr;
+    volatile rt_uint32_t ipidr;
+    volatile rt_uint32_t sidr;
+};
+
+typedef rt_uint32_t (*sdio_clk_get)(struct stm32_sdio *hw_sdio);
+
+struct stm32_sdio_des
+{
+    struct stm32_sdio *hw_sdio;
+    sdio_clk_get clk_get;
+};
+
+/* stm32 sdio dirver class */
+struct stm32_sdio_class
+{
+    struct stm32_sdio_des *des;
+    const struct stm32_sdio_config *cfg;
+    struct rt_mmcsd_host host;
+};
+
+extern void stm32_mmcsd_change(void);
+
+#endif /* __DRV_SDIO_H__ */

+ 1 - 1
bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c

@@ -1949,7 +1949,7 @@ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng)
   /** Initializes the peripherals clock 
   */
     PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RNG2;
-    PeriphClkInit.Rng2ClockSelection = RCC_RNG2CLKSOURCE_CSI;
+    PeriphClkInit.Rng2ClockSelection = RCC_RNG2CLKSOURCE_LSE;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
     {
       Error_Handler();

+ 18 - 14
bsp/thead-smart/.config

@@ -14,7 +14,7 @@ CONFIG_RT_ALIGN_SIZE=4
 CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 CONFIG_RT_THREAD_PRIORITY_MAX=32
-CONFIG_RT_TICK_PER_SECOND=100
+CONFIG_RT_TICK_PER_SECOND=1000
 CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_USING_IDLE_HOOK=y
@@ -54,21 +54,11 @@ CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 CONFIG_RT_VER_NUM=0x40003
-
-#
-# RT-Thread CPU arch and features
-#
-# CONFIG_ARCH_CSKY is not set
-
-#
-# risc-v arch
-#
+# CONFIG_RT_USING_CPU_FFS is not set
 CONFIG_ARCH_RISCV=y
-CONFIG_ARCH_RISCV_32=y
-# CONFIG_ARCH_RISCV_64 is not set
 CONFIG_ARCH_RISCV_FPU=y
 CONFIG_ARCH_RISCV_FPU_S=y
-# CONFIG_ARCH_RISCV_FPU_D is not set
+CONFIG_ARCH_RISCV32=y
 # CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
 
 #
@@ -121,6 +111,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
+# CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_DAC is not set
@@ -196,6 +187,7 @@ CONFIG_RT_USING_PIN=y
 #
 # IoT - internet of things
 #
+# CONFIG_PKG_USING_LORAWAN_DRIVER is not set
 # CONFIG_PKG_USING_PAHOMQTT is not set
 # CONFIG_PKG_USING_UMQTT is not set
 # CONFIG_PKG_USING_WEBCLIENT is not set
@@ -243,7 +235,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_GAGENT_CLOUD is not set
 # CONFIG_PKG_USING_ALI_IOTKIT is not set
 # CONFIG_PKG_USING_AZURE is not set
-# CONFIG_PKG_USING_TENCENT_IOTHUB is not set
+# CONFIG_PKG_USING_TENCENT_IOT_EXPLORER is not set
 # CONFIG_PKG_USING_JIOT-C-SDK is not set
 # CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set
 # CONFIG_PKG_USING_JOYLINK is not set
@@ -265,6 +257,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_CAPNP is not set
 # CONFIG_PKG_USING_RT_CJSON_TOOLS is not set
 # CONFIG_PKG_USING_AGILE_TELNET is not set
+# CONFIG_PKG_USING_NMEALIB is not set
 
 #
 # security packages
@@ -273,6 +266,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_libsodium is not set
 # CONFIG_PKG_USING_TINYCRYPT is not set
 # CONFIG_PKG_USING_TFM is not set
+# CONFIG_PKG_USING_YD_CRYPTO is not set
 
 #
 # language packages
@@ -307,6 +301,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set
 # CONFIG_PKG_USING_LUNAR_CALENDAR is not set
 # CONFIG_PKG_USING_BS8116A is not set
+# CONFIG_PKG_USING_GPS_RMC is not set
 # CONFIG_PKG_USING_URLENCODE is not set
 
 #
@@ -331,6 +326,10 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_SYSWATCH is not set
 # CONFIG_PKG_USING_SYS_LOAD_MONITOR is not set
 # CONFIG_PKG_USING_PLCCORE is not set
+# CONFIG_PKG_USING_RAMDISK is not set
+# CONFIG_PKG_USING_MININI is not set
+# CONFIG_PKG_USING_QBOOT is not set
+# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
 
 #
 # peripheral libraries and drivers
@@ -368,6 +367,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_RPLIDAR is not set
 # CONFIG_PKG_USING_AS608 is not set
 # CONFIG_PKG_USING_RC522 is not set
+# CONFIG_PKG_USING_WS2812B is not set
 # CONFIG_PKG_USING_EMBARC_BSP is not set
 # CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set
 # CONFIG_PKG_USING_MULTI_RTIMER is not set
@@ -377,6 +377,9 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_PMS_SERIES is not set
 # CONFIG_PKG_USING_NUCLEI_SDK is not set
 # CONFIG_PKG_USING_CAN_YMODEM is not set
+# CONFIG_PKG_USING_LORA_RADIO_DRIVER is not set
+# CONFIG_PKG_USING_QLED is not set
+# CONFIG_PKG_USING_PAJ7620 is not set
 
 #
 # miscellaneous packages
@@ -413,5 +416,6 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_PKG_USING_VT100 is not set
 # CONFIG_PKG_USING_ULAPACK is not set
 # CONFIG_PKG_USING_UKAL is not set
+# CONFIG_PKG_USING_CRCLIB is not set
 CONFIG_SOC_THEAD_SMART=y
 CONFIG_RT_USING_UART1=y

+ 2 - 0
bsp/thead-smart/Kconfig

@@ -25,6 +25,8 @@ config SOC_THEAD_SMART
     bool
     select RT_USING_COMPONENTS_INIT
     select RT_USING_USER_MAIN
+    select ARCH_RISCV32
+    select ARCH_RISCV_FPU_S
     default y
 
 if RT_USING_SERIAL

+ 8 - 5
bsp/thead-smart/README.md

@@ -1,8 +1,10 @@
 # T-HEAD SMART-EVB Introduction
 SMART-EVB is a development board provided by T-HEAD, based on FPGA to provide implementation, integrating T-HEAD's RISC-V CPU (eg. E902/E906/C906) and C-SKY CPU (eg. E805/E804/E803/E802 ), integrates basic peripheral resources such as GPIO/TIMER/UART/RAM.
 
-##The main resources on board are as follows:
+## The main resources on board are as follows:
+
 1. SMART-EVB for E906/E906F/E906FD
+
 | res | description |
 | -- | -- |
 |ISA | RISCV |
@@ -12,6 +14,7 @@ SMART-EVB is a development board provided by T-HEAD, based on FPGA to provide im
 
 
 2. SMART-EVB for E804/E804F/E804D
+
 | res | description |
 | -- | -- |
 |ISA | C-SKY |
@@ -22,24 +25,24 @@ SMART-EVB is a development board provided by T-HEAD, based on FPGA to provide im
 
 # Compile T-HEAD BSP
 SMART-EVB BSP supports GCC compiler, the version information is:
+
 1. SMART-EVB for E906/E906F/E906FD
+
 | IDE/Compiler| version|
 | - | - |
 | GCC | gcc version 8.4.0 (C-SKY RISCV Tools V1.9.6 B20200616) |
 
 # run smart-evb bsp
+
 1. Connect JTAG
 2. Connect the serial port
 3. riscv64-unknown-elf-gdb rtthread-e906f.elf
 
 run log as follows:
-```
+```bash
  \ | /
 - RT -     Thread Operating System
  / | \     4.0.3 build Sep  2 2020
  2006 - 2020 Copyright by rt-thread team
 msh >
 ```
-
-
-

+ 1 - 7
bsp/thead-smart/rtconfig.h

@@ -38,16 +38,10 @@
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "uart1"
 #define RT_VER_NUM 0x40003
-
-/* RT-Thread CPU arch and features */
-
-
-/* risc-v arch */
-
 #define ARCH_RISCV
-#define ARCH_RISCV_32
 #define ARCH_RISCV_FPU
 #define ARCH_RISCV_FPU_S
+#define ARCH_RISCV32
 
 /* RT-Thread Components */
 

+ 1 - 1
components/dfs/filesystems/devfs/devfs.c

@@ -326,7 +326,7 @@ static const struct dfs_filesystem_ops _device_fs =
 
 int devfs_init(void)
 {
-    /* register rom file system */
+    /* register device file system */
     dfs_register(&_device_fs);
 
     return 0;

+ 1 - 1
components/dfs/filesystems/romfs/dfs_romfs.c

@@ -62,7 +62,7 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch
         return root_dirent;
     }
 
-    /* goto root directy entries */
+    /* goto root directory entries */
     dirent = (struct romfs_dirent *)root_dirent->data;
     dirent_size = root_dirent->size;
 

+ 2 - 0
components/drivers/include/drivers/alarm.h

@@ -49,6 +49,8 @@ struct rt_alarm
     rt_uint32_t flag;
     rt_alarm_callback_t callback;
     struct tm wktime;
+
+    void *user_data;
 };
 
 struct rt_alarm_setup

+ 1 - 0
components/drivers/include/ipc/ringbuffer.h

@@ -71,6 +71,7 @@ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, const rt_uint8_t *pt
 rt_size_t rt_ringbuffer_putchar(struct rt_ringbuffer *rb, const rt_uint8_t ch);
 rt_size_t rt_ringbuffer_putchar_force(struct rt_ringbuffer *rb, const rt_uint8_t ch);
 rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb, rt_uint8_t *ptr, rt_uint16_t length);
+rt_size_t rt_ringbuffer_peak(struct rt_ringbuffer *rb, rt_uint8_t **ptr);
 rt_size_t rt_ringbuffer_getchar(struct rt_ringbuffer *rb, rt_uint8_t *ch);
 rt_size_t rt_ringbuffer_data_len(struct rt_ringbuffer *rb);
 

+ 80 - 14
components/drivers/rtc/alarm.c

@@ -14,8 +14,16 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+
 #define RT_RTC_YEARS_MAX         137
+#ifdef RT_USING_SOFT_RTC
+#define RT_ALARM_DELAY             0
+#else
 #define RT_ALARM_DELAY             2
+#endif
 #define RT_ALARM_STATE_INITED   0x02
 #define RT_ALARM_STATE_START    0x01
 #define RT_ALARM_STATE_STOP     0x00
@@ -41,10 +49,12 @@ static rt_err_t alarm_set(struct rt_alarm *alarm)
     rt_err_t ret;
 
     device = rt_device_find("rtc");
+
     if (device == RT_NULL)
     {
         return (RT_ERROR);
     }
+
     if (alarm->flag & RT_ALARM_STATE_START)
         wkalarm.enable = RT_TRUE;
     else
@@ -215,7 +225,11 @@ static void alarm_update(rt_uint32_t event)
     {
         /* get time of now */
         timestamp = time(RT_NULL);
-        localtime_r(&timestamp, &now);
+#ifdef _WIN32
+        _gmtime32_s(&now, &timestamp);
+#else
+        gmtime_r(&timestamp, &now);
+#endif
 
         for (next = _container.head.next; next != &_container.head; next = next->next)
         {
@@ -225,7 +239,11 @@ static void alarm_update(rt_uint32_t event)
         }
 
         timestamp = time(RT_NULL);
-        localtime_r(&timestamp, &now);
+#ifdef _WIN32
+        _gmtime32_s(&now, &timestamp);
+#else
+        gmtime_r(&timestamp, &now);
+#endif
         sec_now = alarm_mkdaysec(&now);
 
         for (next = _container.head.next; next != &_container.head; next = next->next)
@@ -233,7 +251,6 @@ static void alarm_update(rt_uint32_t event)
             alarm = rt_list_entry(next, struct rt_alarm, list);
             /* calculate seconds from 00:00:00 */
             sec_alarm = alarm_mkdaysec(&alarm->wktime);
-
             if (alarm->flag & RT_ALARM_STATE_START)
             {
                 sec_tmp = sec_alarm - sec_now;
@@ -257,6 +274,7 @@ static void alarm_update(rt_uint32_t event)
                 }
             }
         }
+
         /* enable the alarm after now first */
         if (sec_next < 24 * 3600)
         {
@@ -329,7 +347,12 @@ static rt_err_t alarm_setup(rt_alarm_t alarm, struct tm *wktime)
     setup = &alarm->wktime;
     *setup = *wktime;
     timestamp = time(RT_NULL);
-    localtime_r(&timestamp, &now);
+
+#ifdef _WIN32
+    _gmtime32_s(&now, &timestamp);
+#else
+    gmtime_r(&timestamp, &now);
+#endif
 
     /* if these are a "don't care" value,we set them to now*/
     if ((setup->tm_sec > 59) || (setup->tm_sec < 0))
@@ -526,21 +549,28 @@ rt_err_t rt_alarm_control(rt_alarm_t alarm, int cmd, void *arg)
 rt_err_t rt_alarm_start(rt_alarm_t alarm)
 {
     rt_int32_t sec_now, sec_old, sec_new;
-    rt_err_t ret = RT_ERROR;
+    rt_err_t ret = RT_EOK;
     time_t timestamp;
     struct tm now;
 
     if (alarm == RT_NULL)
-        return (ret);
+        return (RT_ERROR);
     rt_mutex_take(&_container.mutex, RT_WAITING_FOREVER);
 
     if (!(alarm->flag & RT_ALARM_STATE_START))
     {
         if (alarm_setup(alarm, &alarm->wktime) != RT_EOK)
+        {
+            ret = RT_ERROR;
             goto _exit;
+        }
 
         timestamp = time(RT_NULL);
-        localtime_r(&timestamp, &now);
+#ifdef _WIN32
+        _gmtime32_s(&now, &timestamp);
+#else
+        gmtime_r(&timestamp, &now);
+#endif
 
         alarm->flag |= RT_ALARM_STATE_START;
 
@@ -593,10 +623,10 @@ _exit:
  */
 rt_err_t rt_alarm_stop(rt_alarm_t alarm)
 {
-    rt_err_t ret = RT_ERROR;
+    rt_err_t ret = RT_EOK;
 
     if (alarm == RT_NULL)
-        return (ret);
+        return (RT_ERROR);
     rt_mutex_take(&_container.mutex, RT_WAITING_FOREVER);
     if (!(alarm->flag & RT_ALARM_STATE_START))
         goto _exit;
@@ -695,23 +725,59 @@ static void rt_alarmsvc_thread_init(void *param)
     }
 }
 
+struct _alarm_flag
+{
+    const char* name;
+    rt_uint32_t flag;
+};
+
+static const struct _alarm_flag _alarm_flag_tbl[] =
+{
+    {"N",        0xffff}, /* none */
+    {"O",       RT_ALARM_ONESHOT}, /* only alarm onece */
+    {"D",       RT_ALARM_DAILY}, /* alarm everyday */
+    {"W",       RT_ALARM_WEEKLY}, /* alarm weekly at Monday or Friday etc. */
+    {"Mo",      RT_ALARM_MONTHLY}, /* alarm monthly at someday */
+    {"Y",       RT_ALARM_YAERLY}, /* alarm yearly at a certain date */
+    {"H",       RT_ALARM_HOUR}, /* alarm each hour at a certain min:second */
+    {"M",       RT_ALARM_MINUTE}, /* alarm each minute at a certain second */
+    {"S",       RT_ALARM_SECOND}, /* alarm each second */
+};
+
+static rt_uint8_t _alarm_flag_tbl_size = sizeof(_alarm_flag_tbl) / sizeof(_alarm_flag_tbl[0]);
+
+static rt_uint8_t get_alarm_flag_index(rt_uint32_t alarm_flag)
+{
+    for (rt_uint8_t index = 0; index < _alarm_flag_tbl_size; index++)
+    {
+        alarm_flag &= 0xff00;
+        if (alarm_flag == _alarm_flag_tbl[index].flag)
+        {
+            return index;
+        }
+    }
+
+    return 0;
+}
+
 void rt_alarm_dump(void)
 {
     rt_list_t *next;
     rt_alarm_t alarm;
     rt_uint8_t index = 0;
 
-    rt_kprintf("| alarm_id | YYYY-MM-DD hh:mm:ss | weekday |  flags  |\n");
-    rt_kprintf("+----------+---------------------+---------+---------+\n");
+    rt_kprintf("| id | YYYY-MM-DD hh:mm:ss | week | flag | en |\n");
+    rt_kprintf("+----+---------------------+------+------+----+\n");
     for (next = _container.head.next; next != &_container.head; next = next->next)
     {
         alarm = rt_list_entry(next, struct rt_alarm, list);
-        rt_kprintf("| No %5d | %04d-%02d-%02d %02d:%02d:%02d | %7d |  0x%04x |\n",
+        rt_uint8_t flag_index = get_alarm_flag_index(alarm->flag);
+        rt_kprintf("| %2d | %04d-%02d-%02d %02d:%02d:%02d |  %2d  |  %2s  | %2d |\n",
             index++, alarm->wktime.tm_year + 1900, alarm->wktime.tm_mon + 1, alarm->wktime.tm_mday,
             alarm->wktime.tm_hour, alarm->wktime.tm_min, alarm->wktime.tm_sec,
-            alarm->wktime.tm_wday, alarm->flag);
+            alarm->wktime.tm_wday, _alarm_flag_tbl[flag_index].name, alarm->flag & RT_ALARM_STATE_START);
     }
-    rt_kprintf("+----------+---------------------+---------+---------+\n");
+    rt_kprintf("+----+---------------------+------+------+----+\n");
 }
 
 FINSH_FUNCTION_EXPORT_ALIAS(rt_alarm_dump, __cmd_alarm_dump, dump alarm info);

+ 55 - 8
components/drivers/rtc/soft_rtc.c

@@ -11,8 +11,7 @@
 #include <time.h>
 #include <string.h>
 #include <rtthread.h>
-
-#include <drivers/rtc.h>
+#include <rtdevice.h>
 
 #ifdef RT_USING_SOFT_RTC
 
@@ -28,9 +27,37 @@ static struct rt_device soft_rtc_dev;
 static rt_tick_t init_tick;
 static time_t init_time;
 
+#ifdef RT_USING_ALARM
+
+static struct rt_rtc_wkalarm wkalarm;
+static struct rt_timer alarm_time;
+
+static void alarm_timeout(void *param)
+{
+    rt_alarm_update(param, 1);
+}
+
+static void soft_rtc_alarm_update(struct rt_rtc_wkalarm *palarm)
+{
+    rt_tick_t next_tick;
+
+    if (palarm->enable)
+    {
+        next_tick = RT_TICK_PER_SECOND;
+        rt_timer_control(&alarm_time, RT_TIMER_CTRL_SET_TIME, &next_tick);
+        rt_timer_start(&alarm_time);
+    }
+    else
+    {
+        rt_timer_stop(&alarm_time);
+    }
+}
+
+#endif
+
 static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
 {
-    time_t *time;
+    time_t *t;
     struct tm time_temp;
 
     RT_ASSERT(dev != RT_NULL);
@@ -39,16 +66,27 @@ static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
     switch (cmd)
     {
     case RT_DEVICE_CTRL_RTC_GET_TIME:
-        time = (time_t *) args;
-        *time = init_time + (rt_tick_get() - init_tick) / RT_TICK_PER_SECOND;
+        t = (time_t *) args;
+        *t = init_time + (rt_tick_get() - init_tick) / RT_TICK_PER_SECOND;
         break;
-
     case RT_DEVICE_CTRL_RTC_SET_TIME:
     {
-        time = (time_t *) args;
-        init_time = *time - (rt_tick_get() - init_tick) / RT_TICK_PER_SECOND;
+        t = (time_t *) args;
+        init_time = *t - (rt_tick_get() - init_tick) / RT_TICK_PER_SECOND;
+#ifdef RT_USING_ALARM
+        soft_rtc_alarm_update(&wkalarm);
+#endif
         break;
     }
+#ifdef RT_USING_ALARM
+    case RT_DEVICE_CTRL_RTC_GET_ALARM:
+        *((struct rt_rtc_wkalarm *)args) = wkalarm;
+        break;
+    case RT_DEVICE_CTRL_RTC_SET_ALARM:
+        wkalarm = *((struct rt_rtc_wkalarm *)args);
+        soft_rtc_alarm_update(&wkalarm);
+        break;
+#endif
     }
 
     return RT_EOK;
@@ -78,6 +116,15 @@ int rt_soft_rtc_init(void)
     /* make sure only one 'rtc' device */
     RT_ASSERT(!rt_device_find("rtc"));
 
+#ifdef RT_USING_ALARM
+    rt_timer_init(&alarm_time,
+                  "alarm",
+                  alarm_timeout,
+                  &soft_rtc_dev,
+                  0,
+                  RT_TIMER_FLAG_SOFT_TIMER|RT_TIMER_FLAG_ONE_SHOT);
+#endif
+
     init_tick = rt_tick_get();
     init_time = mktime(&time_new);
 

+ 3 - 3
components/drivers/sdio/sdio.c

@@ -892,9 +892,9 @@ static rt_int32_t sdio_init_card(struct rt_mmcsd_host *host, rt_uint32_t ocr)
 
     if (card->flags & CARD_FLAG_HIGHSPEED) 
     {
-        mmcsd_set_clock(host, 50000000);
-    } 
-    else 
+        mmcsd_set_clock(host, card->host->freq_max > 50000000 ? 50000000 : card->host->freq_max);
+    }
+    else
     {
         mmcsd_set_clock(host, card->cis.max_tran_speed);
     }

+ 4 - 1
components/drivers/serial/serial.c

@@ -221,7 +221,10 @@ rt_inline int _serial_poll_rx(struct rt_serial_device *serial, rt_uint8_t *data,
         *data = ch;
         data ++; length --;
 
-        if (ch == '\n') break;
+        if(serial->parent.open_flag & RT_DEVICE_FLAG_STREAM)
+        {
+            if (ch == '\n') break;
+        }
     }
 
     return size - length;

+ 34 - 0
components/drivers/src/ringbuffer.c

@@ -193,6 +193,40 @@ rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb,
 }
 RTM_EXPORT(rt_ringbuffer_get);
 
+/**
+ *  peak data from ring buffer
+ */
+rt_size_t rt_ringbuffer_peak(struct rt_ringbuffer *rb, rt_uint8_t **ptr)
+{
+    RT_ASSERT(rb != RT_NULL);
+
+    *ptr = RT_NULL;
+
+    /* whether has enough data  */
+    rt_size_t size = rt_ringbuffer_data_len(rb);
+
+    /* no data */
+    if (size == 0)
+        return 0;
+
+    *ptr = &rb->buffer_ptr[rb->read_index];
+
+    if(rb->buffer_size - rb->read_index > size)
+    {
+        rb->read_index += size;
+        return size;
+    }
+
+    size = rb->buffer_size - rb->read_index;
+
+    /* we are going into the other side of the mirror */
+    rb->read_mirror = ~rb->read_mirror;
+    rb->read_index = 0;
+
+    return size;
+}
+RTM_EXPORT(rt_ringbuffer_peak);
+
 /**
  * put a character into ring buffer
  */

+ 1 - 1
components/drivers/src/workqueue.c

@@ -424,6 +424,6 @@ int rt_work_sys_workqueue_init(void)
     return RT_EOK;
 }
 
-INIT_DEVICE_EXPORT(rt_work_sys_workqueue_init);
+INIT_PREV_EXPORT(rt_work_sys_workqueue_init);
 #endif
 #endif

+ 2 - 0
components/libc/compilers/common/termios.h

@@ -9,6 +9,8 @@
 #ifndef _TERMIOS_H__
 #define _TERMIOS_H__
 
+#include <rtconfig.h>
+
 #ifdef RT_USING_POSIX_TERMIOS
 #include <sys/types.h>
 #include <posix_termios.h>

+ 2 - 2
libcpu/risc-v/common/context_gcc.S

@@ -48,7 +48,7 @@ rt_hw_context_switch_to:
 
 #ifdef RT_USING_SMP
     mv   a0,   a1
-    jal  rt_cpus_lock_status_restore
+    call  rt_cpus_lock_status_restore
 #endif
     LOAD a0,   2 * REGBYTES(sp)
     csrw mstatus, a0
@@ -161,7 +161,7 @@ save_mpie:
 
 #ifdef RT_USING_SMP
     mv   a0,   a2
-    jal  rt_cpus_lock_status_restore
+    call  rt_cpus_lock_status_restore
 #endif /*RT_USING_SMP*/
 
     j rt_hw_context_switch_exit

+ 2 - 2
libcpu/risc-v/k210/interrupt_gcc.S

@@ -119,7 +119,7 @@ trap_entry:
     mv  sp, s0
     mv  a0, s0
     call rt_scheduler_do_irq_switch
-    j   rt_hw_context_switch_exit
+    tail   rt_hw_context_switch_exit
 
 #else
 
@@ -143,4 +143,4 @@ trap_entry:
 #endif
 
 spurious_interrupt:
-    j rt_hw_context_switch_exit
+    tail rt_hw_context_switch_exit

+ 5 - 2
libcpu/risc-v/k210/startup_gcc.S

@@ -116,18 +116,21 @@ _start:
 
   /* other cpu core, jump to cpu entry directly */
   bnez a0, secondary_cpu_entry
-  j primary_cpu_entry
+  tail primary_cpu_entry
 
 secondary_cpu_entry:
 #ifdef RT_USING_SMP
   la a0, secondary_boot_flag
   ld a0, 0(a0)
   li a1, 0xa55a
-  beq a0, a1, secondary_cpu_c_start
+  beq a0, a1, 1f
 #endif
   j secondary_cpu_entry
 
 #ifdef RT_USING_SMP
+1:
+  tail secondary_cpu_c_start
+
 .data
 .global secondary_boot_flag
 .align 3

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini