Simplify configurable GetAsyncKeyState

Setting the VK code to zero effectively disables these anyway.
This commit is contained in:
Tau 2019-11-17 13:16:50 -05:00
parent 388ba0b4a4
commit 97cfa2289e
2 changed files with 4 additions and 6 deletions

View File

@ -196,11 +196,11 @@ static HRESULT gpio_ioctl_get_psw(struct irp *irp)
/* Bit 0 == SW1 == Alt. Test */ /* Bit 0 == SW1 == Alt. Test */
/* Bit 1 == SW2 == Alt. Service */ /* Bit 1 == SW2 == Alt. Service */
if (gpio_config.vk_sw1 && (GetAsyncKeyState(gpio_config.vk_sw1) & 0x8000)) { if (GetAsyncKeyState(gpio_config.vk_sw1) & 0x8000) {
result |= 1 << 0; result |= 1 << 0;
} }
if (gpio_config.vk_sw2 && (GetAsyncKeyState(gpio_config.vk_sw2) & 0x8000)) { if (GetAsyncKeyState(gpio_config.vk_sw2) & 0x8000) {
result |= 1 << 1; result |= 1 << 1;
} }

View File

@ -50,13 +50,11 @@ void idz_io_jvs_read_buttons(uint8_t *opbtn_out, uint8_t *gamebtn_out)
opbtn = 0; opbtn = 0;
if ( idz_io_cfg.vk_test && if (GetAsyncKeyState(idz_io_cfg.vk_test) & 0x8000) {
(GetAsyncKeyState(idz_io_cfg.vk_test) & 0x8000)) {
opbtn |= IDZ_IO_OPBTN_TEST; opbtn |= IDZ_IO_OPBTN_TEST;
} }
if ( idz_io_cfg.vk_service && if (GetAsyncKeyState(idz_io_cfg.vk_service) & 0x8000) {
(GetAsyncKeyState(idz_io_cfg.vk_service) & 0x8000)) {
opbtn |= IDZ_IO_OPBTN_SERVICE; opbtn |= IDZ_IO_OPBTN_SERVICE;
} }