middleware: wifi_nxp: align imu adapter with SDK Next Generation

Align with SDK Next Generation to use imu adapter apis.

Signed-off-by: Fengming Ye <[email protected]>

Author: fengming-ye

mcux/middleware/wifi_nxp/CMakeLists.txt

@@ -196,7 +196,6 @@ zephyr_include_directories(
     ${MCUX_SDK_DIR}/components/lists/
     ${MCUX_SDK_DIR}/components/wifi_bt_module/AzureWave/tx_pwr_limits/
     ${MCUX_SDK_DIR}/components/wifi_bt_module/Murata/tx_pwr_limits/
-    ${MCUX_SDK_DIR}/components/rpmsg/
 )
 
 # OS abstraction layer source
@@ -287,8 +286,7 @@ if(CONFIG_NXP_RW610)
 zephyr_code_relocate(FILES
                      wifidriver/wifi-imu.c
                      ${MCUX_SDK_DIR}/drivers/imu/fsl_imu.c
-                     # Only legacy SDK has this file.
-                     ${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/components/rpmsg/fsl_adapter_rfimu.c
+                     ${MCUX_SDK_DIR}/components/imu_adapter/fsl_adapter_imu.c
                      LOCATION RAM_TEXT)
 endif()
 

mcux/middleware/wifi_nxp/wifidriver/wifi-imu.c

@@ -19,7 +19,7 @@
 #include <mlan_fw.h>
 #include "wifi-imu.h"
 #include "wifi-internal.h"
-#include "fsl_adapter_rfimu.h"
+#include "fsl_adapter_imu.h"
 #include "fsl_imu.h"
 #include "fsl_loader.h"
 
@@ -109,10 +109,10 @@ SDK_ALIGN(uint8_t inbuf[SDIO_MP_AGGR_DEF_PKT_LIMIT * 2 * DATA_BUFFER_SIZE], 32);
 SDK_ALIGN(uint8_t amsdu_outbuf[MAX_SUPPORT_AMSDU_SIZE], 32);
 #endif
 
-hal_rpmsg_status_t rpmsg_cmdrsp_handler(IMU_Msg_t *pImuMsg, uint32_t length);
-hal_rpmsg_status_t rpmsg_event_handler(IMU_Msg_t *pImuMsg, uint32_t length);
-hal_rpmsg_status_t rpmsg_rxpkt_handler(IMU_Msg_t *pImuMsg, uint32_t length);
-hal_rpmsg_status_t rpmsg_ctrl_handler(IMU_Msg_t *pImuMsg, uint32_t length);
+hal_imumc_status_t imumc_cmdrsp_handler(IMU_Msg_t *pImuMsg, uint32_t length);
+hal_imumc_status_t imumc_event_handler(IMU_Msg_t *pImuMsg, uint32_t length);
+hal_imumc_status_t imumc_rxpkt_handler(IMU_Msg_t *pImuMsg, uint32_t length);
+hal_imumc_status_t imumc_ctrl_handler(IMU_Msg_t *pImuMsg, uint32_t length);
 
 /* Remove me: This structure is not present in mlan and can be removed later */
 typedef MLAN_PACK_START struct
@@ -146,13 +146,13 @@ static void wifi_init_imulink(void)
 }
 
 uint8_t cmd_seqno = 0;
