asukamikoto/segatools
1
0
Fork 0
forked from Dniel97/segatools
Code Pull Requests Activity

board/sg-reader.c: Improve life cycle

Browse Source
This commit is contained in:
Tau 2019-11-03 15:37:29 -05:00
parent 0e1cfb66db
commit fc345a46a7
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
board/sg-reader.c
View File

@ -39,6 +39,8 @@ static const struct sg_led_ops sg_reader_led_ops = {
}; };
static CRITICAL_SECTION sg_reader_lock; static CRITICAL_SECTION sg_reader_lock;
static bool sg_reader_started;
static HRESULT sg_reader_start_hr;
static struct uart sg_reader_uart; static struct uart sg_reader_uart;
static uint8_t sg_reader_written_bytes[520]; static uint8_t sg_reader_written_bytes[520];
static uint8_t sg_reader_readable_bytes[520]; static uint8_t sg_reader_readable_bytes[520];
@ -49,20 +51,12 @@ HRESULT sg_reader_hook_init(
const struct aime_config *cfg, const struct aime_config *cfg,
unsigned int port_no) unsigned int port_no)
{ {
HRESULT hr;
assert(cfg != NULL); assert(cfg != NULL);
if (!cfg->enable) { if (!cfg->enable) {
return S_FALSE; return S_FALSE;
} }
hr = aime_io_init();
if (FAILED(hr)) {
return hr;
}
sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, NULL); sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, NULL);
sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, NULL); sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, NULL);
@ -112,6 +106,31 @@ static HRESULT sg_reader_handle_irp_locked(struct irp *irp)
} }
#endif #endif
if (irp->op == IRP_OP_OPEN) {
/* Unfortunately the card reader UART gets opened and closed
repeatedly */
if (!sg_reader_started) {
dprintf("NFC Assembly: Starting backend DLL\n");
hr = aime_io_init();
sg_reader_started = true;
sg_reader_start_hr = hr;
if (FAILED(hr)) {
dprintf("NFC Assembly: Backend error: %x\n", (int) hr);
return hr;
}
} else {
hr = sg_reader_start_hr;
if (FAILED(hr)) {
return hr;
}
}
}
hr = uart_handle_irp(&sg_reader_uart, irp); hr = uart_handle_irp(&sg_reader_uart, irp);
if (FAILED(hr) || irp->op != IRP_OP_WRITE) { if (FAILED(hr) || irp->op != IRP_OP_WRITE) {