Adds intermediate changes with cleanup

Author: rosahay-silabs

examples/platform/silabs/display/demo-ui.c

@@ -109,11 +109,11 @@ void demoUIDisplayHeader(char * name)
         GLIB_drawStringOnLine(&glibContext, name, 5, GLIB_ALIGN_CENTER, 0, 0, true);
     }
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    pre_lcd_spi_transfer();
+    sl_wfx_host_pre_lcd_spi_transfer();
 #endif
     DMD_updateDisplay();
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    post_lcd_spi_transfer();
+    sl_wfx_host_post_lcd_spi_transfer();
 #endif
 }
 
@@ -122,11 +122,11 @@ void demoUIDisplayApp(bool on)
     GLIB_drawBitmap(&glibContext, APP_X_POSITION, APP_Y_POSITION, APP_BITMAP_WIDTH, APP_BITMAP_HEIGHT,
                     (on ? OnStateBitMap : OffStateBitMap));
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    pre_lcd_spi_transfer();
+    sl_wfx_host_pre_lcd_spi_transfer();
 #endif
     DMD_updateDisplay();
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    post_lcd_spi_transfer();
+    sl_wfx_host_post_lcd_spi_transfer();
 #endif
 }
 
@@ -139,11 +139,11 @@ void demoUIDisplayProtocol(demoUIProtocol protocol, bool isConnected)
                     (protocol == DEMO_UI_PROTOCOL1 ? (isConnected ? PROT1_BITMAP_CONN : PROT1_BITMAP)
                                                    : (isConnected ? PROT2_BITMAP_CONN : PROT2_BITMAP)));
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    pre_lcd_spi_transfer();
+    sl_wfx_host_pre_lcd_spi_transfer();
 #endif
     DMD_updateDisplay();
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    post_lcd_spi_transfer();
+    sl_wfx_host_post_lcd_spi_transfer();
 #endif
 }
 

examples/platform/silabs/display/lcd.cpp

@@ -71,12 +71,6 @@ CHIP_ERROR SilabsLCD::Init(uint8_t * name, bool initialState)
         err = CHIP_ERROR_INTERNAL;
     }
 
-#if (defined(EFR32MG24) && defined(RS911X_WIFI))
-    if (pr_type != LCD)
-    {
-        pr_type = LCD;
-    }
-#endif
     /* Initialize the DMD module for the DISPLAY device driver. */
     status = DMD_init(0);
     if (DMD_OK != status)
