From 82f389ee2ded67655abdf12bf453bef1cd450ece Mon Sep 17 00:00:00 2001 From: wangyikai Date: Fri, 14 Jun 2024 16:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90hdf=5Fcore=E3=80=91=E4=B8=BAhdf=5Fdevm?= =?UTF-8?q?gr=E6=B7=BB=E5=8A=A0bootevent=E5=92=8Ccritical=E6=9C=BA?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyikai --- adapter/BUILD.gn | 1 + adapter/uhdf2/manager/BUILD.gn | 8 ++++++++ adapter/uhdf2/manager/device_manager.c | 4 ++++ adapter/uhdf2/manager/hdf_devmgr.cfg | 6 +++++- adapter/uhdf2/manager/hdf_devmgr.para.dac | 14 ++++++++++++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 adapter/uhdf2/manager/hdf_devmgr.para.dac diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn index 47922a7c0..6d0bfc585 100644 --- a/adapter/BUILD.gn +++ b/adapter/BUILD.gn @@ -42,6 +42,7 @@ if (defined(ohos_lite)) { "$hdf_adapter_path/uhdf2/ipc:libhdf_ipc_adapter", "$hdf_adapter_path/uhdf2/manager:hdf_devmgr", "$hdf_adapter_path/uhdf2/manager:hdf_devmgr.cfg", + "$hdf_adapter_path/uhdf2/manager:hdf_devmgr.para.dac", "$hdf_adapter_path/uhdf2/manager:hdf_pnp.cfg", "$hdf_adapter_path/uhdf2/platform:libhdf_platform", "$hdf_adapter_path/uhdf2/pub_utils:libpub_utils", diff --git a/adapter/uhdf2/manager/BUILD.gn b/adapter/uhdf2/manager/BUILD.gn index 658b36fa9..7a4f2325e 100644 --- a/adapter/uhdf2/manager/BUILD.gn +++ b/adapter/uhdf2/manager/BUILD.gn @@ -102,3 +102,11 @@ ohos_prebuilt_etc("hdf_pnp.cfg") { subsystem_name = "hdf" part_name = "hdf_core" } + +ohos_prebuilt_etc("hdf_devmgr.para.dac") { + source = "hdf_devmgr.para.dac" + relative_install_dir = "param" + install_images = [ chipset_base_dir ] + subsystem_name = "hdf" + part_name = "hdf_core" +} diff --git a/adapter/uhdf2/manager/device_manager.c b/adapter/uhdf2/manager/device_manager.c index 3803b9a75..2e97d1559 100644 --- a/adapter/uhdf2/manager/device_manager.c +++ b/adapter/uhdf2/manager/device_manager.c @@ -19,9 +19,12 @@ #include "hdf_base.h" #include "hdf_log.h" #include "devmgr_dump.h" +#include "parameter.h" #define HDF_LOG_TAG hdf_device_manager +const char *BOOTEVENT_HDF_DEVMGR_READY = "bootevent.hdf_devmgr.ready"; + int main() { HDF_LOGI("start hdf device manager"); @@ -38,6 +41,7 @@ int main() (void)DevMgrUeventReceiveStart(); DevMgrRegisterDumpFunc(); if (status == HDF_SUCCESS) { + SetParameter(BOOTEVENT_HDF_DEVMGR_READY, "true"); struct DevmgrServiceFull *fullService = (struct DevmgrServiceFull *)instance; struct HdfMessageLooper *looper = &fullService->looper; if ((looper != NULL) && (looper->Start != NULL)) { diff --git a/adapter/uhdf2/manager/hdf_devmgr.cfg b/adapter/uhdf2/manager/hdf_devmgr.cfg index 5e54e2e32..7064ae743 100644 --- a/adapter/uhdf2/manager/hdf_devmgr.cfg +++ b/adapter/uhdf2/manager/hdf_devmgr.cfg @@ -6,7 +6,11 @@ "gid" : ["hdf_devmgr", "readproc", "uhdf_driver"], "start-mode" : "boot", "secon" : "u:r:hdf_devmgr:s0", - "caps" : ["CAP_SYS_MODULE"] + "caps" : ["CAP_SYS_MODULE"], + "critical": [1, 4, 60], + "bootevents": [ + "bootevent.hdf_devmgr.ready" + ] } ] } diff --git a/adapter/uhdf2/manager/hdf_devmgr.para.dac b/adapter/uhdf2/manager/hdf_devmgr.para.dac new file mode 100644 index 000000000..0cbd2be14 --- /dev/null +++ b/adapter/uhdf2/manager/hdf_devmgr.para.dac @@ -0,0 +1,14 @@ +# Copyright (c) 2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +bootevent.hdf_devmgr.ready = hdf_devmgr:hdf_devmgr:0775 \ No newline at end of file -- Gitee