tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update for increased SW input codes." am: 028d49fd02 am: e8b375fb86

Browse source 
Change-Id: I4e7551f46599951d08985ae21ea2402148a507a3
This commit is contained in:
Automerger Merge Worker 2019-12-13 22:05:44 +00:00
commit d8e047e20d
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/input/evdev/SwitchInputMapper.cpp
View file

@ -47,13 +47,26 @@ static struct {
{SW_FRONT_PROXIMITY, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_ROTATE_LOCK, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_LINEIN_INSERT, INPUT_USAGE_SWITCH_UNKNOWN},
{0x0e /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_MUTE_DEVICE, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_PEN_INSERTED, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_HPHL_OVERCURRENT, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_HPHR_OVERCURRENT, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_UNSUPPORT_INSERT, INPUT_USAGE_SWITCH_UNKNOWN},
{0x13 /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{0x14 /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{0x15 /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{0x16 /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{0x17 /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{0x18 /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{0x19 /* unused */, INPUT_USAGE_SWITCH_UNKNOWN},
{SW_MAX, INPUT_USAGE_SWITCH_UNKNOWN},
};
SwitchInputMapper::SwitchInputMapper()
: InputMapper() {
static_assert(SW_CNT <= 32, "More than 32 switches defined in linux/input.h");
// If this gets larger than 64, then the mSwitchValues and mUpdatedSwitchMask
// variables need to be changed to support more than 64 bits.
static_assert(SW_CNT <= 64, "More than 64 switches defined in linux/input.h");
}
bool SwitchInputMapper::configureInputReport(InputDeviceNode* devNode,

4
modules/input/evdev/SwitchInputMapper.h
View file

@ -39,8 +39,8 @@ private:
void processSwitch(int32_t switchCode, int32_t switchValue);
void sync(nsecs_t when);
BitSet32 mSwitchValues;
BitSet32 mUpdatedSwitchMask;
BitSet64 mSwitchValues;
BitSet64 mUpdatedSwitchMask;
};
} // namespace android