@@ -128,11 +122,11 @@ int SilabsLCD::Update(void)
 {
     int status;
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    pre_lcd_spi_transfer();
+    sl_wfx_host_pre_lcd_spi_transfer();
 #endif
     status = DMD_updateDisplay();
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    post_lcd_spi_transfer();
+    sl_wfx_host_post_lcd_spi_transfer();
 #endif
     /*
      * TO-DO; Above logic can be optimised by writing a common API
@@ -201,12 +195,12 @@ void SilabsLCD::WriteQRCode()
         }
     }
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    pre_lcd_spi_transfer();
+    sl_wfx_host_pre_lcd_spi_transfer();
 #endif
 
     DMD_updateDisplay();
 #if (defined(EFR32MG24) && defined(SL_WIFI))
-    post_lcd_spi_transfer();
+    sl_wfx_host_post_lcd_spi_transfer();
 #endif
 }
 

examples/platform/silabs/efr32/rs911x/hal/efx_spi.c

@@ -36,8 +36,10 @@
 #endif
 #include "spidrv.h"
 
+#include "btl_interface.h"
 #include "gpiointerrupt.h"
 #include "sl_device_init_clocks.h"
+#include "sl_memlcd.h"
 #include "sl_status.h"
 
 #include "FreeRTOS.h"
@@ -56,29 +58,26 @@
 #include "sl_power_manager.h"
 #endif
 
+#define CONCAT(A, B) (A##B)
+#define SPI_CLOCK(N) CONCAT(cmuClock_USART, N)
+
+StaticSemaphore_t spi_sem_peripheral;
+SemaphoreHandle_t spi_sem_sync_hdl;
+
 StaticSemaphore_t xEfxSpiIntfSemaBuffer;
 static SemaphoreHandle_t spiTransferLock;
 static TaskHandle_t spiInitiatorTaskHandle = NULL;
 
 #if defined(EFR32MG12)
 #include "sl_spidrv_exp_config.h"
 extern SPIDRV_Handle_t sl_spidrv_exp_handle;
-#define SPI_HANDLE sl_spidrv_exp_handle
+#define SL_SPIDRV_HANDLE sl_spidrv_exp_handle
 #elif defined(EFR32MG24)
-#include "sl_spidrv_eusart_exp_config.h"
 #include "spi_multiplex.h"
-StaticSemaphore_t spi_sem_peripharal;
-SemaphoreHandle_t spi_sem_sync_hdl;
-peripheraltype_t pr_type = EXP_HDR;
-extern SPIDRV_Handle_t sl_spidrv_eusart_exp_handle;
-#define SPI_HANDLE sl_spidrv_eusart_exp_handle
 #else
 #error "Unknown platform"
 #endif
 
-static unsigned int tx_dma_channel;
-static unsigned int rx_dma_channel;
-
 extern void rsi_gpio_irq_cb(uint8_t irqnum);
 // #define RS911X_USE_LDMA
 
@@ -152,9 +151,9 @@ void rsi_hal_board_init(void)
     xSemaphoreGive(spiTransferLock);
 
 #if defined(EFR32MG24)
-    spi_sem_sync_hdl = xSemaphoreCreateBinaryStatic(&spi_sem_peripharal);
+    spi_sem_sync_hdl = xSemaphoreCreateBinaryStatic(&spi_sem_peripheral);
     xSemaphoreGive(spi_sem_sync_hdl);
-#endif
+#endif /* EFR32MG24 */
 
     /* GPIO INIT of MG12 & MG24 : Reset, Wakeup, Interrupt */
     SILABS_LOG("RSI_HAL: init GPIO");
@@ -167,32 +166,75 @@ void rsi_hal_board_init(void)
 }
 
 #if defined(EFR32MG24)
-/****************************************************************************
- * @fn  sl_status_t sl_wfx_host_spi_cs_assert()
- * @brief
- *     Assert chip select.
- * @param[in] None
- * @return returns SL_STATUS_OK
- *****************************************************************************/
 sl_status_t sl_wfx_host_spi_cs_assert()
 {
+    configASSERT(spi_sem_sync_hdl);
+    if (xSemaphoreTake(spi_sem_sync_hdl, portMAX_DELAY) != pdTRUE)
+    {
+        return SL_STATUS_TIMEOUT;
+    }
+    SPIDRV_DeInit(SL_SPIDRV_HANDLE);
+    SPIDRV_Init(SL_SPIDRV_HANDLE, &sl_spidrv_eusart_init_exp);
     GPIO_PinOutClear(SL_SPIDRV_EUSART_EXP_CS_PORT, SL_SPIDRV_EUSART_EXP_CS_PIN);
     return SL_STATUS_OK;
 }
 
-/****************************************************************************
- * @fn  sl_status_t sl_wfx_host_spi_cs_deassert()
- * @brief
- *     De-Assert chip select.
- * @param[in] None
- * @return returns SL_STATUS_OK
- *****************************************************************************/
 sl_status_t sl_wfx_host_spi_cs_deassert()
 {
     GPIO_PinOutSet(SL_SPIDRV_EUSART_EXP_CS_PORT, SL_SPIDRV_EUSART_EXP_CS_PIN);
+    SPIDRV_DeInit(SL_SPIDRV_HANDLE);
+    GPIO->EUSARTROUTE[SL_SPIDRV_EUSART_EXP_PERIPHERAL_NO].ROUTEEN = 0;
+    xSemaphoreGive(spi_sem_sync_hdl);
     return SL_STATUS_OK;
 }