-static hal_rpmsg_status_t wifi_send_fw_cmd(t_u16 cmd_type, t_u8 *cmd_payload, t_u32 length)
+static hal_imumc_status_t wifi_send_fw_cmd(t_u16 cmd_type, t_u8 *cmd_payload, t_u32 length)
 {
     IMUPkt *imu_cmd         = (IMUPkt *)cmd_payload;
     HostCmd_DS_COMMAND *cmd = NULL;
 
     if (cmd_payload == NULL || length == 0)
-        return kStatus_HAL_RpmsgError;
+        return kStatus_HAL_ImumcError;
 
     cmd          = &(imu_cmd->hostcmd);
     cmd->seq_num = (cmd->seq_num & 0xFF00) | cmd_seqno;
@@ -168,17 +168,17 @@ static hal_rpmsg_status_t wifi_send_fw_cmd(t_u16 cmd_type, t_u8 *cmd_payload, t_
     dump_hex(cmd_payload, length);
 #endif /* CONFIG_WIFI_IO_DUMP */
 
-    while (kStatus_HAL_RpmsgSuccess != HAL_ImuSendCommand(kIMU_LinkCpu1Cpu3, cmd_payload, length))
+    while (kStatus_HAL_ImumcSuccess != HAL_ImuSendCommand(kIMU_LinkCpu1Cpu3, cmd_payload, length))
     {
         OSA_TimeDelay(1);
     }
-    return kStatus_HAL_RpmsgSuccess;
+    return kStatus_HAL_ImumcSuccess;
 }
 
-static hal_rpmsg_status_t wifi_send_fw_data(t_u8 *data, t_u32 length)
+static hal_imumc_status_t wifi_send_fw_data(t_u8 *data, t_u32 length)
 {
     if (data == NULL || length == 0)
-        return kStatus_HAL_RpmsgError;
+        return kStatus_HAL_ImumcError;
     w_pkt_d("Data TX SIG: Driver=>FW, len %d", length);
     return HAL_ImuSendTxData(kIMU_LinkCpu1Cpu3, data, length);
 }
@@ -1148,7 +1148,7 @@ mlan_status wlan_xmit_pkt(t_u8 *buffer, t_u32 txlen, t_u8 interface, t_u32 tx_co
     /* send tx data via imu */
     ret = wifi_send_fw_data(buffer, txlen);
 
-    if (ret != kStatus_HAL_RpmsgSuccess)
+    if (ret != kStatus_HAL_ImumcSuccess)
     {
         wifi_io_e("Send tx data via imu failed (%d)", ret);
 #if CONFIG_WIFI_FW_DEBUG
@@ -1182,7 +1182,7 @@ mlan_status wlan_xmit_bypass_pkt(t_u8 *buffer, t_u32 txlen, t_u8 interface)
     /* send tx data via imu */
     ret = wifi_send_fw_data(buffer, txlen);
 
-    if (ret != kStatus_HAL_RpmsgSuccess)
+    if (ret != kStatus_HAL_ImumcSuccess)
     {
         wifi_io_e("Send tx data via imu failed (%d)", ret);
 #if CONFIG_WIFI_FW_DEBUG
@@ -1240,7 +1240,7 @@ mlan_status wlan_xmit_wmm_pkt(t_u8 interface, t_u32 txlen, t_u8 *tx_buf)
     ret              = HAL_ImuAddWlanTxPacket(kIMU_LinkCpu1Cpu3, tx_buf, txlen);
 #endif
 
-    if (ret != kStatus_HAL_RpmsgSuccess)
+    if (ret != kStatus_HAL_ImumcSuccess)
     {
 #if CONFIG_WMM_UAPSD
         if (last_packet)
@@ -1280,7 +1280,7 @@ mlan_status wlan_flush_wmm_pkt(int pkt_cnt)
 
     ret = HAL_ImuSendMultiTxData(kIMU_LinkCpu1Cpu3);
     ;
-    if (ret != kStatus_HAL_RpmsgSuccess)
+    if (ret != kStatus_HAL_ImumcSuccess)
     {
         wifi_io_e("wlan_flush_wmm_pkt failed (%d)", ret);
 #if CONFIG_WIFI_FW_DEBUG
@@ -1345,7 +1345,7 @@ mlan_status wlan_xmit_wmm_amsdu_pkt(mlan_wmm_ac_e ac, t_u8 interface, t_u32 txle
 
     ret = HAL_ImuAddWlanTxPacket(kIMU_LinkCpu1Cpu3, tx_buf, txlen);
 
-    if (ret != kStatus_HAL_RpmsgSuccess)
+    if (ret != kStatus_HAL_ImumcSuccess)
     {
 #if CONFIG_WMM_UAPSD
         if (last_packet)
@@ -1385,7 +1385,7 @@ mlan_status wlan_send_null_packet(pmlan_private priv, t_u8 flags)
     ptxpd->pkt_delay_2ms = 0;
 
     ret = wifi_send_fw_data(pbuf, sizeof(TxPD) + INTF_HEADER_LEN);
-    if (ret != kStatus_HAL_RpmsgSuccess)
+    if (ret != kStatus_HAL_ImumcSuccess)
     {
         wifi_io_e("imu_drv_write failed (%d)", ret);
         return MLAN_STATUS_FAILURE;
@@ -1394,7 +1394,7 @@ mlan_status wlan_send_null_packet(pmlan_private priv, t_u8 flags)
     return MLAN_STATUS_SUCCESS;
 }
 
-hal_rpmsg_status_t rpmsg_cmdrsp_handler(IMU_Msg_t *pImuMsg, uint32_t length)
+hal_imumc_status_t imumc_cmdrsp_handler(IMU_Msg_t *pImuMsg, uint32_t length)
 {
     assert(NULL != pImuMsg);
     assert(0 != length);
@@ -1413,10 +1413,10 @@ hal_rpmsg_status_t rpmsg_cmdrsp_handler(IMU_Msg_t *pImuMsg, uint32_t length)
 
     wlan_decode_rx_packet((t_u8 *)pImuMsg->PayloadPtr[0], MLAN_TYPE_CMD);
 
-    return kStatus_HAL_RpmsgSuccess;
+    return kStatus_HAL_ImumcSuccess;
 }
 
-hal_rpmsg_status_t rpmsg_event_handler(IMU_Msg_t *pImuMsg, uint32_t length)
+hal_imumc_status_t imumc_event_handler(IMU_Msg_t *pImuMsg, uint32_t length)
 {
     assert(NULL != pImuMsg);
     assert(0 != length);
@@ -1442,10 +1442,10 @@ hal_rpmsg_status_t rpmsg_event_handler(IMU_Msg_t *pImuMsg, uint32_t length)
 
     wlan_decode_rx_packet((t_u8 *)pImuMsg->PayloadPtr[0], MLAN_TYPE_EVENT);
 
-    return kStatus_HAL_RpmsgSuccess;
+    return kStatus_HAL_ImumcSuccess;
 }
 
-hal_rpmsg_status_t rpmsg_rxpkt_handler(IMU_Msg_t *pImuMsg, uint32_t length)
+hal_imumc_status_t imumc_rxpkt_handler(IMU_Msg_t *pImuMsg, uint32_t length)
 {
     IMUPkt *inimupkt;
     t_u32 size;
@@ -1478,7 +1478,7 @@ hal_rpmsg_status_t rpmsg_rxpkt_handler(IMU_Msg_t *pImuMsg, uint32_t length)
             wakelock_put();
 #endif
             wifi_io_e("pImuMsg->PayloadPtr[%u] has invalid size=%u", i, size);
-            return kStatus_HAL_RpmsgError;
+            return kStatus_HAL_ImumcError;
         }
 
 #if !CONFIG_TX_RX_ZERO_COPY
@@ -1503,7 +1503,7 @@ hal_rpmsg_status_t rpmsg_rxpkt_handler(IMU_Msg_t *pImuMsg, uint32_t length)
     wakelock_put();
 #endif
     /*! To be the last action of the handler*/
-    return kStatus_HAL_RpmsgSuccess;
+    return kStatus_HAL_ImumcSuccess;
 }
 
 static bool imu_fw_is_hang(void)
@@ -1516,7 +1516,7 @@ static bool imu_fw_is_hang(void)
         return false;
 }
 
-hal_rpmsg_status_t rpmsg_ctrl_handler(IMU_Msg_t *pImuMsg, uint32_t length)
+hal_imumc_status_t imumc_ctrl_handler(IMU_Msg_t *pImuMsg, uint32_t length)
 {
     t_u32 imuControlType;
 
@@ -1551,7 +1551,7 @@ hal_rpmsg_status_t rpmsg_ctrl_handler(IMU_Msg_t *pImuMsg, uint32_t length)
         default:
             break;
     }
-    return kStatus_HAL_RpmsgSuccess;
+    return kStatus_HAL_ImumcSuccess;
 }
 
 void imu_wakeup_card()
@@ -1644,13 +1644,13 @@ mlan_status imu_wifi_init(enum wlan_type type, const uint8_t *fw_ram_start_addr,
 
     wifi_init_imulink();
 
-    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, rpmsg_cmdrsp_handler, IMU_MSG_COMMAND_RESPONSE);
+    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, imumc_cmdrsp_handler, IMU_MSG_COMMAND_RESPONSE);
 
-    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, rpmsg_event_handler, IMU_MSG_EVENT);
+    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, imumc_event_handler, IMU_MSG_EVENT);
 
-    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, rpmsg_rxpkt_handler, IMU_MSG_RX_DATA);
+    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, imumc_rxpkt_handler, IMU_MSG_RX_DATA);
 
-    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, rpmsg_ctrl_handler, IMU_MSG_CONTROL);
+    HAL_ImuInstallCallback(kIMU_LinkCpu1Cpu3, imumc_ctrl_handler, IMU_MSG_CONTROL);
 
     /* If we're running a Manufacturing image, start the tasks.
        If not, initialize and setup the firmware */

mcux/middleware/wifi_nxp/wifidriver/wifi.c

@@ -28,7 +28,7 @@
 
 #endif
 #ifdef RW610
-#include "fsl_adapter_rfimu.h"
+#include "fsl_adapter_imu.h"
 #endif
 
 /* Always keep this include at the end of all include files */