AkaiiKitsune/tal-cardreader
1
0
Fork 0
Code Pull Requests Releases 2 Activity

Merge branch 'tests'

Browse Source
This commit is contained in:
Farewell_ 2024-04-02 16:33:54 +02:00
commit 35f2245ed3
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build64.bat
View File

@ -2,6 +2,7 @@ cd /d %~dp0
REM Edit this with the right path to vcvarsall.bat. REM Edit this with the right path to vcvarsall.bat.
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
call "C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Auxiliary\Build\vcvarsall.bat" x64
meson setup build64 --buildtype=release meson setup build64 --buildtype=release
meson configure build64 meson configure build64
ninja -C build64 ninja -C build64

23
src/cardreader_plugin/dllmain.c
View File

@ -17,6 +17,10 @@ static bool HasCard = false;
bool usingSmartCard = false; bool usingSmartCard = false;
int readCooldown = 200; int readCooldown = 200;
typedef(QRCALL_proc)(char id[21]);
QRCALL_proc *QRCALL;
HANDLE bnusio_dll;
typedef void (*callbackTouch)(i32, i32, u8[168], u64); typedef void (*callbackTouch)(i32, i32, u8[168], u64);
callbackTouch touchCallback; callbackTouch touchCallback;
u64 touchData; u64 touchData;
@ -77,7 +81,7 @@ static unsigned int __stdcall reader_poll_thread_proc(void *ctx)
{ {
printWarning("%s (%s): Read card %02X%02X%02X%02X%02X%02X%02X%02X\n", __func__, module, UID[0], UID[1], UID[2], UID[3], UID[4], UID[5], UID[6], UID[7]); printWarning("%s (%s): Read card %02X%02X%02X%02X%02X%02X%02X%02X\n", __func__, module, UID[0], UID[1], UID[2], UID[3], UID[4], UID[5], UID[6], UID[7]);
if (waitingForTouch) // Check if game is waiting for a card. if (waitingForTouch || QRCALL) // Check if game is waiting for a card or a qr code.
{ {
// Properly format the AccessID // Properly format the AccessID
u64 ReversedAccessID; u64 ReversedAccessID;
@ -153,6 +157,17 @@ void reader_runner_stop()
void Init() void Init()
{ {
bnusio_dll = LoadLibrary(".\\bnusio.dll"); /*Explicit Load*/
if (bnusio_dll)
{
printWarning("%s (%s): Got bnusio !\n", __func__, module);
QRCALL = GetProcAddress(bnusio_dll, "qr_call");
if (QRCALL)
printWarning("%s (%s): Got QRCALL, using QR emulator !\n", __func__, module);
else
printWarning("%s (%s): Couldn't find QRCALL, using card emulator !\n", __func__, module);
}
printWarning("%s (%s): Starting HID Service...\n", __func__, module); printWarning("%s (%s): Starting HID Service...\n", __func__, module);
// Read config // Read config
@ -199,9 +214,15 @@ void Update()
// Insert card in game // Insert card in game
printInfo("%s (%s): Inserting Card %s, with ChipID %s\n", __func__, module, AccessID, ChipID); printInfo("%s (%s): Inserting Card %s, with ChipID %s\n", __func__, module, AccessID, ChipID);
if (QRCALL)
QRCALL(AccessID); // For CHN
else
{
memcpy(cardData + 0x2C, ChipID, 33); memcpy(cardData + 0x2C, ChipID, 33);
memcpy(cardData + 0x50, AccessID, 21); memcpy(cardData + 0x50, AccessID, 21);
touchCallback(0, 0, cardData, touchData); touchCallback(0, 0, cardData, touchData);
}
HasCard = false; HasCard = false;
} }