-#endif
+
+void sl_wfx_host_spiflash_cs_assert(void)
+{
+    GPIO_PinOutClear(SL_MX25_FLASH_SHUTDOWN_CS_PORT, SL_MX25_FLASH_SHUTDOWN_CS_PIN);
+}
+
+void sl_wfx_host_spiflash_cs_deassert(void)
+{
+    GPIO_PinOutSet(SL_MX25_FLASH_SHUTDOWN_CS_PORT, SL_MX25_FLASH_SHUTDOWN_CS_PIN);
+}
+
+void sl_wfx_host_pre_bootloader_spi_transfer(void)
+{
+    if (xSemaphoreTake(spi_sem_sync_hdl, portMAX_DELAY) != pdTRUE)
+    {
+        return;
+    }
+    bootloader_init();
+    sl_wfx_host_spiflash_cs_assert();
+}
+
+void sl_wfx_host_post_bootloader_spi_transfer(void)
+{
+    bootloader_deinit();
+    GPIO->USARTROUTE[0].ROUTEEN = 0;
+    sl_wfx_host_spiflash_cs_deassert();
+    xSemaphoreGive(spi_sem_sync_hdl);
+}
+
+void sl_wfx_host_pre_lcd_spi_transfer(void)
+{
+    if (xSemaphoreTake(spi_sem_sync_hdl, portMAX_DELAY) != pdTRUE)
+    {
+        return;
+    }
+    SPIDRV_ReInit(SL_BIT_RATE_LCD);
+    sl_memlcd_refresh(sl_memlcd_get());
+}
+
+void sl_wfx_host_post_lcd_spi_transfer(void)
+{
+    USART_Enable(SL_MEMLCD_SPI_PERIPHERAL, usartDisable);
+    CMU_ClockEnable(SPI_CLOCK(SL_MEMLCD_SPI_PERIPHERAL_NO), false);
+    GPIO->USARTROUTE[SL_MEMLCD_SPI_PERIPHERAL_NO].ROUTEEN = 0;
+    xSemaphoreGive(spi_sem_sync_hdl);
+}
+
+#endif /* EFR32MG24 */
 
 /*****************************************************************************
  *@brief
@@ -215,16 +257,6 @@ static void spi_dmaTransfertComplete(SPIDRV_HandleData_t * pxHandle, Ecode_t tra
     portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
 }
 
-#if defined(EFR32MG24)
-void rsi_update_spi(void)
-{
-    spi_switch(EXP_HDR);
-    // GPIO_PinModeSet(SL_SPIDRV_EUSART_EXP_CS_PORT, SL_SPIDRV_EUSART_EXP_CS_PIN, gpioModePushPull, PINOUT_SET);
-    /* MG24 + rs9116 combination uses EUSART driver */
-    tx_dma_channel = sl_spidrv_eusart_exp_handle->txDMACh;
-    rx_dma_channel = sl_spidrv_eusart_exp_handle->rxDMACh;
-}
-#endif
 /*********************************************************************
  * @fn   int16_t rsi_spi_transfer(uint8_t *tx_buf, uint8_t *rx_buf, uint16_t xlen, uint8_t mode)
  * @brief
@@ -239,19 +271,10 @@ void rsi_update_spi(void)
 int16_t rsi_spi_transfer(uint8_t * tx_buf, uint8_t * rx_buf, uint16_t xlen, uint8_t mode)
 {
 #if defined(EFR32MG24)
-    /* In case of MG24, take multiplex synchronization semaphore  to ensure SPI is
-     * available and then set CS of Exp Hdr SPI to low/enable */
-    if (xSemaphoreTake(spi_sem_sync_hdl, portMAX_DELAY) != pdTRUE)
-    {
-        return SL_STATUS_TIMEOUT;
-    }
-    if (pr_type != EXP_HDR)
-    {
-        rsi_update_spi();
-    }
-    GPIO_PinOutClear(SL_SPIDRV_EUSART_EXP_CS_PORT, SL_SPIDRV_EUSART_EXP_CS_PIN);
-#endif
-    if (xlen <= MIN_XLEN || (tx_buf == NULL && rx_buf == NULL)) // at least one buffer needs to be provided
+    sl_wfx_host_spi_cs_assert();
+#endif /* EFR32MG24 */
+    // at least one buffer needs to be provided
+    if (xlen <= MIN_XLEN || (tx_buf == NULL && rx_buf == NULL))
     {
         return RSI_ERROR_INVALID_PARAM;
     }
