!1102 fix:设置LOSCFG_PLATFORM_HWI_WITH_ARG为1后，编译失败问题修复

Merge pull request !1102 from zhangkt/master
!1108 删除bundle.json中的syscap信息，确保与架构信息平台设计信息一致
2024-03-26 06:58:35 +00:00 · 2024-02-05 07:22:45 +00:00 · 2024-02-02 15:40:05 +08:00 · 2023-11-23 11:15:09 +08:00
7 changed files with 15 additions and 15 deletions
--- a/arch/arm/common/los_common_interrupt.c
+++ b/arch/arm/common/los_common_interrupt.c
@@ -105,10 +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
--- 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.
--- a/arch/csky/common/los_common_interrupt.c
+++ b/arch/csky/common/los_common_interrupt.c
@@ -155,10 +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
--- 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.
--- a/arch/xtensa/common/los_common_interrupt.c
+++ b/arch/xtensa/common/los_common_interrupt.c
@@ -137,10 +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
--- 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.
--- a/bundle.json
+++ b/bundle.json
@@ -27,9 +27,6 @@
    "component": {
        "name": "liteos_m",
        "subsystem": "kernel",
-        "syscap": [
-            "SystemCapability.Kernel.Liteos-M"
-        ],
        "features": [],
        "adapted_system_type": [
            "mini"
Author	SHA1	Message	Date
openharmony_ci	e539a6c951	!1102 fix:设置LOSCFG_PLATFORM_HWI_WITH_ARG为1后，编译失败问题修复 Merge pull request !1102 from zhangkt/master	2024-03-26 06:58:35 +00:00
openharmony_ci	e19155f49f	!1108 删除bundle.json中的syscap信息，确保与架构信息平台设计信息一致 Merge pull request !1108 from hw_llm/master	2024-02-05 07:22:45 +00:00
hw_llm	76562c376c	Description: 删除bundle.json中syscap信息 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/I90PKD Feature Or Bugfix: Feature Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-02-02 15:40:05 +08:00
zhangkt	36c0634ff5	fix:设置LOSCFG_PLATFORM_HWI_WITH_ARG为1后，编译失败问题修复 Signed-off-by: zhangkt <zhangkt1995@gmail.com>	2023-11-23 11:15:09 +08:00