board/sg-reader.c: Push down aimeio.dll calls

This is kind of a layer break but the alternative is way too much
boilerplate to deal with.
This commit is contained in:
Tau
2019-03-16 11:42:36 -04:00
parent 458bf5b3de
commit 27663b4b19
4 changed files with 83 additions and 108 deletions

View File

@ -1,12 +1,7 @@
#include <windows.h>
#include <assert.h>
#include <stdint.h>
#include "aimeio/aimeio.h"
#include "board/sg-led.h"
#include "board/sg-nfc.h"
#include "board/sg-reader.h"
#include "cardhook/_com12.h"
@ -14,22 +9,6 @@
#include "hook/iohook.h"
static HRESULT com12_handle_irp(struct irp *irp);
static HRESULT com12_mifare_poll(void *ctx, uint32_t *uid);
static HRESULT com12_mifare_read_luid(
void *ctx,
uint32_t uid,
uint8_t *luid,
size_t nbytes);
static void com12_led_set_color(void *ctx, uint8_t r, uint8_t g, uint8_t b);
static const struct sg_nfc_ops com12_nfc_ops = {
.mifare_poll = com12_mifare_poll,
.mifare_read_luid = com12_mifare_read_luid,
};
static const struct sg_led_ops com12_led_ops = {
.set_color = com12_led_set_color,
};
static struct sg_reader com12_reader;
@ -37,14 +16,12 @@ HRESULT com12_hook_init(void)
{
HRESULT hr;
hr = aime_io_init();
hr = sg_reader_init(&com12_reader, 12);
if (FAILED(hr)) {
return hr;
}
sg_reader_init(&com12_reader, 12, &com12_nfc_ops, &com12_led_ops, NULL);
return iohook_push_handler(com12_handle_irp);
}
@ -52,24 +29,9 @@ 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);
}
static HRESULT com12_mifare_poll(void *ctx, uint32_t *uid)
{
return aime_io_mifare_poll(0, uid);
}
static HRESULT com12_mifare_read_luid(
void *ctx,
uint32_t uid,
uint8_t *luid,
size_t luid_size)
{
return aime_io_mifare_read_luid(0, uid, luid, luid_size);
}
static void com12_led_set_color(void *ctx, uint8_t r, uint8_t g, uint8_t b)
{
aime_io_led_set_color(0, r, g, b);
}