!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 · 2024-01-27 08:20:41 +00:00 · 2024-01-27 15:38:28 +08:00 · 2023-11-23 11:15:09 +08:00
8 changed files with 62 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/arm/cortex-m7/iar/BUILD.gn
+++ b/arch/arm/cortex-m7/iar/BUILD.gn
@@ -0,0 +1,47 @@
+# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2024 Huawei Device Co., Ltd. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of
+#    conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list
+#    of conditions and the following disclaimer in the documentation and/or other materials
+#    provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used
+#    to endorse or promote products derived from this software without specific prior written
+#    permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import("//kernel/liteos_m/liteos.gni")
+
+module_name = "arch"
+kernel_module(module_name) {
+  sources = [
+    "los_context.c",
+    "los_dispatch.S",
+    "los_exc.S",
+    "los_interrupt.c",
+    "los_mpu.c",
+    "los_timer.c",
+  ]
+  configs += [ "$LITEOSTOPDIR:warn_config" ]
+}
+
+config("public") {
+  include_dirs = [ "." ]
+}
--- 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
openharmony_ci	954c855528	!1107 cortex-m7支持iccarm 编译 Merge pull request !1107 from hw_llm/master	2024-01-27 08:20:41 +00:00
hw_llm	80f3e0f6b2	Description: cortex-m7支持iccarm 编译 IssueNo: https://gitee.com/openharmony/kernel_liteos_m/issues/I8ZCYS Feature Or Bugfix: Feature Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-01-27 15:38:28 +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