From 2d513db913f039b363b4feb1ec5be0e5d0d2ba6e Mon Sep 17 00:00:00 2001
From: LiteOS2021 <dinglu@huawei.com>
Date: Tue, 15 Feb 2022 16:04:04 +0800
Subject: [PATCH] feat:Synchronous LOS_HwiCreate interface

Signed-off-by: LiteOS2021 <dinglu@huawei.com>
---
 riscv32_virt/liteos_m/board/driver/virtinput.c | 2 +-
 riscv32_virt/liteos_m/board/driver/virtmmio.c  | 1 +
 riscv32_virt/liteos_m/board/driver/virtmmio.h  | 8 +-------
 riscv32_virt/liteos_m/board/driver/virtnet.c   | 3 ++-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/riscv32_virt/liteos_m/board/driver/virtinput.c b/riscv32_virt/liteos_m/board/driver/virtinput.c
index cf869ae..5f57ed8 100644
--- a/riscv32_virt/liteos_m/board/driver/virtinput.c
+++ b/riscv32_virt/liteos_m/board/driver/virtinput.c
@@ -311,7 +311,7 @@ ERR_OUT:
 static void VirtinDeInit(struct Virtin *in)
 {
     if (in->dev.irq) { 
-        LOS_HwiDelete(in->dev.irq);
+        LOS_HwiDelete(in->dev.irq, NULL);
     }
     LOS_MemFree(OS_SYS_MEM_ADDR, in);
 }
diff --git a/riscv32_virt/liteos_m/board/driver/virtmmio.c b/riscv32_virt/liteos_m/board/driver/virtmmio.c
index 6256a0c..2fdd265 100644
--- a/riscv32_virt/liteos_m/board/driver/virtmmio.c
+++ b/riscv32_virt/liteos_m/board/driver/virtmmio.c
@@ -15,6 +15,7 @@
 
 #include "los_debug.h"
 #include "los_arch_interrupt.h"
+#include "los_interrupt.h"
 #include "lwip/mem.h"
 #include "virtmmio.h"
 
diff --git a/riscv32_virt/liteos_m/board/driver/virtmmio.h b/riscv32_virt/liteos_m/board/driver/virtmmio.h
index abec582..cdbc926 100644
--- a/riscv32_virt/liteos_m/board/driver/virtmmio.h
+++ b/riscv32_virt/liteos_m/board/driver/virtmmio.h
@@ -20,17 +20,11 @@
 #include "stdint.h"
 #include "los_reg.h"
 #include "stdbool.h"
-#include "los_arch_context.h" 
+#include "los_arch_context.h"
 
 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..c0b1fe1 100644
--- a/riscv32_virt/liteos_m/board/driver/virtnet.c
+++ b/riscv32_virt/liteos_m/board/driver/virtnet.c
@@ -19,6 +19,7 @@
 #include "los_reg.h"
 #include "los_compiler.h"
 #include "los_debug.h"
+#include "los_interrupt.h"
 
 #define IFNAMSIZ  IF_NAMESIZE
 
@@ -548,7 +549,7 @@ static void VirtnetDeInit(struct netif *netif)
     struct VirtNetif *nic = netif->state;
 
     if (nic && (nic->dev.irq & ~_IRQ_MASK)) {
-        LOS_HwiDelete(nic->dev.irq);
+        LOS_HwiDelete(nic->dev.irq, NULL);
     }
     if (nic && nic->rbufRec) {
         free(nic->rbufRec);
-- 
Gitee