From 4ed8bd7f051f3141b3abac0b6d801650d14900dd Mon Sep 17 00:00:00 2001 From: lcaidm Date: Thu, 20 Mar 2025 18:06:27 +0800 Subject: [PATCH 01/15] bugfix Signed-off-by:lcaidm Signed-off-by: lcaidm --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index be54e82..9b793a6 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -379,6 +379,7 @@ typedef enum SystemCapabilityNum { DISTRIBUTEDSCHED_APPCOLLABORATION, MULTIMEDIA_AVSESSION_AVINPUTCAST, GAME_GAMECONTROLLER, + DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -742,6 +743,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.MultimodalAwarness.Motion", MULTIMODALAWARENESS_MOTION}, {"SystemCapability.DistributedSched.AppCollaboration", DISTRIBUTEDSCHED_APPCOLLABORATION}, {"SystemCapability.Game.GameController", GAME_GAMECONTROLLER}, + {"SystemCapability.DistributedDataManager.DataIntelligence.Core", DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE}, }; #ifdef __cplusplus -- Gitee From 4e42a7d999e63e85cf64f6d95350a54a16405c04 Mon Sep 17 00:00:00 2001 From: zhaohang Date: Mon, 24 Mar 2025 16:16:21 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaohang --- src/create_pcid.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/create_pcid.c b/src/create_pcid.c index da299fe..c5e5bed 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -379,6 +379,11 @@ static int32_t GetPriSyscap(PCIDMain *pcidMain, cJSON *sysCapObject, int32_t con char *tempPriSyscapStr = priSyscapStr; char *ptrPrivateSyscap = (char *)(pcidMain + 1); while (*ptrPrivateSyscap != '\0') { + size_t currentLen = tempPriSyscapStr - priSyscapStr; + if (currentLen >= SINGLE_SYSCAP_LEN - 1) { + PRINT_ERR("Syscap name exceeds maximum length\n"); + return GetPriSyscapResult(capVectorPtr, -1); + } if (*ptrPrivateSyscap == ',') { *tempPriSyscapStr = '\0'; int32_t ret = sprintf_s(fullCapStr, SINGLE_SYSCAP_LEN, "SystemCapability.%s", priSyscapStr); -- Gitee From 2363cf20f328eae70a474acd542fa3ddf23639ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E6=98=AF=E9=93=B8=E5=B8=81=E6=8D=8F?= Date: Wed, 26 Mar 2025 08:03:37 +0000 Subject: [PATCH 03/15] add syscap for device_status MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 就是铸币捏 --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 9b793a6..aa8026a 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -380,6 +380,7 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_AVSESSION_AVINPUTCAST, GAME_GAMECONTROLLER, DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE, + MULTIMODALAWARENESS_DEVICESTATUS, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -744,6 +745,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.DistributedSched.AppCollaboration", DISTRIBUTEDSCHED_APPCOLLABORATION}, {"SystemCapability.Game.GameController", GAME_GAMECONTROLLER}, {"SystemCapability.DistributedDataManager.DataIntelligence.Core", DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE}, + {"SystemCapability.MultimodalAwareness.DeviceStatus", MULTIMODALAWARENESS_DEVICESTATUS}, }; #ifdef __cplusplus -- Gitee From a0e8b56b22ee06771097a035325bdf0bd57a35fa Mon Sep 17 00:00:00 2001 From: zhaohang Date: Thu, 27 Mar 2025 15:01:50 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaohang --- src/create_pcid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/create_pcid.c b/src/create_pcid.c index c5e5bed..1b08215 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -381,7 +381,7 @@ static int32_t GetPriSyscap(PCIDMain *pcidMain, cJSON *sysCapObject, int32_t con while (*ptrPrivateSyscap != '\0') { size_t currentLen = tempPriSyscapStr - priSyscapStr; if (currentLen >= SINGLE_SYSCAP_LEN - 1) { - PRINT_ERR("Syscap name exceeds maximum length\n"); + printf("Syscap name exceeds maximum length\n"); return GetPriSyscapResult(capVectorPtr, -1); } if (*ptrPrivateSyscap == ',') { -- Gitee From 732b317ca81152ba3debe34ed6110e641de3018c Mon Sep 17 00:00:00 2001 From: liutuantuan Date: Mon, 31 Mar 2025 10:14:42 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9module=5Foutput=5Fpath?= =?UTF-8?q?=E4=B8=BA=E9=83=A8=E4=BB=B6/=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liutuantuan --- test/unittest/common/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/common/BUILD.gn b/test/unittest/common/BUILD.gn index 2621342..ea89fb0 100644 --- a/test/unittest/common/BUILD.gn +++ b/test/unittest/common/BUILD.gn @@ -64,7 +64,7 @@ if (defined(ohos_lite)) { import("//build/ohos.gni") import("//build/test.gni") - module_output_path = "developtools/syscap_codec" + module_output_path = "syscap_codec/syscap_codec" ohos_unittest("syscap_codec_test") { module_out_path = module_output_path -- Gitee From 77efbdb97e07dfc6ee3c5791a31e6e4e915ba9e2 Mon Sep 17 00:00:00 2001 From: dairan Date: Tue, 8 Apr 2025 02:24:23 +0000 Subject: [PATCH 06/15] update include/codec_config/syscap_define.h. Signed-off-by: dairan --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index aa8026a..0b98731 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -174,6 +174,7 @@ typedef enum SystemCapabilityNum { UPDATER_RAW, UPDATE_UPDATESERVICE, USB_USBMANAGER, + USB_USBMANAGER_SERIAL, USERIAM_USERAUTH_CORE, USERIAM_USERAUTH_FACEAUTH, USERIAM_USERAUTH_FINGERPRINTAUTH, @@ -548,6 +549,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Updater.Raw", UPDATER_RAW}, {"SystemCapability.Update.UpdateService", UPDATE_UPDATESERVICE}, {"SystemCapability.USB.USBManager", USB_USBMANAGER}, + {"SystemCapability.USB.USBManager.Serial", USB_USBMANAGER_SERIAL}, {"SystemCapability.UserIAM.UserAuth.Core", USERIAM_USERAUTH_CORE}, {"SystemCapability.UserIAM.UserAuth.FaceAuth", USERIAM_USERAUTH_FACEAUTH}, {"SystemCapability.UserIAM.UserAuth.FingerprintAuth", USERIAM_USERAUTH_FINGERPRINTAUTH}, -- Gitee From 3cc35c82509827f7023cc581c811d0c2dcb1d21d Mon Sep 17 00:00:00 2001 From: dairan Date: Tue, 8 Apr 2025 08:08:15 +0000 Subject: [PATCH 07/15] update include/codec_config/syscap_define.h. Signed-off-by: dairan --- include/codec_config/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 0b98731..8d92488 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -174,7 +174,6 @@ typedef enum SystemCapabilityNum { UPDATER_RAW, UPDATE_UPDATESERVICE, USB_USBMANAGER, - USB_USBMANAGER_SERIAL, USERIAM_USERAUTH_CORE, USERIAM_USERAUTH_FACEAUTH, USERIAM_USERAUTH_FINGERPRINTAUTH, @@ -382,6 +381,7 @@ typedef enum SystemCapabilityNum { GAME_GAMECONTROLLER, DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE, MULTIMODALAWARENESS_DEVICESTATUS, + USB_USBMANAGER_SERIAL, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; -- Gitee From 23c3428a4d495b7a54349391d6393122e48d541c Mon Sep 17 00:00:00 2001 From: dairan Date: Tue, 8 Apr 2025 08:19:34 +0000 Subject: [PATCH 08/15] update include/codec_config/syscap_define.h. Signed-off-by: dairan --- include/codec_config/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 8d92488..89fbe28 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -381,7 +381,7 @@ typedef enum SystemCapabilityNum { GAME_GAMECONTROLLER, DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE, MULTIMODALAWARENESS_DEVICESTATUS, - USB_USBMANAGER_SERIAL, + USB_USBMANAGER_SERIAL, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; -- Gitee From 1473b910d907a283898dbd9d0944c5db3aeda96b Mon Sep 17 00:00:00 2001 From: lixing Date: Wed, 16 Apr 2025 02:10:04 +0000 Subject: [PATCH 09/15] hidumper add abandoned Signed-off-by: lixing --- include/codec_config/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 89fbe28..5526c41 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -86,7 +86,7 @@ typedef enum SystemCapabilityNum { GRAPHIC_WMS, HIVIEWDFX_HIAPPEVENT, HIVIEWDFX_HICHECKER, - HIVIEWDFX_HIDUMPER, + HIVIEWDFX_HIDUMPER, // abandoned HIEVENTKLITE, HIVIEWDFX_HILOG, HIVIEWDFX_HILOGLITE, -- Gitee From 8812baf746f09082aeafacb411073551be167684 Mon Sep 17 00:00:00 2001 From: lixing Date: Wed, 16 Apr 2025 02:15:43 +0000 Subject: [PATCH 10/15] hidumper add abandoned Signed-off-by: lixing --- include/codec_config/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 5526c41..8eed0f2 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -452,7 +452,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Graphic.Wms", GRAPHIC_WMS}, {"SystemCapability.HiviewDFX.HiAppEvent", HIVIEWDFX_HIAPPEVENT}, {"SystemCapability.HiviewDFX.HiChecker", HIVIEWDFX_HICHECKER}, - {"SystemCapability.HiviewDFX.HiDumper", HIVIEWDFX_HIDUMPER}, + {"SystemCapability.HiviewDFX.HiDumper", HIVIEWDFX_HIDUMPER}, // abandoned {"SystemCapability.HiviewDFX.HiEventLite", HIEVENTKLITE}, {"SystemCapability.HiviewDFX.HiLog", HIVIEWDFX_HILOG}, {"SystemCapability.HiviewDFX.HiLogLite", HIVIEWDFX_HILOGLITE}, -- Gitee From b897c4b34ad065d69e06972833d778678d637548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B8=BF=E7=9D=BF?= Date: Tue, 29 Apr 2025 11:44:47 +0800 Subject: [PATCH 11/15] =?UTF-8?q?syscap=E4=B8=AD=E5=88=A0=E9=99=A4Cellular?= =?UTF-8?q?Call=E2=80=9C--signoff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git commit -msyscap中删除CellularCall“ Signed-off-by: 王鸿睿 --- include/codec_config/syscap_define.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 8eed0f2..609cfbc 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -161,7 +161,6 @@ typedef enum SystemCapabilityNum { SENSORS_SENSOR, SENSORS_SENSOR_LITE, TELEPHONY_CALLMANAGER, - TELEPHONY_CELLULARCALL, TELEPHONY_CELLULARDATA, TELEPHONY_CORESERVICE, TELEPHONY_DATASTORAGE, @@ -535,7 +534,6 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Sensors.Sensor", SENSORS_SENSOR}, {"SystemCapability.Sensors.Sensor.Lite", SENSORS_SENSOR_LITE}, {"SystemCapability.Telephony.CallManager", TELEPHONY_CALLMANAGER}, - {"SystemCapability.Telephony.CellularCall", TELEPHONY_CELLULARCALL}, {"SystemCapability.Telephony.CellularData", TELEPHONY_CELLULARDATA}, {"SystemCapability.Telephony.CoreService", TELEPHONY_CORESERVICE}, {"SystemCapability.Telephony.DataStorage", TELEPHONY_DATASTORAGE}, -- Gitee From 946f92a98a6dcee4b7a0ab478497a3db1b87381f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B8=BF=E7=9D=BF?= Date: Wed, 30 Apr 2025 09:35:45 +0000 Subject: [PATCH 12/15] update include/codec_config/syscap_define.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王鸿睿 --- include/codec_config/syscap_define.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 609cfbc..b4b6ccc 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -160,7 +160,8 @@ typedef enum SystemCapabilityNum { SENSORS_MISCDEVICE, SENSORS_SENSOR, SENSORS_SENSOR_LITE, - TELEPHONY_CALLMANAGER, + TELEPHONY_CALLMANAGER, // abandoned + TELEPHONY_CELLULARCALL, TELEPHONY_CELLULARDATA, TELEPHONY_CORESERVICE, TELEPHONY_DATASTORAGE, @@ -534,6 +535,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Sensors.Sensor", SENSORS_SENSOR}, {"SystemCapability.Sensors.Sensor.Lite", SENSORS_SENSOR_LITE}, {"SystemCapability.Telephony.CallManager", TELEPHONY_CALLMANAGER}, + {"SystemCapability.Telephony.CellularCall", TELEPHONY_CELLULARCALL}, {"SystemCapability.Telephony.CellularData", TELEPHONY_CELLULARDATA}, {"SystemCapability.Telephony.CoreService", TELEPHONY_CORESERVICE}, {"SystemCapability.Telephony.DataStorage", TELEPHONY_DATASTORAGE}, -- Gitee From cfb3124c4f355e9aaf3ee15f014bb71a64a5c9e9 Mon Sep 17 00:00:00 2001 From: liutuantuan Date: Wed, 7 May 2025 17:11:31 +0800 Subject: [PATCH 13/15] Modify to the correct path. Signed-off-by: liutuantuan --- tools/syscap_check.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/syscap_check.py b/tools/syscap_check.py index c404369..3799b79 100644 --- a/tools/syscap_check.py +++ b/tools/syscap_check.py @@ -285,7 +285,8 @@ def main(): project_path = args.project_path check_target = args.check_target bundles = args.bundles - syscap_define_path = os.path.join(project_path, "developtools", "syscap_codec", "include", "syscap_define.h") + syscap_define_path = os.path.join(project_path, "developtools", "syscap_codec", "include", + "codec_config", "syscap_define.h") ts_path = os.path.join(project_path, "interface", "sdk-js", "api") component_black_dirs = ("out",) bundle_syscap_heirarchy = ("component", "syscap") -- Gitee From d5a60bf49ffe7d0bbd1051adce723255bdf938fe Mon Sep 17 00:00:00 2001 From: zhangqiang Date: Thu, 8 May 2025 09:30:07 +0800 Subject: [PATCH 14/15] gl4 Signed-off-by: zhangqiang --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index b4b6ccc..e4309d0 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -76,6 +76,7 @@ typedef enum SystemCapabilityNum { GLOBAL_RESOURCEMANAGER, GRAPHIC_GRAPHIC2D_EGL, GRAPHIC_GRAPHIC2D_GLES3, + GRAPHIC_GRAPHIC2D_GL4, GRAPHIC_GRAPHIC2D_NATIVEDRAWING, GRAPHIC_GRAPHIC2D_NATIVEWINDOW, GRAPHIC_GRAPHIC2D_WEBGL, @@ -438,6 +439,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Graphic.Graphic2D.EGL", GRAPHIC_GRAPHIC2D_EGL}, {"SystemCapability.Graphic.Graphic2D.GLES2", GRAPHIC_GRAPHIC2D_GLES2}, {"SystemCapability.Graphic.Graphic2D.GLES3", GRAPHIC_GRAPHIC2D_GLES3}, + {"SystemCapability.Graphic.Graphic2D.GL4", GRAPHIC_GRAPHIC2D_GL4}, {"SystemCapability.Graphic.Graphic2D.HyperGraphicManager", GRAPHIC_GRAPHIC2D_HYPERGRAPHICMANAGER}, {"SystemCapability.Graphic.Graphic2D.NativeBuffer", GRAPHIC_GRAPHIC2D_NATIVEBUFFER}, {"SystemCapability.Graphic.Graphic2D.NativeImage", GRAPHIC_GRAPHIC2D_NATIVEIMAGE}, -- Gitee From ddd61a6f02f2323db03c3e7e06bbb002c53b4fb2 Mon Sep 17 00:00:00 2001 From: zhangqiang Date: Tue, 13 May 2025 09:26:03 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8FGRAPHIC=5FGRAP?= =?UTF-8?q?HIC2D=5FGL4=20=E6=B7=BB=E5=8A=A0=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangqiang --- include/codec_config/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index e4309d0..5326479 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -76,7 +76,6 @@ typedef enum SystemCapabilityNum { GLOBAL_RESOURCEMANAGER, GRAPHIC_GRAPHIC2D_EGL, GRAPHIC_GRAPHIC2D_GLES3, - GRAPHIC_GRAPHIC2D_GL4, GRAPHIC_GRAPHIC2D_NATIVEDRAWING, GRAPHIC_GRAPHIC2D_NATIVEWINDOW, GRAPHIC_GRAPHIC2D_WEBGL, @@ -383,6 +382,7 @@ typedef enum SystemCapabilityNum { DISTRIBUTEDDATAMANAGER_DATAINTELLIGENCE_CORE, MULTIMODALAWARENESS_DEVICESTATUS, USB_USBMANAGER_SERIAL, + GRAPHIC_GRAPHIC2D_GL4, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; -- Gitee