From c6f31a5bdc9c096a5bd1110760fb89a364c72a58 Mon Sep 17 00:00:00 2001 From: zhangkt Date: Thu, 23 Nov 2023 09:52:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AELOS?= =?UTF-8?q?CFG=5FPLATFORM=5FHWI=5FWITH=5FARG=E4=B8=BA1=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arch/arm/common/los_common_interrupt.c | 5 ----- arch/arm/common/los_common_interrupt.h | 5 +++++ arch/csky/common/los_common_interrupt.c | 5 ----- arch/csky/common/los_common_interrupt.h | 5 +++++ arch/xtensa/common/los_common_interrupt.c | 5 ----- arch/xtensa/common/los_common_interrupt.h | 5 +++++ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/common/los_common_interrupt.c b/arch/arm/common/los_common_interrupt.c index b90dc5e4..8bc04067 100644 --- a/arch/arm/common/los_common_interrupt.c +++ b/arch/arm/common/los_common_interrupt.c @@ -105,11 +105,6 @@ BOOL OsHwiIsCreated(UINT32 index) #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) -typedef struct { - HWI_PROC_FUNC pfnHandler; - VOID *pParm; -} HWI_HANDLER_FUNC; - /* * * @ingroup los_hwi * Hardware interrupt handler form mapping handling function array. diff --git a/arch/arm/common/los_common_interrupt.h b/arch/arm/common/los_common_interrupt.h index 180a00d5..8a663a29 100644 --- a/arch/arm/common/los_common_interrupt.h +++ b/arch/arm/common/los_common_interrupt.h @@ -63,6 +63,11 @@ extern UINT32 g_intCount; #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) +typedef struct { + HWI_PROC_FUNC pfnHandler; + VOID *pParm; +} HWI_HANDLER_FUNC; + /* * * @ingroup los_arch_interrupt * Set interrupt vector table. diff --git a/arch/csky/common/los_common_interrupt.c b/arch/csky/common/los_common_interrupt.c index f6a55790..c4ae1e45 100644 --- a/arch/csky/common/los_common_interrupt.c +++ b/arch/csky/common/los_common_interrupt.c @@ -155,11 +155,6 @@ UINT32 ArchIntCurIrqNum(VOID) } #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) -typedef struct { - HWI_PROC_FUNC pfnHandler; - VOID *pParm; -} HWI_HANDLER_FUNC; - /* * * @ingroup los_hwi * Hardware interrupt handler form mapping handling function array. diff --git a/arch/csky/common/los_common_interrupt.h b/arch/csky/common/los_common_interrupt.h index 6a58a2e7..6ad52ad1 100644 --- a/arch/csky/common/los_common_interrupt.h +++ b/arch/csky/common/los_common_interrupt.h @@ -63,6 +63,11 @@ extern volatile UINT32 g_intCount; #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) +typedef struct { + HWI_PROC_FUNC pfnHandler; + VOID *pParm; +} HWI_HANDLER_FUNC; + /* * * @ingroup los_arch_interrupt * Set interrupt vector table. diff --git a/arch/xtensa/common/los_common_interrupt.c b/arch/xtensa/common/los_common_interrupt.c index 9046d611..3079ce18 100644 --- a/arch/xtensa/common/los_common_interrupt.c +++ b/arch/xtensa/common/los_common_interrupt.c @@ -137,11 +137,6 @@ UINT32 ArchIntCurIrqNum(VOID) } #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) -typedef struct { - HWI_PROC_FUNC pfnHandler; - VOID *pParm; -} HWI_HANDLER_FUNC; - /* * * @ingroup los_hwi * Hardware interrupt handler form mapping handling function array. diff --git a/arch/xtensa/common/los_common_interrupt.h b/arch/xtensa/common/los_common_interrupt.h index c0a42f12..e575b5f8 100644 --- a/arch/xtensa/common/los_common_interrupt.h +++ b/arch/xtensa/common/los_common_interrupt.h @@ -63,6 +63,11 @@ extern UINT32 g_intCount; #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) +typedef struct { + HWI_PROC_FUNC pfnHandler; + VOID *pParm; +} HWI_HANDLER_FUNC; + /* * * @ingroup los_arch_interrupt * Set interrupt vector table. -- Gitee From aecdab3a2cfb84a00a81c186544aa92d9428adf3 Mon Sep 17 00:00:00 2001 From: zhangkt Date: Thu, 23 Nov 2023 09:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AELOS?= =?UTF-8?q?CFG=5FPLATFORM=5FHWI=5FWITH=5FARG=E4=B8=BA1=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangkt --- arch/arm/common/los_common_interrupt.c | 5 ----- arch/arm/common/los_common_interrupt.h | 5 +++++ arch/csky/common/los_common_interrupt.c | 5 ----- arch/csky/common/los_common_interrupt.h | 5 +++++ arch/xtensa/common/los_common_interrupt.c | 5 ----- arch/xtensa/common/los_common_interrupt.h | 5 +++++ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/common/los_common_interrupt.c b/arch/arm/common/los_common_interrupt.c index b90dc5e4..8bc04067 100644 --- a/arch/arm/common/los_common_interrupt.c +++ b/arch/arm/common/los_common_interrupt.c @@ -105,11 +105,6 @@ BOOL OsHwiIsCreated(UINT32 index) #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) -typedef struct { - HWI_PROC_FUNC pfnHandler; - VOID *pParm; -} HWI_HANDLER_FUNC; - /* * * @ingroup los_hwi * Hardware interrupt handler form mapping handling function array. diff --git a/arch/arm/common/los_common_interrupt.h b/arch/arm/common/los_common_interrupt.h index 180a00d5..8a663a29 100644 --- a/arch/arm/common/los_common_interrupt.h +++ b/arch/arm/common/los_common_interrupt.h @@ -63,6 +63,11 @@ extern UINT32 g_intCount; #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) +typedef struct { + HWI_PROC_FUNC pfnHandler; + VOID *pParm; +} HWI_HANDLER_FUNC; + /* * * @ingroup los_arch_interrupt * Set interrupt vector table. diff --git a/arch/csky/common/los_common_interrupt.c b/arch/csky/common/los_common_interrupt.c index f6a55790..c4ae1e45 100644 --- a/arch/csky/common/los_common_interrupt.c +++ b/arch/csky/common/los_common_interrupt.c @@ -155,11 +155,6 @@ UINT32 ArchIntCurIrqNum(VOID) } #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) -typedef struct { - HWI_PROC_FUNC pfnHandler; - VOID *pParm; -} HWI_HANDLER_FUNC; - /* * * @ingroup los_hwi * Hardware interrupt handler form mapping handling function array. diff --git a/arch/csky/common/los_common_interrupt.h b/arch/csky/common/los_common_interrupt.h index 6a58a2e7..6ad52ad1 100644 --- a/arch/csky/common/los_common_interrupt.h +++ b/arch/csky/common/los_common_interrupt.h @@ -63,6 +63,11 @@ extern volatile UINT32 g_intCount; #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) +typedef struct { + HWI_PROC_FUNC pfnHandler; + VOID *pParm; +} HWI_HANDLER_FUNC; + /* * * @ingroup los_arch_interrupt * Set interrupt vector table. diff --git a/arch/xtensa/common/los_common_interrupt.c b/arch/xtensa/common/los_common_interrupt.c index 9046d611..3079ce18 100644 --- a/arch/xtensa/common/los_common_interrupt.c +++ b/arch/xtensa/common/los_common_interrupt.c @@ -137,11 +137,6 @@ UINT32 ArchIntCurIrqNum(VOID) } #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) -typedef struct { - HWI_PROC_FUNC pfnHandler; - VOID *pParm; -} HWI_HANDLER_FUNC; - /* * * @ingroup los_hwi * Hardware interrupt handler form mapping handling function array. diff --git a/arch/xtensa/common/los_common_interrupt.h b/arch/xtensa/common/los_common_interrupt.h index c0a42f12..e575b5f8 100644 --- a/arch/xtensa/common/los_common_interrupt.h +++ b/arch/xtensa/common/los_common_interrupt.h @@ -63,6 +63,11 @@ extern UINT32 g_intCount; #endif #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1) +typedef struct { + HWI_PROC_FUNC pfnHandler; + VOID *pParm; +} HWI_HANDLER_FUNC; + /* * * @ingroup los_arch_interrupt * Set interrupt vector table. -- Gitee