From 1ae373af3c7ce5b07bf8b57499a259f382bf5bf3 Mon Sep 17 00:00:00 2001 From: wangyikai Date: Mon, 16 Dec 2024 20:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90hdf=5Fcore=E3=80=91=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=AB=E6=8F=8F=E7=BB=93=E6=9E=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyikai --- adapter/uhdf2/hdi/src/hdi_support.cpp | 4 ++-- .../support/platform/test/unittest/common/hdf_hdmi_test.cpp | 2 +- framework/tools/hc-gen/src/macro_gen.cpp | 6 +++--- framework/tools/hc-gen/src/text_gen.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/adapter/uhdf2/hdi/src/hdi_support.cpp b/adapter/uhdf2/hdi/src/hdi_support.cpp index e7080f5fc..f2c24f8f6 100644 --- a/adapter/uhdf2/hdi/src/hdi_support.cpp +++ b/adapter/uhdf2/hdi/src/hdi_support.cpp @@ -39,7 +39,7 @@ constexpr size_t INTERFACE_MATCH_RESIZE = 4; constexpr size_t INTERFACE_VERSION_MAJOR_INDEX = 1; constexpr size_t INTERFACE_VERSION_MINOR_INDEX = 2; constexpr size_t INTERFACE_NAME_INDEX = 3; -static const std::regex reInfDesc("[a-zA-Z_][a-zA-Z0-9_]*(?:\\.[a-zA-Z_][a-zA-Z0-9_]*)*\\." +static const std::regex REINFDESC("[a-zA-Z_][a-zA-Z0-9_]*(?:\\.[a-zA-Z_][a-zA-Z0-9_]*)*\\." "[V|v]([0-9]+)_([0-9]+)\\." "([a-zA-Z_][a-zA-Z0-9_]*)"); using HdiImplInstanceFunc = void *(*)(void); @@ -98,7 +98,7 @@ static int32_t ParseInterface( const std::string &desc, std::string &interface, std::string &libName, const char *serviceName) { std::smatch result; - if (!std::regex_match(desc, result, reInfDesc)) { + if (!std::regex_match(desc, result, REINFDESC)) { return HDF_FAILURE; } diff --git a/framework/support/platform/test/unittest/common/hdf_hdmi_test.cpp b/framework/support/platform/test/unittest/common/hdf_hdmi_test.cpp index 5c421554f..e13eefb53 100644 --- a/framework/support/platform/test/unittest/common/hdf_hdmi_test.cpp +++ b/framework/support/platform/test/unittest/common/hdf_hdmi_test.cpp @@ -103,12 +103,12 @@ static void HdmiUserSetAttrCaseTest(DevHandle handle) } } +constexpr uint32_t HDMI_EDID_DATA_LENGTH = 128; static void HdmiUserTest(void) { DevHandle handle = nullptr; int32_t ret; enum HdmiDeepColor color = HDMI_DEEP_COLOR_24BITS; - constexpr uint32_t HDMI_EDID_DATA_LENGTH = 128; uint8_t data[HDMI_EDID_DATA_LENGTH] = {0}; struct HdmiHpdCallbackInfo callback; diff --git a/framework/tools/hc-gen/src/macro_gen.cpp b/framework/tools/hc-gen/src/macro_gen.cpp index fc6de4a77..4ce4eeb4e 100644 --- a/framework/tools/hc-gen/src/macro_gen.cpp +++ b/framework/tools/hc-gen/src/macro_gen.cpp @@ -119,13 +119,13 @@ bool MacroGen::GenArray( const std::string &arrName, uint32_t &arrSize, uint32_t type, const std::shared_ptr &node) { static uint32_t index = 0; - const uint32_t ELEMENT_PER_LINE = 8; + constexpr uint32_t elementPerLine = 8; if (index == 0) { ofs_ << "#define " << arrName << "_data {"; } - if (index % ELEMENT_PER_LINE == 0) { + if (index % elementPerLine == 0) { ofs_ << " \\\n" << TAB; } @@ -141,7 +141,7 @@ bool MacroGen::GenArray( arrSize = 0; ofs_ << " \\\n}\n"; } else { - if (index % ELEMENT_PER_LINE == 0) { + if (index % elementPerLine == 0) { ofs_ << ","; } else { ofs_ << ", "; diff --git a/framework/tools/hc-gen/src/text_gen.cpp b/framework/tools/hc-gen/src/text_gen.cpp index 9b11e4800..6ac78346a 100644 --- a/framework/tools/hc-gen/src/text_gen.cpp +++ b/framework/tools/hc-gen/src/text_gen.cpp @@ -566,14 +566,14 @@ bool TextGen::PrintArrayImplInSubClass(const std::shared_ptr &object, bool TextGen::HcsPrintArrayContent(const std::shared_ptr &object, uint32_t indent) { - constexpr uint32_t ELEMENT_PER_LINE = 16; + constexpr uint32_t elementPerLine = 16; auto element = object->Child(); uint32_t elementCount = 0; while (element != nullptr) { if (!PrintBaseTypeValue(element)) { return false; } - if (elementCount++ >= ELEMENT_PER_LINE) { + if (elementCount++ >= elementPerLine) { ofs_ << "\n" << Indent(indent); } element = element->Next(); -- Gitee