From b172c22322db661466d5924cde39d16ff0dd6af9 Mon Sep 17 00:00:00 2001 From: Tau Date: Fri, 3 May 2019 17:21:38 -0400 Subject: [PATCH] board/sg-reader.c: Streamline further Remove remaining pointless boilerplate, turn it into a free- standing hook, since its aimeio.dll dependency forces it to be a singleton anyway. --- board/sg-reader.c | 86 ++++++++++++++++++++------------------------ board/sg-reader.h | 25 +------------ cardhook/_com12.c | 37 ------------------- cardhook/_com12.h | 5 --- cardhook/dllmain.c | 7 ++-- cardhook/meson.build | 1 - divahook/_com10.c | 38 -------------------- divahook/_com10.h | 5 --- divahook/dllmain.c | 5 +-- divahook/meson.build | 1 - idzhook/_com10.c | 38 -------------------- idzhook/_com10.h | 5 --- idzhook/dllmain.c | 5 +-- idzhook/meson.build | 1 - 14 files changed, 50 insertions(+), 209 deletions(-) delete mode 100644 cardhook/_com12.c delete mode 100644 cardhook/_com12.h delete mode 100644 divahook/_com10.c delete mode 100644 divahook/_com10.h delete mode 100644 idzhook/_com10.c delete mode 100644 idzhook/_com10.h diff --git a/board/sg-reader.c b/board/sg-reader.c index 792894b..d934600 100644 --- a/board/sg-reader.c +++ b/board/sg-reader.c @@ -17,18 +17,14 @@ #include "util/dprintf.h" #include "util/dump.h" -static HRESULT sg_reader_handle_irp_locked( - struct sg_reader *reader, - struct irp *irp); - +static HRESULT sg_reader_handle_irp(struct irp *irp); +static HRESULT sg_reader_handle_irp_locked(struct irp *irp); static HRESULT sg_reader_mifare_poll(void *ctx, uint32_t *uid); - static HRESULT sg_reader_mifare_read_luid( void *ctx, uint32_t uid, uint8_t *luid, size_t luid_size); - static void sg_reader_led_set_color(void *ctx, uint8_t r, uint8_t g, uint8_t b); static const struct sg_nfc_ops sg_reader_nfc_ops = { @@ -40,59 +36,55 @@ static const struct sg_led_ops sg_reader_led_ops = { .set_color = sg_reader_led_set_color, }; -HRESULT sg_reader_init( - struct sg_reader *reader, - unsigned int port_no) +static CRITICAL_SECTION sg_reader_lock; +static struct uart sg_reader_uart; +static uint8_t sg_reader_written_bytes[520]; +static uint8_t sg_reader_readable_bytes[520]; +static struct sg_nfc sg_reader_nfc; +static struct sg_led sg_reader_led; + +HRESULT sg_reader_hook_init(unsigned int port_no) { HRESULT hr; - assert(reader != NULL); - hr = aime_io_init(); if (FAILED(hr)) { return hr; } - sg_nfc_init(&reader->nfc, 0x00, &sg_reader_nfc_ops, reader); - sg_led_init(&reader->led, 0x08, &sg_reader_led_ops, reader); + sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, NULL); + sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, NULL); - InitializeCriticalSection(&reader->lock); + InitializeCriticalSection(&sg_reader_lock); - uart_init(&reader->uart, port_no); - reader->uart.written.bytes = reader->written_bytes; - reader->uart.written.nbytes = sizeof(reader->written_bytes); - reader->uart.readable.bytes = reader->readable_bytes; - reader->uart.readable.nbytes = sizeof(reader->readable_bytes); + uart_init(&sg_reader_uart, port_no); + sg_reader_uart.written.bytes = sg_reader_written_bytes; + sg_reader_uart.written.nbytes = sizeof(sg_reader_written_bytes); + sg_reader_uart.readable.bytes = sg_reader_readable_bytes; + sg_reader_uart.readable.nbytes = sizeof(sg_reader_readable_bytes); - return S_OK; + return iohook_push_handler(sg_reader_handle_irp); } -bool sg_reader_match_irp(const struct sg_reader *reader, const struct irp *irp) -{ - assert(reader != NULL); - assert(irp != NULL); - - return uart_match_irp(&reader->uart, irp); -} - -HRESULT sg_reader_handle_irp(struct sg_reader *reader, struct irp *irp) +static HRESULT sg_reader_handle_irp(struct irp *irp) { HRESULT hr; - assert(reader != NULL); assert(irp != NULL); - EnterCriticalSection(&reader->lock); - hr = sg_reader_handle_irp_locked(reader, irp); - LeaveCriticalSection(&reader->lock); + if (!uart_match_irp(&sg_reader_uart, irp)) { + return iohook_invoke_next(irp); + } + + EnterCriticalSection(&sg_reader_lock); + hr = sg_reader_handle_irp_locked(irp); + LeaveCriticalSection(&sg_reader_lock); return hr; } -static HRESULT sg_reader_handle_irp_locked( - struct sg_reader *reader, - struct irp *irp) +static HRESULT sg_reader_handle_irp_locked(struct irp *irp) { HRESULT hr; @@ -106,29 +98,29 @@ static HRESULT sg_reader_handle_irp_locked( #if 0 if (irp->op == IRP_OP_READ) { dprintf("READ:\n"); - dump_iobuf(&reader->uart.readable); + dump_iobuf(&sg_reader_uart.readable); } #endif - hr = uart_handle_irp(&reader->uart, irp); + hr = uart_handle_irp(&sg_reader_uart, irp); if (FAILED(hr) || irp->op != IRP_OP_WRITE) { return hr; } sg_nfc_transact( - &reader->nfc, - &reader->uart.readable, - reader->uart.written.bytes, - reader->uart.written.pos); + &sg_reader_nfc, + &sg_reader_uart.readable, + sg_reader_uart.written.bytes, + sg_reader_uart.written.pos); sg_led_transact( - &reader->led, - &reader->uart.readable, - reader->uart.written.bytes, - reader->uart.written.pos); + &sg_reader_led, + &sg_reader_uart.readable, + sg_reader_uart.written.bytes, + sg_reader_uart.written.pos); - reader->uart.written.pos = 0; + sg_reader_uart.written.pos = 0; return hr; } diff --git a/board/sg-reader.h b/board/sg-reader.h index 17236af..32f0231 100644 --- a/board/sg-reader.h +++ b/board/sg-reader.h @@ -2,27 +2,4 @@ #include -#include -#include - -#include "board/sg-led.h" -#include "board/sg-nfc.h" - -#include "hooklib/uart.h" - -struct sg_reader { - CRITICAL_SECTION lock; - struct uart uart; - uint8_t written_bytes[520]; - uint8_t readable_bytes[520]; - struct sg_nfc nfc; - struct sg_led led; -}; - -HRESULT sg_reader_init( - struct sg_reader *reader, - unsigned int port_no); - -bool sg_reader_match_irp(const struct sg_reader *reader, const struct irp *irp); - -HRESULT sg_reader_handle_irp(struct sg_reader *reader, struct irp *irp); +HRESULT sg_reader_hook_init(unsigned int port_no); diff --git a/cardhook/_com12.c b/cardhook/_com12.c deleted file mode 100644 index d2d277a..0000000 --- a/cardhook/_com12.c +++ /dev/null @@ -1,37 +0,0 @@ -#include - -#include - -#include "board/sg-reader.h" - -#include "cardhook/_com12.h" - -#include "hook/iohook.h" - -static HRESULT com12_handle_irp(struct irp *irp); - -static struct sg_reader com12_reader; - -HRESULT com12_hook_init(void) -{ - HRESULT hr; - - hr = sg_reader_init(&com12_reader, 12); - - if (FAILED(hr)) { - return hr; - } - - return iohook_push_handler(com12_handle_irp); -} - -static HRESULT com12_handle_irp(struct irp *irp) -{ - assert(irp != NULL); - - if (!sg_reader_match_irp(&com12_reader, irp)) { - return iohook_invoke_next(irp); - } - - return sg_reader_handle_irp(&com12_reader, irp); -} diff --git a/cardhook/_com12.h b/cardhook/_com12.h deleted file mode 100644 index 9f37744..0000000 --- a/cardhook/_com12.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -HRESULT com12_hook_init(void); diff --git a/cardhook/dllmain.c b/cardhook/dllmain.c index b810ca1..d6ec832 100644 --- a/cardhook/dllmain.c +++ b/cardhook/dllmain.c @@ -1,6 +1,6 @@ #include -#include "cardhook/_com12.h" +#include "board/sg-reader.h" #include "hook/process.h" @@ -15,9 +15,10 @@ static DWORD CALLBACK app_pre_startup(void) { dprintf("--- Begin %s ---\n", __func__); - serial_hook_init(); spike_hook_init("cardspike.txt"); - com12_hook_init(); + + serial_hook_init(); + sg_reader_hook_init(12); dprintf("--- End %s ---\n", __func__); diff --git a/cardhook/meson.build b/cardhook/meson.build index dae53e8..eb43917 100644 --- a/cardhook/meson.build +++ b/cardhook/meson.build @@ -14,7 +14,6 @@ shared_library( util_lib, ], sources : [ - '_com12.c', 'dllmain.c', ], ) diff --git a/divahook/_com10.c b/divahook/_com10.c deleted file mode 100644 index 7eb41b5..0000000 --- a/divahook/_com10.c +++ /dev/null @@ -1,38 +0,0 @@ -#include - -#include -#include - -#include "board/sg-reader.h" - -#include "divahook/_com10.h" - -#include "hook/iohook.h" - -static HRESULT com10_handle_irp(struct irp *irp); - -static struct sg_reader com10_reader; - -HRESULT com10_hook_init(void) -{ - HRESULT hr; - - hr = sg_reader_init(&com10_reader, 10); - - if (FAILED(hr)) { - return hr; - } - - return iohook_push_handler(com10_handle_irp); -} - -static HRESULT com10_handle_irp(struct irp *irp) -{ - assert(irp != NULL); - - if (!sg_reader_match_irp(&com10_reader, irp)) { - return iohook_invoke_next(irp); - } - - return sg_reader_handle_irp(&com10_reader, irp); -} diff --git a/divahook/_com10.h b/divahook/_com10.h deleted file mode 100644 index 2bedc59..0000000 --- a/divahook/_com10.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -HRESULT com10_hook_init(void); diff --git a/divahook/dllmain.c b/divahook/dllmain.c index 0a3df04..3db34b6 100644 --- a/divahook/dllmain.c +++ b/divahook/dllmain.c @@ -9,7 +9,8 @@ #include "amex/jvs.h" #include "amex/sram.h" -#include "divahook/_com10.h" +#include "board/sg-reader.h" + #include "divahook/jvs.h" #include "divahook/slider.h" @@ -51,8 +52,8 @@ static DWORD CALLBACK diva_pre_startup(void) /* Initialize Project Diva I/O board emulation */ - com10_hook_init(); diva_jvs_init(); + sg_reader_hook_init(10); slider_hook_init(); /* Initialize debug helpers */ diff --git a/divahook/meson.build b/divahook/meson.build index ea1a30f..b392e0b 100644 --- a/divahook/meson.build +++ b/divahook/meson.build @@ -19,7 +19,6 @@ shared_library( util_lib, ], sources : [ - '_com10.c', 'dllmain.c', 'jvs.c', 'jvs.h', diff --git a/idzhook/_com10.c b/idzhook/_com10.c deleted file mode 100644 index e00ed10..0000000 --- a/idzhook/_com10.c +++ /dev/null @@ -1,38 +0,0 @@ -#include - -#include -#include - -#include "board/sg-reader.h" - -#include "hook/iohook.h" - -#include "idzhook/_com10.h" - -static HRESULT com10_handle_irp(struct irp *irp); - -static struct sg_reader com10_reader; - -HRESULT com10_hook_init(void) -{ - HRESULT hr; - - hr = sg_reader_init(&com10_reader, 10); - - if (FAILED(hr)) { - return hr; - } - - return iohook_push_handler(com10_handle_irp); -} - -static HRESULT com10_handle_irp(struct irp *irp) -{ - assert(irp != NULL); - - if (!sg_reader_match_irp(&com10_reader, irp)) { - return iohook_invoke_next(irp); - } - - return sg_reader_handle_irp(&com10_reader, irp); -} diff --git a/idzhook/_com10.h b/idzhook/_com10.h deleted file mode 100644 index 2bedc59..0000000 --- a/idzhook/_com10.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -HRESULT com10_hook_init(void); diff --git a/idzhook/dllmain.c b/idzhook/dllmain.c index 5e6402c..5b8baff 100644 --- a/idzhook/dllmain.c +++ b/idzhook/dllmain.c @@ -9,11 +9,12 @@ #include "amex/jvs.h" #include "amex/sram.h" +#include "board/sg-reader.h" + #include "hook/process.h" #include "hooklib/serial.h" -#include "idzhook/_com10.h" #include "idzhook/jvs.h" #include "platform/hwmon.h" @@ -50,8 +51,8 @@ static DWORD CALLBACK idz_pre_startup(void) /* Initialize Initial D Zero I/O board emulation */ - com10_hook_init(); idz_jvs_init(); + sg_reader_hook_init(10); /* Initialize debug helpers */ diff --git a/idzhook/meson.build b/idzhook/meson.build index 5da0017..6c54744 100644 --- a/idzhook/meson.build +++ b/idzhook/meson.build @@ -19,7 +19,6 @@ shared_library( util_lib, ], sources : [ - '_com10.c', 'dllmain.c', 'jvs.c', 'jvs.h',