openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-18 16:04:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

modify code format check

Browse Source 
Signed-off-by: hwzhangchuang <zhangchuang.zhang@huawei.com>
This commit is contained in:
hwzhangchuang
2023-10-28 09:14:15 +08:00
parent 8f0384f9a9
commit b899e27d51
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/input_hub.cpp
+12 -12
View File
@@ -559,11 +559,11 @@ void InputHub::GetEventMask(int fd, const std::string &eventName, uint32_t type,
void InputHub::GetMSCBits(int fd, std::unique_ptr<Device> &device)
{
uint8_t mscBitmask_[NBYTES(MSC_MAX)] {};
GetEventMask(fd, "msc", EV_MSC, sizeof(mscBitmask_), mscBitmask_);
uint8_t mscBitmask[NBYTES(MSC_MAX)] {};
GetEventMask(fd, "msc", EV_MSC, sizeof(mscBitmask), mscBitmask);
for (uint32_t msc = MSC_SERIAL; msc < MSC_MAX; ++msc) {
if (TestBit(EV_MSC, device->evBitmask) && TestBit(msc, mscBitmask_)) {
if (TestBit(EV_MSC, device->evBitmask) && TestBit(msc, mscBitmask)) {
DHLOGI("Get MSC event: %d", msc);
device->identifier.miscellaneous.push_back(msc);
}
@@ -572,10 +572,10 @@ void InputHub::GetMSCBits(int fd, std::unique_ptr<Device> &device)
void InputHub::GetLEDBits(int fd, std::unique_ptr<Device> &device)
{
uint8_t ledBitmask_[NBYTES(LED_MAX)] {};
GetEventMask(fd, "led", EV_LED, sizeof(ledBitmask_), ledBitmask_);
uint8_t ledBitmask[NBYTES(LED_MAX)] {};
GetEventMask(fd, "led", EV_LED, sizeof(ledBitmask), ledBitmask);
for (uint32_t led = LED_NUML; led < LED_MAX; ++led) {
if (TestBit(EV_LED, device->evBitmask) && TestBit(led, ledBitmask_)) {
if (TestBit(EV_LED, device->evBitmask) && TestBit(led, ledBitmask)) {
DHLOGI("Get LED event: %d", led);
device->identifier.leds.push_back(led);
}
@@ -584,11 +584,11 @@ void InputHub::GetLEDBits(int fd, std::unique_ptr<Device> &device)
void InputHub::GetSwitchBits(int fd, std::unique_ptr<Device> &device)
{
uint8_t switchBitmask_[NBYTES(SW_MAX)] {};
GetEventMask(fd, "switch", EV_SW, sizeof(switchBitmask_), switchBitmask_);
uint8_t switchBitmask[NBYTES(SW_MAX)] {};
GetEventMask(fd, "switch", EV_SW, sizeof(switchBitmask), switchBitmask);
for (uint32_t sw = SW_LID; sw < SW_MAX; ++sw) {
if (TestBit(EV_SW, device->evBitmask) && TestBit(sw, switchBitmask_)) {
if (TestBit(EV_SW, device->evBitmask) && TestBit(sw, switchBitmask)) {
DHLOGI("Get Switch event: %d", sw);
device->identifier.switchs.push_back(sw);
}
@@ -597,11 +597,11 @@ void InputHub::GetSwitchBits(int fd, std::unique_ptr<Device> &device)
void InputHub::GetRepeatBits(int fd, std::unique_ptr<Device> &device)
{
uint8_t repBitmask_[NBYTES(REP_MAX)] {};
GetEventMask(fd, "repeat", EV_REP, sizeof(repBitmask_), repBitmask_);
uint8_t repBitmask[NBYTES(REP_MAX)] {};
GetEventMask(fd, "repeat", EV_REP, sizeof(repBitmask), repBitmask);
for (uint32_t rep = REP_DELAY; rep < REP_MAX; ++rep) {
if (TestBit(EV_REP, device->evBitmask) && TestBit(rep, repBitmask_)) {
if (TestBit(EV_REP, device->evBitmask) && TestBit(rep, repBitmask)) {
DHLOGI("Get Repeat event: %d", rep);
device->identifier.repeats.push_back(rep);
}
services/source/inputinject/include/distributed_input_node_manager.h
+3 -1
View File
@@ -89,7 +89,9 @@ private:
void AddDeviceLocked(const std::string &dhId, std::unique_ptr<VirtualDevice> device);
int32_t CreateHandle(const InputDevice &inputDevice, const std::string &devId, const std::string &dhId);
void ParseInputDeviceJson(const std::string &str, InputDevice &pBuf);
void VerifyInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf);
void ParseInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf);
void ParseInputDeviceBasicInfo(const nlohmann::json &inputDeviceJson, InputDevice &pBuf);
void ParseInputDeviceEvents(const nlohmann::json &inputDeviceJson, InputDevice &pBuf);
void InjectEvent();
void ScanSinkInputDevices(const std::string &dhId);
services/source/inputinject/src/distributed_input_node_manager.cpp
+12 -2
View File
@@ -79,10 +79,16 @@ void DistributedInputNodeManager::ParseInputDeviceJson(const std::string &str, I
DHLOGE("recMsg parse failed!");
return;
}
VerifyInputDevice(inputDeviceJson, pBuf);
ParseInputDevice(inputDeviceJson, pBuf);
}
void DistributedInputNodeManager::VerifyInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf)
void DistributedInputNodeManager::ParseInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf)
{
ParseInputDeviceBasicInfo(inputDeviceJson, pBuf);
ParseInputDeviceEvents(inputDeviceJson, pBuf);
}
void DistributedInputNodeManager::ParseInputDeviceBasicInfo(const nlohmann::json &inputDeviceJson, InputDevice &pBuf)
{
if (IsString(inputDeviceJson, DEVICE_NAME)) {
pBuf.name = inputDeviceJson[DEVICE_NAME].get<std::string>();
@@ -111,6 +117,10 @@ void DistributedInputNodeManager::VerifyInputDevice(const nlohmann::json &inputD
if (IsUInt32(inputDeviceJson, CLASSES)) {
pBuf.classes = inputDeviceJson[CLASSES].get<uint32_t>();
}
}
void DistributedInputNodeManager::ParseInputDeviceEvents(const nlohmann::json &inputDeviceJson, InputDevice &pBuf)
{
if (IsArray(inputDeviceJson, EVENT_TYPES)) {
pBuf.eventTypes = inputDeviceJson[EVENT_TYPES].get<std::vector<uint32_t>>();
}