From 29760bc1ead5758af5c0f02aa82ac3cb75878a85 Mon Sep 17 00:00:00 2001
From: vrepetenko <none@example.com>
Date: Wed, 10 Nov 2021 11:25:06 +0000
Subject: [PATCH] STM32WL: updated to new SPI driver version.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15048 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 os/hal/ports/STM32/STM32WLxx/hal_lld.h      |  5 +++++
 os/hal/ports/STM32/STM32WLxx/platform.mk    |  2 +-
 os/hal/ports/STM32/STM32WLxx/platform_v2.mk |  2 +-
 testhal/STM32/STM32WLxx/SPI/main.c          | 12 ++++++------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/os/hal/ports/STM32/STM32WLxx/hal_lld.h b/os/hal/ports/STM32/STM32WLxx/hal_lld.h
index eba3933bf..8c94e2020 100644
--- a/os/hal/ports/STM32/STM32WLxx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32WLxx/hal_lld.h
@@ -41,6 +41,11 @@
 /* Driver constants.                                                         */
 /*===========================================================================*/
 
+/**
+ * @brief   Requires use of SPIv2 driver model.
+ */
+#define HAL_LLD_SELECT_SPI_V2           TRUE
+
 /**
  * @name    Platform identification
  * @{
diff --git a/os/hal/ports/STM32/STM32WLxx/platform.mk b/os/hal/ports/STM32/STM32WLxx/platform.mk
index 4a4f885c5..20f455866 100644
--- a/os/hal/ports/STM32/STM32WLxx/platform.mk
+++ b/os/hal/ports/STM32/STM32WLxx/platform.mk
@@ -35,7 +35,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/RCCv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/RNGv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv3/driver.mk
-include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/driver.mk
+include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/driver_v2.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/SYSTICKv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2/driver.mk
diff --git a/os/hal/ports/STM32/STM32WLxx/platform_v2.mk b/os/hal/ports/STM32/STM32WLxx/platform_v2.mk
index 55f41b842..037c1650f 100644
--- a/os/hal/ports/STM32/STM32WLxx/platform_v2.mk
+++ b/os/hal/ports/STM32/STM32WLxx/platform_v2.mk
@@ -35,7 +35,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/RCCv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/RNGv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv3/driver.mk
-include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/driver.mk
+include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/driver_v2.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/SYSTICKv2/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2/driver.mk
diff --git a/testhal/STM32/STM32WLxx/SPI/main.c b/testhal/STM32/STM32WLxx/SPI/main.c
index 7a7bebba9..0abfb059a 100644
--- a/testhal/STM32/STM32WLxx/SPI/main.c
+++ b/testhal/STM32/STM32WLxx/SPI/main.c
@@ -31,12 +31,12 @@
  * SPI3(SUBGHZSPI) configuration (12MHz, CPHA=0, CPOL=0, MSb first).
  */
 static const SPIConfig spicfg = {
-  false,
-  NULL,
-  NULL,
-  0,
-  SPI_CR1_BR_0,
-  0
+  .circular = false,
+  .slave    = false,
+  .data_cb  = NULL,
+  .error_cb = NULL,
+  .cr1      = (SPI_CR1_BR_0),
+  .cr2      = (0U)
 };
 
 void radioReset(void) {