diff --git a/common/utils/include/device_type.h b/common/utils/include/device_type.h index 563fcb2a296ab850faea3bd279a6d8761bd3933f..06f425140584ff27d6ca83ca41681e17096869b1 100644 --- a/common/utils/include/device_type.h +++ b/common/utils/include/device_type.h @@ -28,7 +28,7 @@ enum class DHType : uint32_t { SPEAKER = 0x04, // Speaker DISPLAY = 0x08, // Display GPS = 0x10, // GPS - BUTTON = 0x20, // Key board + INPUT = 0x20, // Key board HFP = 0x40, // HFP External device A2D = 0x80, // A2DP External device VIRMODEM_MIC = 0x100, // Cellular call MIC @@ -42,7 +42,7 @@ const std::unordered_map DHTypeStrMap = { { DHType::SPEAKER, "SPEAKER" }, { DHType::DISPLAY, "DISPLAY" }, { DHType::GPS, "GPS" }, - { DHType::BUTTON, "BUTTON" }, + { DHType::INPUT, "INPUT" }, { DHType::HFP, "HFP" }, { DHType::A2D, "A2D" }, { DHType::VIRMODEM_MIC, "VIRMODEM_MIC" }, diff --git a/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp index 41a16ecaf3bd32034878eb7922bbc8efa64da48f..02e9c091a4502c41f12c16a7b36af92c09ccadbb 100644 --- a/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp @@ -58,7 +58,7 @@ std::map g_mapDhTypeName = { { "SPEAKER", DHType::SPEAKER }, { "DISPLAY", DHType::DISPLAY }, { "GPS", DHType::GPS }, - { "BUTTON", DHType::BUTTON }, + { "INPUT", DHType::INPUT }, { "HFP", DHType::HFP }, { "A2D", DHType::A2D }, { "VIRMODEM_MIC", DHType::VIRMODEM_MIC }, diff --git a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp b/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp index 0ecce1d2931a211267e520df6eaba105368d1d56..a1f797bd229e3b0e874b30b5bbad4c79b9448e29 100644 --- a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp @@ -30,7 +30,7 @@ namespace DistributedHardware { #define DH_LOG_TAG "DistributedHardwareProxy" const std::unordered_set DH_TYPE_SET { DHType::UNKNOWN, DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::GPS, - DHType::BUTTON, DHType::HFP, DHType::A2D, DHType::VIRMODEM_MIC, DHType::VIRMODEM_SPEAKER, DHType::MAX_DH, + DHType::INPUT, DHType::HFP, DHType::A2D, DHType::VIRMODEM_MIC, DHType::VIRMODEM_SPEAKER, DHType::MAX_DH, }; int32_t DistributedHardwareProxy::QuerySinkVersion(std::unordered_map &versionMap) diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp index 4ed6b27b8bdf8dbd3aff2d99ce792d5f6b8777d7..d001bbb34fb7de32448a4d4c7599d9aad12c7510 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp @@ -31,7 +31,7 @@ namespace { const uint32_t DH_TYPE_SIZE = 10; const DHType dhTypeFuzz[DH_TYPE_SIZE] = { DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::VIRMODEM_MIC, - DHType::BUTTON, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER + DHType::INPUT, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER }; } void ComponentManagerFuzzTest(const uint8_t* data, size_t size) diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp index c18c31b2f1dc767e3895738d688b51ce3adc2113..0d2097978d4900066f5fee6a566a2b5058245ec5 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp @@ -32,7 +32,7 @@ namespace { const uint32_t DH_TYPE_SIZE = 10; const DHType dhTypeFuzz[DH_TYPE_SIZE] = { DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::VIRMODEM_MIC, - DHType::BUTTON, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER + DHType::INPUT, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER }; } diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp index 86c4c5442d8623865e1086ee03f3ee717a200b0b..de1d68a30154d660ab0137aa441269b26468cb69 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp @@ -65,7 +65,7 @@ const shared_ptr CAP_INFO_2 = const shared_ptr CAP_INFO_3 = make_shared(DH_ID_3, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::DISPLAY, DH_ATTR_0); const shared_ptr CAP_INFO_4 = - make_shared(DH_ID_4, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::BUTTON, DH_ATTR_0); + make_shared(DH_ID_4, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::INPUT, DH_ATTR_0); const shared_ptr CAP_INFO_5 = make_shared(DH_ID_0, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::CAMERA, DH_ATTR_1); @@ -76,7 +76,7 @@ const shared_ptr CAP_INFO_7 = const shared_ptr CAP_INFO_8 = make_shared(DH_ID_3, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::DISPLAY, DH_ATTR_1); const shared_ptr CAP_INFO_9 = - make_shared(DH_ID_4, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::BUTTON, DH_ATTR_1); + make_shared(DH_ID_4, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::INPUT, DH_ATTR_1); } void ResourceManagerTest::SetUpTestCase(void) {} diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp index e5393c7d243976d1d5dd4a986ac8084058d99499..6a473835b21140494e9c122559ded861c7bac356 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp @@ -41,7 +41,7 @@ const MockDevInfo DEV_INFO_11 = { DEV_NETWORK_ID_1, DEV_ID_1, "Camera_1", DHType const MockDevInfo DEV_INFO_12 = { DEV_NETWORK_ID_1, DEV_ID_1, "Speaker_1", DHType::SPEAKER }; const MockDevInfo DEV_INFO_13 = { DEV_NETWORK_ID_1, DEV_ID_1, "Mic_1", DHType::MIC }; const MockDevInfo DEV_INFO_14 = { DEV_NETWORK_ID_1, DEV_ID_1, "Display_1", DHType::DISPLAY }; -const MockDevInfo DEV_INFO_15 = { DEV_NETWORK_ID_1, DEV_ID_1, "Input_1", DHType::BUTTON }; +const MockDevInfo DEV_INFO_15 = { DEV_NETWORK_ID_1, DEV_ID_1, "Input_1", DHType::INPUT }; const std::string DEV_ID_2 = "06d177ffa09543389f3b445b4722f9be"; const std::string DEV_NETWORK_ID_2 = "ntd177ffa09543389f3b445b4722f9be"; @@ -49,7 +49,7 @@ const MockDevInfo DEV_INFO_21 = { DEV_NETWORK_ID_2, DEV_ID_2, "Camera_1", DHType const MockDevInfo DEV_INFO_22 = { DEV_NETWORK_ID_2, DEV_ID_2, "Speaker_1", DHType::SPEAKER }; const MockDevInfo DEV_INFO_23 = { DEV_NETWORK_ID_2, DEV_ID_2, "Mic_1", DHType::MIC }; const MockDevInfo DEV_INFO_24 = { DEV_NETWORK_ID_2, DEV_ID_2, "Display_1", DHType::DISPLAY }; -const MockDevInfo DEV_INFO_25 = { DEV_NETWORK_ID_2, DEV_ID_2, "Input_1", DHType::BUTTON }; +const MockDevInfo DEV_INFO_25 = { DEV_NETWORK_ID_2, DEV_ID_2, "Input_1", DHType::INPUT }; const TaskParam TASK_PARAM_1 = { .networkId = DEV_NETWORK_ID_1,