@@ -264,21 +287,22 @@ int16_t rsi_spi_transfer(uint8_t * tx_buf, uint8_t * rx_buf, uint16_t xlen, uint
         return RSI_ERROR_SPI_BUSY;
     }
 
-    configASSERT(spiInitiatorTaskHandle == NULL); // No other task should currently be waiting for the dma completion
+    // No other task should currently be waiting for the dma completion
+    configASSERT(spiInitiatorTaskHandle == NULL);
     spiInitiatorTaskHandle = xTaskGetCurrentTaskHandle();
 
     Ecode_t spiError;
     if (tx_buf == NULL) // Rx operation only
     {
-        spiError = SPIDRV_MReceive(SPI_HANDLE, rx_buf, xlen, spi_dmaTransfertComplete);
+        spiError = SPIDRV_MReceive(SL_SPIDRV_HANDLE, rx_buf, xlen, spi_dmaTransfertComplete);
     }
     else if (rx_buf == NULL) // Tx operation only
     {
-        spiError = SPIDRV_MTransmit(SPI_HANDLE, tx_buf, xlen, spi_dmaTransfertComplete);
+        spiError = SPIDRV_MTransmit(SL_SPIDRV_HANDLE, tx_buf, xlen, spi_dmaTransfertComplete);
     }
     else // Tx and Rx operation
     {
-        spiError = SPIDRV_MTransfer(SPI_HANDLE, tx_buf, rx_buf, xlen, spi_dmaTransfertComplete);
+        spiError = SPIDRV_MTransfer(SL_SPIDRV_HANDLE, tx_buf, rx_buf, xlen, spi_dmaTransfertComplete);
     }
 
     if (spiError == ECODE_EMDRV_SPIDRV_OK)
@@ -290,11 +314,11 @@ int16_t rsi_spi_transfer(uint8_t * tx_buf, uint8_t * rx_buf, uint16_t xlen, uint
         {
             int itemsTransferred = 0;
             int itemsRemaining   = 0;
-            SPIDRV_GetTransferStatus(SPI_HANDLE, &itemsTransferred, &itemsRemaining);
+            SPIDRV_GetTransferStatus(SL_SPIDRV_HANDLE, &itemsTransferred, &itemsRemaining);
             SILABS_LOG("SPI transfert timed out %d/%d (rx%x rx%x)", itemsTransferred, itemsRemaining, (uint32_t) tx_buf,
                        (uint32_t) rx_buf);
 
-            SPIDRV_AbortTransfer(SPI_HANDLE);
+            SPIDRV_AbortTransfer(SL_SPIDRV_HANDLE);
             rsiError = RSI_ERROR_SPI_TIMEOUT;
         }
     }
@@ -307,9 +331,7 @@ int16_t rsi_spi_transfer(uint8_t * tx_buf, uint8_t * rx_buf, uint16_t xlen, uint
 
     xSemaphoreGive(spiTransferLock);
 #if defined(EFR32MG24)
-    /* In case of MG24, set CS of Exp Hdr SPI to high and release multiplex synchronization semaphore*/
-    GPIO_PinOutSet(SL_SPIDRV_EUSART_EXP_CS_PORT, SL_SPIDRV_EUSART_EXP_CS_PIN);
-    xSemaphoreGive(spi_sem_sync_hdl);
-#endif
+    sl_wfx_host_spi_cs_deassert();
+#endif /* EFR32MG24 */
     return rsiError;
 }