Cool_Tools/bemanitools
1
0
Fork 0
mirror of https://github.com/djhackersdev/bemanitools.git synced 2025-01-31 12:13:42 +01:00
Code Releases Activity

fix(jb/p3io): Fix IO buffer inconsistency/random input misfiring

Browse Source
This commit is contained in:
icex2 2023-03-30 23:23:29 +02:00 committed by icex2
parent 99d756f207
commit e530968dab
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/jbhook-util-p3io/p3io.c
View File

@ -111,12 +111,13 @@ void jbhook_util_p3io_fini(void)
static HRESULT jbhook_p3io_read_jamma(void *ctx, uint32_t *state) static HRESULT jbhook_p3io_read_jamma(void *ctx, uint32_t *state)
{ {
uint32_t state_tmp;
uint16_t panels; uint16_t panels;
uint8_t buttons; uint8_t buttons;
log_assert(state != NULL); log_assert(state != NULL);
*state = 0; state_tmp = 0;
if (!jb_io_read_inputs()) { if (!jb_io_read_inputs()) {
log_warning("Reading inputs from jbio failed"); log_warning("Reading inputs from jbio failed");
@ -129,28 +130,35 @@ static HRESULT jbhook_p3io_read_jamma(void *ctx, uint32_t *state)
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < 16; i++) {
// panels are active-low // panels are active-low
if ((panels & (1 << i)) == 0) { if ((panels & (1 << i)) == 0) {
*state |= jbhook_p3io_panel_mappings[i]; state_tmp |= jbhook_p3io_panel_mappings[i];
} }
} }
for (uint8_t i = 0; i < 2; i++) { for (uint8_t i = 0; i < 2; i++) {
// sys buttons are active-high // sys buttons are active-high
if (buttons & (1 << i)) { if (buttons & (1 << i)) {
*state |= jbhook_p3io_sys_button_mappings[i]; state_tmp |= jbhook_p3io_sys_button_mappings[i];
} }
} }
// Single write to external/game managed buffer to reduce risk for
// inconsistent state/random input misfiring
*state = state_tmp;
return S_OK; return S_OK;
} }
static HRESULT jbhook_p3io_get_roundplug( static HRESULT jbhook_p3io_get_roundplug(
void *ctx, uint8_t plug_id, uint8_t *rom, uint8_t *eeprom) void *ctx, uint8_t plug_id, uint8_t *rom, uint8_t *eeprom)
{ {
uint8_t rom_out[sizeof(jbhook_p3io_pcbid.id)];
struct security_rp3_eeprom eeprom_out; struct security_rp3_eeprom eeprom_out;
log_assert(sizeof(jbhook_p3io_pcbid.id) == sizeof(jbhook_p3io_eamid.id));
if (plug_id == 0) { if (plug_id == 0) {
/* black */ /* black */
memcpy(rom, jbhook_p3io_pcbid.id, sizeof(jbhook_p3io_pcbid.id)); memcpy(rom_out, jbhook_p3io_pcbid.id, sizeof(jbhook_p3io_pcbid.id));
security_rp3_generate_signed_eeprom_data( security_rp3_generate_signed_eeprom_data(
SECURITY_RP_UTIL_RP_TYPE_BLACK, SECURITY_RP_UTIL_RP_TYPE_BLACK,
&security_rp_sign_key_black_gfdmv4, &security_rp_sign_key_black_gfdmv4,
@ -159,7 +167,7 @@ static HRESULT jbhook_p3io_get_roundplug(
&eeprom_out); &eeprom_out);
} else { } else {
/* white */ /* white */
memcpy(rom, jbhook_p3io_eamid.id, sizeof(jbhook_p3io_eamid.id)); memcpy(rom_out, jbhook_p3io_eamid.id, sizeof(jbhook_p3io_eamid.id));
security_rp3_generate_signed_eeprom_data( security_rp3_generate_signed_eeprom_data(
SECURITY_RP_UTIL_RP_TYPE_WHITE, SECURITY_RP_UTIL_RP_TYPE_WHITE,
&security_rp_sign_key_white_eamuse, &security_rp_sign_key_white_eamuse,
@ -168,6 +176,9 @@ static HRESULT jbhook_p3io_get_roundplug(
&eeprom_out); &eeprom_out);
} }
// Single write to external/game managed buffer to reduce risk for
// inconsistent state
memcpy(rom, &rom_out, sizeof(rom_out));
memcpy(eeprom, &eeprom_out, sizeof(struct security_rp3_eeprom)); memcpy(eeprom, &eeprom_out, sizeof(struct security_rp3_eeprom));
return S_OK; return S_OK;