diff --git a/riscv32_virt/liteos_m/board/driver/virtinput.c b/riscv32_virt/liteos_m/board/driver/virtinput.c index cf869ae7573752b7956da60c9d921feadba2adb5..5f57ed80723ab295d3ec8f73a6339e77ba13864b 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 6256a0c889bdf4022882749565fe67aba5ab7676..2fdd265ae8df7e671a3e84bcfcde52b4a87841ce 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 abec582c755e99d6456b3dc0ea6ffb6fda7334e6..cdbc926425757ebe2ff251e46ad078a679e6a735 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 e3bc483dd052d94e988af70a43b4ebbf48f72068..c0b1fe18e0292c6177ba582aa2101520f56629bc 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);