From 859a1c9e480bba32f454af4185349af665af8d25 Mon Sep 17 00:00:00 2001
From: ou-yangkan <519689417@qq.com>
Date: Fri, 21 Jan 2022 11:18:34 +0800
Subject: [PATCH] Synchronizing kernel interface

Signed-off-by: ou-yangkan <519689417@qq.com>
---
 SmartL_E802/liteos_m/board/target_config.h     | 4 ----
 esp32/liteos_m/board/target_config.h           | 5 -----
 riscv32_virt/liteos_m/board/driver/virtinput.c | 2 +-
 riscv32_virt/liteos_m/board/driver/virtmmio.c  | 5 ++---
 riscv32_virt/liteos_m/board/driver/virtmmio.h  | 6 ------
 riscv32_virt/liteos_m/board/driver/virtnet.c   | 2 +-
 6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/SmartL_E802/liteos_m/board/target_config.h b/SmartL_E802/liteos_m/board/target_config.h
index b6a8bcf..7fc467d 100644
--- a/SmartL_E802/liteos_m/board/target_config.h
+++ b/SmartL_E802/liteos_m/board/target_config.h
@@ -92,10 +92,6 @@ extern "C" {
                                        Exception module configuration
 =============================================================================*/
 #define LOSCFG_PLATFORM_EXC                                 0
-/*=============================================================================
-                                        TestSuite configuration
-=============================================================================*/
-#define LOSCFG_TEST                                         0
 /*=============================================================================
                                        Memory module configuration
 =============================================================================*/
diff --git a/esp32/liteos_m/board/target_config.h b/esp32/liteos_m/board/target_config.h
index 577d4b5..581d6d6 100644
--- a/esp32/liteos_m/board/target_config.h
+++ b/esp32/liteos_m/board/target_config.h
@@ -111,11 +111,6 @@ extern UINTPTR __heap_start;
 =============================================================================*/
 #define LOSCFG_PLATFORM_EXC                                 0
 
-/*=============================================================================
-                                        TestSuite configuration
-=============================================================================*/
-#define LOSCFG_TEST                                         0
-
 #define LOSCFG_BACKTRACE_TYPE                               4
 #define LOSCFG_KERNEL_PRINTF                                1
 
diff --git a/riscv32_virt/liteos_m/board/driver/virtinput.c b/riscv32_virt/liteos_m/board/driver/virtinput.c
index cf869ae..11d2196 100644
--- a/riscv32_virt/liteos_m/board/driver/virtinput.c
+++ b/riscv32_virt/liteos_m/board/driver/virtinput.c
@@ -190,7 +190,7 @@ static void VirtinHandleEv(struct Virtin *in)
     }
 }
 
-static uint32_t VirtinIRQhandle(HwiIrqParam *param)
+static uint32_t VirtinIRQhandle(HWI_IRQ_PARAM_S *param)
 {
     struct Virtin *in = param->pDevId;
 
diff --git a/riscv32_virt/liteos_m/board/driver/virtmmio.c b/riscv32_virt/liteos_m/board/driver/virtmmio.c
index 6256a0c..7f2d3b1 100644
--- a/riscv32_virt/liteos_m/board/driver/virtmmio.c
+++ b/riscv32_virt/liteos_m/board/driver/virtmmio.c
@@ -197,10 +197,9 @@ VADDR_T VirtmmioConfigQueue(struct VirtmmioDev *dev, VADDR_T base, uint16_t qsz[
 bool VirtmmioRegisterIRQ(struct VirtmmioDev *dev, HWI_PROC_FUNC handle, void *argDev, const char *devName)
 {
     uint32_t ret;
-    HwiIrqParam *param = mem_calloc(1, sizeof(HwiIrqParam));
-    param->swIrq = dev->irq;
+    HWI_IRQ_PARAM_S *param = mem_calloc(1, sizeof(HWI_IRQ_PARAM_S));
+    param->arg = dev->irq;
     param->pDevId = argDev;
-    param->pName = devName;
     
     ret = LOS_HwiCreate(dev->irq, OS_HWI_PRIO_HIGHEST, IRQF_SHARED, handle, param);  
     if (ret != 0) {
diff --git a/riscv32_virt/liteos_m/board/driver/virtmmio.h b/riscv32_virt/liteos_m/board/driver/virtmmio.h
index abec582..9136fa1 100644
--- a/riscv32_virt/liteos_m/board/driver/virtmmio.h
+++ b/riscv32_virt/liteos_m/board/driver/virtmmio.h
@@ -25,12 +25,6 @@
 typedef unsigned long VADDR_T;
 typedef unsigned long PADDR_T;
 
-typedef struct tagIrqParam {
-    int swIrq;
-    VOID *pDevId;
-    const CHAR *pName;
-} HwiIrqParam;  
-
 #define IO_DEVICE_ADDR(paddr)               (paddr)
 #define VMM_TO_DMA_ADDR(vaddr)              (vaddr)
 #define DMA_TO_VMM_ADDR(vaddr)              (vaddr)
diff --git a/riscv32_virt/liteos_m/board/driver/virtnet.c b/riscv32_virt/liteos_m/board/driver/virtnet.c
index e3bc483..73ba88c 100644
--- a/riscv32_virt/liteos_m/board/driver/virtnet.c
+++ b/riscv32_virt/liteos_m/board/driver/virtnet.c
@@ -462,7 +462,7 @@ static void VirtnetTxHandle(struct VirtNetif *nic)
     q->avail->flag = 0;
 }
 
-static void VirtnetIRQhandle(HwiIrqParam *param)
+static void VirtnetIRQhandle(HWI_IRQ_PARAM_S *param)
 {
     struct netif *netif = param->pDevId;
     struct VirtNetif *nic = netif->state;
-- 
Gitee