update readme

.clang-format

@@ -1,4 +0,0 @@
----
-BasedOnStyle: Google
-IndentWidth: 4
----

.gitignore

@@ -18,6 +18,3 @@ build/
 
 # External dependencies
 subprojects/capnhook
-
-# For enabling debug logging on local builds
-MesonLocalOptions.mk

.vscode/settings.json

@@ -1,4 +1,37 @@
 {
   "editor.formatOnSave": false,
   "mesonbuild.configureOnOpen": false,
+  "files.associations": {
+    "string.h": "c",
+    "stdbool.h": "c",
+    "windows.h": "c",
+    "dprintf.h": "c",
+    "touch.h": "c",
+    "mai2-dll.h": "c",
+    "led.h": "c",
+    "path.h": "c",
+    "reg.h": "c",
+    "platform.h": "c",
+    "procaddr.h": "c",
+    "table.h": "c",
+    "serial.h": "c",
+    "stdarg.h": "c",
+    "iphlpapi.h": "c",
+    "iptypes.h": "c",
+    "netenv.h": "c",
+    "nusec.h": "c",
+    "vfs.h": "c",
+    "ws2ipdef.h": "c",
+    "winternl.h": "c",
+    "wincrypt.h": "c",
+    "assert.h": "c",
+    "stdint.h": "c",
+    "limits.h": "c",
+    "stdlib.h": "c",
+    "config.h": "c",
+    "mu3-dll.h": "c",
+    "io4.h": "c",
+    "dvd.h": "c",
+    "uart.h": "c"
+  },
 }

Makefile

@@ -11,11 +11,6 @@ DOC_DIR := doc
 
 DIST_DIR := dist
 
-# Add "-D[option]=[value]" here as necessary
-MESON_OPTIONS :=
-# For options that shouldn't be committed
--include MesonLocalOptions.mk
-
 # -----------------------------------------------------------------------------
 # Targets
 # -----------------------------------------------------------------------------
@@ -24,9 +19,9 @@ include Package.mk
 
 .PHONY: build # Build the project
 build:
-	$(V)meson setup $(MESON_OPTIONS) --cross cross-mingw-32.txt $(BUILD_DIR_32)
+	$(V)meson --cross cross-mingw-32.txt $(BUILD_DIR_32)
 	$(V)ninja -C $(BUILD_DIR_32)
-	$(V)meson setup $(MESON_OPTIONS) --cross cross-mingw-64.txt $(BUILD_DIR_64)
+	$(V)meson --cross cross-mingw-64.txt $(BUILD_DIR_64)
 	$(V)ninja -C $(BUILD_DIR_64)
 
 .PHONY: dist # Build and create a zip distribution package

Package.mk

@@ -73,53 +73,6 @@ $(BUILD_DIR_ZIP)/idz.zip:
 	$(V)strip $(BUILD_DIR_ZIP)/idz/*.{exe,dll}
 	$(V)cd $(BUILD_DIR_ZIP)/idz ; zip -r ../idz.zip *
 
-$(BUILD_DIR_ZIP)/fgo.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/fgo
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/fgo/DEVICE
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/fgohook/fgohook.dll \
-		$(DIST_DIR)/fgo/segatools.ini \
-		$(DIST_DIR)/fgo/start.bat \
-    	$(BUILD_DIR_ZIP)/fgo
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-    	$(BUILD_DIR_ZIP)/fgo/DEVICE
-	$(V)strip $(BUILD_DIR_ZIP)/fgo/*.{exe,dll}
-	$(V)cd $(BUILD_DIR_ZIP)/fgo ; zip -r ../fgo.zip *
-
-$(BUILD_DIR_ZIP)/idac.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/idac
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/idac/DEVICE
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/idachook/idachook.dll \
-		$(DIST_DIR)/idac/segatools.ini \
-		$(DIST_DIR)/idac/config_hook.json \
-		$(DIST_DIR)/idac/start.bat \
-    	$(BUILD_DIR_ZIP)/idac
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-    	$(BUILD_DIR_ZIP)/idac/DEVICE
-	$(V)strip $(BUILD_DIR_ZIP)/idac/*.{exe,dll}
-	$(V)cd $(BUILD_DIR_ZIP)/idac ; zip -r ../idac.zip *
-
-$(BUILD_DIR_ZIP)/swdc.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/swdc
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/swdc/DEVICE
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/swdchook/swdchook.dll \
-		$(DIST_DIR)/swdc/segatools.ini \
-		$(DIST_DIR)/swdc/config_hook.json \
-		$(DIST_DIR)/swdc/start.bat \
-    	$(BUILD_DIR_ZIP)/swdc
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-    	$(BUILD_DIR_ZIP)/swdc/DEVICE
-	$(V)strip $(BUILD_DIR_ZIP)/swdc/*.{exe,dll}
-	$(V)cd $(BUILD_DIR_ZIP)/swdc ; zip -r ../swdc.zip *
-
 $(BUILD_DIR_ZIP)/mercury.zip:
 	$(V)echo ... $@
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mercury
@@ -135,27 +88,6 @@ $(BUILD_DIR_ZIP)/mercury.zip:
 	$(V)strip $(BUILD_DIR_ZIP)/mercury/*.{exe,dll}
 	$(V)cd $(BUILD_DIR_ZIP)/mercury ; zip -r ../mercury.zip *
 
-$(BUILD_DIR_ZIP)/chusan.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/chusan
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/chusan/DEVICE
-	$(V)cp $(DIST_DIR)/chusan/segatools.ini \
-		$(DIST_DIR)/chusan/config_hook.json \
-		$(DIST_DIR)/chusan/start.bat \
-		$(BUILD_DIR_ZIP)/chusan
-	$(V)cp $(BUILD_DIR_32)/chusanhook/chusanhook.dll \
-		$(BUILD_DIR_ZIP)/chusan/chusanhook_x86.dll
-	$(V)cp $(BUILD_DIR_64)/chusanhook/chusanhook.dll \
-		$(BUILD_DIR_ZIP)/chusan/chusanhook_x64.dll
-	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_ZIP)/chusan/inject_x86.exe
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_ZIP)/chusan/inject_x64.exe
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-		$(BUILD_DIR_ZIP)/chusan/DEVICE
-	for x in exe dll; do strip $(BUILD_DIR_ZIP)/chusan/*.$$x; done
-	$(V)cd $(BUILD_DIR_ZIP)/chusan ; zip -r ../chusan.zip *
 
 $(BUILD_DIR_ZIP)/mu3.zip:
 	$(V)echo ... $@
@@ -172,6 +104,21 @@ $(BUILD_DIR_ZIP)/mu3.zip:
 	$(V)strip $(BUILD_DIR_ZIP)/mu3/*.{exe,dll}
 	$(V)cd $(BUILD_DIR_ZIP)/mu3 ; zip -r ../mu3.zip *
 
+$(BUILD_DIR_ZIP)/hkb.zip:
+	$(V)echo ... $@
+	$(V)mkdir -p $(BUILD_DIR_ZIP)/hkb
+	$(V)mkdir -p $(BUILD_DIR_ZIP)/hkb/DEVICE
+	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
+		$(BUILD_DIR_64)/hkbhook/hkbhook.dll \
+		$(DIST_DIR)/hkb/segatools.ini \
+		$(DIST_DIR)/hkb/start.bat \
+    	$(BUILD_DIR_ZIP)/hkb
+	$(V)cp pki/billing.pub \
+		pki/ca.crt \
+    	$(BUILD_DIR_ZIP)/hkb/DEVICE
+	$(V)strip $(BUILD_DIR_ZIP)/hkb/*.{exe,dll}
+	$(V)cd $(BUILD_DIR_ZIP)/hkb ; zip -r ../hkb.zip *
+
 $(BUILD_DIR_ZIP)/mai2.zip:
 	$(V)echo ... $@
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mai2
@@ -187,59 +134,6 @@ $(BUILD_DIR_ZIP)/mai2.zip:
 	$(V)strip $(BUILD_DIR_ZIP)/mai2/*.{exe,dll}
 	$(V)cd $(BUILD_DIR_ZIP)/mai2 ; zip -r ../mai2.zip *
 
-$(BUILD_DIR_ZIP)/cm.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/cm
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/cm/DEVICE
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/cmhook/cmhook.dll \
-		$(DIST_DIR)/cm/config_hook.json \
-		$(DIST_DIR)/cm/segatools.ini \
-		$(DIST_DIR)/cm/start.bat \
-    	$(BUILD_DIR_ZIP)/cm
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-    	$(BUILD_DIR_ZIP)/cm/DEVICE
-	$(V)strip $(BUILD_DIR_ZIP)/cm/*.{exe,dll}
-	$(V)cd $(BUILD_DIR_ZIP)/cm ; zip -r ../cm.zip *
-
-$(BUILD_DIR_ZIP)/tokyo.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/tokyo
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/tokyo/DEVICE
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/tokyohook/tokyohook.dll \
-		$(DIST_DIR)/tokyo/config_hook.json \
-		$(DIST_DIR)/tokyo/segatools.ini \
-		$(DIST_DIR)/tokyo/start.bat \
-    	$(BUILD_DIR_ZIP)/tokyo
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-    	$(BUILD_DIR_ZIP)/tokyo/DEVICE
-	$(V)strip $(BUILD_DIR_ZIP)/tokyo/*.{exe,dll}
-	$(V)cd $(BUILD_DIR_ZIP)/tokyo ; zip -r ../tokyo.zip *
-
-$(BUILD_DIR_ZIP)/kemono.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/kemono
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/kemono/DEVICE
-	$(V)cp $(DIST_DIR)/kemono/segatools.ini \
-		$(DIST_DIR)/kemono/start.bat \
-		$(BUILD_DIR_ZIP)/kemono
-	$(V)cp $(BUILD_DIR_32)/kemonohook/kemonohook.dll \
-		$(BUILD_DIR_ZIP)/kemono/kemonohook_x86.dll
-	$(V)cp $(BUILD_DIR_64)/kemonohook/kemonohook.dll \
-		$(BUILD_DIR_ZIP)/kemono/kemonohook_x64.dll
-	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_ZIP)/kemono/inject_x86.exe
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_ZIP)/kemono/inject_x64.exe
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-		$(BUILD_DIR_ZIP)/kemono/DEVICE
-	for x in exe dll; do strip $(BUILD_DIR_ZIP)/kemono/*.$$x; done
-	$(V)cd $(BUILD_DIR_ZIP)/kemono ; zip -r ../kemono.zip *
-
 $(BUILD_DIR_ZIP)/doc.zip: \
 		$(DOC_DIR)/config \
 		$(DOC_DIR)/chunihook.md \
@@ -255,16 +149,10 @@ $(BUILD_DIR_ZIP)/segatools.zip: \
 		$(BUILD_DIR_ZIP)/diva.zip \
 		$(BUILD_DIR_ZIP)/doc.zip \
 		$(BUILD_DIR_ZIP)/idz.zip \
-		$(BUILD_DIR_ZIP)/idac.zip \
-		$(BUILD_DIR_ZIP)/swdc.zip \
 		$(BUILD_DIR_ZIP)/mercury.zip \
-		$(BUILD_DIR_ZIP)/chusan.zip \
 		$(BUILD_DIR_ZIP)/mu3.zip \
+		$(BUILD_DIR_ZIP)/hkb.zip \
 		$(BUILD_DIR_ZIP)/mai2.zip \
-		$(BUILD_DIR_ZIP)/cm.zip \
-		$(BUILD_DIR_ZIP)/tokyo.zip \
-		$(BUILD_DIR_ZIP)/fgo.zip \
-		$(BUILD_DIR_ZIP)/kemono.zip \
 		CHANGELOG.md \
 		README.md \
 

README.md

@@ -1,49 +1,2 @@
-# Segatools
+# This repository is no longer maintained
-
+Please see the new joint repository from [TeamTofuShop](https://gitea.tendokyu.moe/TeamTofuShop/segatools)
-Version: `2024-09-30`
-
-Loaders and hardware emulators for SEGA games that run on the Nu and ALLS platforms.
-
-## List of supported games
-
-* Card Maker
-  * starting from Card Maker
-* CHUNITHM
-  * up to [CHUNITHM PARADISE LOST](doc/chunihook.md)
-  * starting from CHUNITHM NEW!!
-* crossbeats REV.
-  * up to crossbeats REV. SUNRISE
-* Fate/Grand Order
-  * Fate/Grand Order Arcade
-* Hatsune Miku: Project DIVA Arcade
-  * up to Future Tone
-* Initial D
-  * [Initial D Arcade Stage Zero](doc/idzhook.md)
-  * Initial D THE ARCADE
-* maimai DX
-  * starting from maimai DX
-* Mario & Sonic
-  * Mario & Sonic at the Tokyo 2020 Olympics Arcade
-* O.N.G.E.K.I.
-  * starting from O.N.G.E.K.I.
-* SEGA World Drivers Championship
-  * SEGA World Drivers Championship 2019
-* WACCA
-  * starting from WACCA
-* Kemono Friends
-  * Kemono Friends 3: Planet Tours
-
-## End-users
-
-For setup and configuration guides, refer to the dedicated documents available for each game, see
-[the links in the previous section](#list-of-supported-games).
-
-## Contributors
-
-If you are/want to be a contributor of any kind, e.g. new features, bug fixes, documentation improvements, ..., please
-read the [contributing documentation](CONTRIBUTING.md), first.
-
-## Developers
-
-For development setup and instructions how to build the project, refer to the
-[dedicated development documentation](doc/development.md).

aimeio/aimeio.c

@@ -12,13 +12,11 @@
 
 #include "util/crc.h"
 #include "util/dprintf.h"
-#include "util/env.h"
 
 struct aime_io_config {
     wchar_t aime_path[MAX_PATH];
     wchar_t felica_path[MAX_PATH];
     bool felica_gen;
-    bool aime_gen;
     uint8_t vk_scan;
 };
 
@@ -42,11 +40,6 @@ static HRESULT aime_io_generate_felica(
         uint8_t *bytes,
         size_t nbytes);
 
-static HRESULT aime_io_generate_aime(
-        const wchar_t *path,
-        uint8_t *bytes,
-        size_t nbytes);
-
 static void aime_io_config_read(
         struct aime_io_config *cfg,
         const wchar_t *filename)
@@ -69,16 +62,11 @@ static void aime_io_config_read(
             cfg->felica_path,
             _countof(cfg->felica_path),
             filename);
+    dprintf("NFC: felicaPath GetLastError %lx\n", GetLastError());
 
     cfg->felica_gen = GetPrivateProfileIntW(
             L"aime",
             L"felicaGen",
-            0,
-            filename);
-
-    cfg->aime_gen = GetPrivateProfileIntW(
-            L"aime",
-            L"aimeGen",
             1,
             filename);
 
@@ -148,7 +136,7 @@ static HRESULT aime_io_generate_felica(
 
     srand(time(NULL));
 
-    for (i = 0; i < nbytes; i++) {
+    for (i = 0 ; i < nbytes ; i++) {
         bytes[i] = rand();
     }
 
@@ -163,7 +151,7 @@ static HRESULT aime_io_generate_felica(
         return E_FAIL;
     }
 
-    for (i = 0; i < nbytes; i++) {
+    for (i = 0 ; i < nbytes ; i++) {
         fprintf(f, "%02X", bytes[i]);
     }
 
@@ -175,47 +163,6 @@ static HRESULT aime_io_generate_felica(
     return S_OK;
 }
 
-static HRESULT aime_io_generate_aime(
-        const wchar_t *path,
-        uint8_t *bytes,
-        size_t nbytes)
-{
-    size_t i;
-    FILE *f;
-
-    assert(path != NULL);
-    assert(bytes != NULL);
-    assert(nbytes > 0);
-
-    srand(time(NULL));
-
-    /* AiMe IDs should not start with 3, due to a missing check for BananaPass IDs */
-    do {
-        for (i = 0; i < nbytes; i++) {
-            bytes[i] = rand() % 10 << 4 | rand() % 10;
-        }
-    } while (bytes[0] >> 4 == 3);
-
-    f = _wfopen(path, L"w");
-
-    if (f == NULL) {
-        dprintf("AimeIO DLL: %S: fopen failed: %i\n", path, (int) errno);
-
-        return E_FAIL;
-    }
-
-    for (i = 0; i < nbytes; i++) {
-        fprintf(f, "%02x", bytes[i]);
-    }
-
-    fprintf(f, "\n");
-    fclose(f);
-
-    dprintf("AimeIO DLL: Generated random AiMe ID\n");
-
-    return S_OK;
-}
-
 uint16_t aime_io_get_api_version(void)
 {
     return 0x0100;
@@ -223,7 +170,7 @@ uint16_t aime_io_get_api_version(void)
 
 HRESULT aime_io_init(void)
 {
-    aime_io_config_read(&aime_io_cfg, get_config_path());
+    aime_io_config_read(&aime_io_cfg, L".\\segatools.ini");
 
     return S_OK;
 }
@@ -263,22 +210,6 @@ HRESULT aime_io_nfc_poll(uint8_t unit_no)
         return S_OK;
     }
 
-    /* Try generating AiMe IC (if enabled) */
-
-    if (aime_io_cfg.aime_gen) {
-        hr = aime_io_generate_aime(
-                aime_io_cfg.aime_path,
-                aime_io_aime_id,
-                sizeof(aime_io_aime_id));
-
-        if (FAILED(hr)) {
-            return hr;
-        }
-
-        aime_io_aime_id_present = true;
-        return S_OK;
-    }
-
     /* Try FeliCa IC */
 
     hr = aime_io_read_id_file(

amex/ds.c

@@ -1,11 +1,11 @@
 #include <windows.h>
 #include <devioctl.h>
+#include <stdlib.h>
 #include <winioctl.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "amex/ds.h"

amex/jvs.c

@@ -184,14 +184,14 @@ static HRESULT jvs_ioctl_sense(struct irp *irp)
 
 static HRESULT jvs_ioctl_transact(struct irp *irp)
 {
-#if defined(LOG_JVS)
+#if 0
     dprintf("\nJVS Port: Outbound frame:\n");
     dump_const_iobuf(&irp->write);
 #endif
 
     jvs_bus_transact(jvs_root, irp->write.bytes, irp->write.nbytes, &irp->read);
 
-#if defined(LOG_JVS)
+#if 0
     dprintf("JVS Port: Inbound frame:\n");
     dump_iobuf(&irp->read);
     dprintf("\n");

board/aime-dll.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <windows.h>
-#include <stdbool.h>
 
 #include "aimeio/aimeio.h"
 
@@ -19,7 +18,6 @@ struct aime_dll {
 
 struct aime_dll_config {
     wchar_t path[MAX_PATH];
-    bool path64;
 };
 
 extern struct aime_dll aime_dll;

board/config.c

@@ -8,61 +8,19 @@
 #include "board/aime-dll.h"
 #include "board/config.h"
 #include "board/sg-reader.h"
-#include "board/vfd.h"
-
-#include "util/dprintf.h"
-
-// Check windows
-#if _WIN32 || _WIN64
-    #if _WIN64
-        #define ENV64BIT
-    #else
-        #define ENV32BIT
-    #endif
-#endif
-
-// Check GCC
-#if __GNUC__
-    #if __x86_64__ || __ppc64__
-        #define ENV64BIT
-    #else
-        #define ENV32BIT
-    #endif
-#endif
 
 static void aime_dll_config_load(struct aime_dll_config *cfg, const wchar_t *filename)
 {
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    // Workaround for x64/x86 external IO dlls
+    GetPrivateProfileStringW(
-    // path32 for 32bit, path64 for 64bit
-    // for else.. is that possible? idk
-
-    if (cfg->path64) {
-        #if defined(ENV32BIT)
-            // Always empty, due to amdaemon being 64 bit in 32 bit mode
-            memset(cfg->path, 0, sizeof(cfg->path));
-        #elif defined(ENV64BIT)
-            GetPrivateProfileStringW(
-                    L"aimeio",
-                    L"path",
-                    L"",
-                    cfg->path,
-                    _countof(cfg->path),
-                    filename);
-        #else
-            #error "Unknown environment"
-        #endif
-    } else {
-        GetPrivateProfileStringW(
             L"aimeio",
             L"path",
             L"",
             cfg->path,
             _countof(cfg->path),
             filename);
-    }
 }
 
 void aime_config_load(struct aime_config *cfg, const wchar_t *filename)
@@ -72,9 +30,6 @@ void aime_config_load(struct aime_config *cfg, const wchar_t *filename)
 
     aime_dll_config_load(&cfg->dll, filename);
     cfg->enable = GetPrivateProfileIntW(L"aime", L"enable", 1, filename);
-    cfg->port_no = GetPrivateProfileIntW(L"aime", L"portNo", 0, filename);
-    cfg->high_baudrate = GetPrivateProfileIntW(L"aime", L"highBaud", 1, filename);
-    cfg->gen = GetPrivateProfileIntW(L"aime", L"gen", 0, filename);
 }
 
 void io4_config_load(struct io4_config *cfg, const wchar_t *filename)
@@ -84,21 +39,3 @@ void io4_config_load(struct io4_config *cfg, const wchar_t *filename)
 
     cfg->enable = GetPrivateProfileIntW(L"io4", L"enable", 1, filename);
 }
-
-void vfd_config_load(struct vfd_config *cfg, const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    cfg->enable = GetPrivateProfileIntW(L"vfd", L"enable", 1, filename);
-    cfg->port_no = GetPrivateProfileIntW(L"vfd", L"portNo", 0, filename);
-    cfg->utf_conversion = GetPrivateProfileIntW(L"vfd", L"utfConversion", 0, filename);
-}
-
-void ffb_config_load(struct ffb_config *cfg, const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    cfg->enable = GetPrivateProfileIntW(L"ffb", L"enable", 1, filename);
-}

board/config.h

@@ -5,10 +5,6 @@
 
 #include "board/io4.h"
 #include "board/sg-reader.h"
-#include "board/vfd.h"
-#include "board/ffb.h"
 
 void aime_config_load(struct aime_config *cfg, const wchar_t *filename);
 void io4_config_load(struct io4_config *cfg, const wchar_t *filename);
-void vfd_config_load(struct vfd_config *cfg, const wchar_t *filename);
-void ffb_config_load(struct ffb_config *cfg, const wchar_t *filename);

board/ffb.c

@@ -1,235 +0,0 @@
-/*
-    Force Feedback Board (FFB)
-
-    This board is used by many SEGA games to provide force feedback to the player.
-    It is driven by the game software over a serial connection and is used by many
-    games such as SEGA World Drivers Championship, Initial D Arcade, ...
-
-    Part number in schematics is "838-15069 MOTOR DRIVE BD RS232/422 Board".
-
-    Some observations:
-    The maximal strength for any effect is 127, except Damper which maxes out at 40.
-    The period for rumble effects is in the range 0-40.
-*/
-
-#include "board/ffb.h"
-
-#include <assert.h>
-#include <stdint.h>
-#include <windows.h>
-
-#include "hook/iohook.h"
-#include "hooklib/uart.h"
-#include "util/dprintf.h"
-#include "util/dump.h"
-
-
-// request format:
-// 0x?? - sync + command
-// 0x?? - direction/additional command
-// 0x?? - strength
-// 0x?? - checksum (sum of everything except the sync byte)
-
-enum {
-    FFB_CMD_TOGGLE = 0x80,
-    FFB_CMD_CONSTANT_FORCE = 0x84,
-    FFB_CMD_RUMBLE = 0x85,
-    FFB_CMD_DAMPER = 0x86,
-};
-
-struct ffb_hdr {
-    uint8_t cmd;
-};
-
-union ffb_req_any {
-    struct ffb_hdr hdr;
-    uint8_t bytes[3];
-};
-
-static HRESULT ffb_handle_irp(struct irp *irp);
-
-static HRESULT ffb_req_dispatch(const union ffb_req_any *req);
-static HRESULT ffb_req_toggle(const uint8_t *bytes);
-static HRESULT ffb_req_constant_force(const uint8_t *bytes);
-static HRESULT ffb_req_rumble(const uint8_t *bytes);
-static HRESULT ffb_req_damper(const uint8_t *bytes);
-
-static const struct ffb_ops *ffb_ops;
-static struct uart ffb_uart;
-
-static bool ffb_started;
-static HRESULT ffb_start_hr;
-static uint8_t ffb_written[4];
-static uint8_t ffb_readable[4];
-
-/* Static variables to store maximum strength values */
-static uint8_t max_constant_force = 0;
-static uint8_t max_rumble = 0;
-static uint8_t max_period = 0;
-static uint8_t max_damper = 0;
-
-HRESULT ffb_hook_init(
-        const struct ffb_config *cfg,
-        const struct ffb_ops *ops,
-        unsigned int port_no)
-{
-    assert(cfg != NULL);
-    assert(ops != NULL);
-
-    if (!cfg->enable) {
-        return S_FALSE;
-    }
-
-    ffb_ops = ops;
-
-    uart_init(&ffb_uart, port_no);
-    ffb_uart.written.bytes = ffb_written;
-    ffb_uart.written.nbytes = sizeof(ffb_written);
-    ffb_uart.readable.bytes = ffb_readable;
-    ffb_uart.readable.nbytes = sizeof(ffb_readable);
-
-    dprintf("FFB: hook enabled.\n");
-
-    return iohook_push_handler(ffb_handle_irp);
-}
-
-static HRESULT ffb_handle_irp(struct irp *irp)
-{
-    HRESULT hr;
-
-    assert(irp != NULL);
-
-    if (!uart_match_irp(&ffb_uart, irp)) {
-        return iohook_invoke_next(irp);
-    }
-
-    hr = uart_handle_irp(&ffb_uart, irp);
-
-    if (FAILED(hr) || irp->op != IRP_OP_WRITE) {
-        return hr;
-    }
-
-    assert(&ffb_uart.written != NULL);
-    assert(ffb_uart.written.bytes != NULL || ffb_uart.written.nbytes == 0);
-    assert(ffb_uart.written.pos <= ffb_uart.written.nbytes);
-
-    // dprintf("FFB TX:\n");
-
-    hr = ffb_req_dispatch((const union ffb_req_any *) ffb_uart.written.bytes);
-
-    if (FAILED(hr)) {
-        dprintf("FFB: Processing error: %x\n", (int)hr);
-    }
-
-    // dump_iobuf(&ffb_uart.written);
-    ffb_uart.written.pos = 0;
-
-    return hr;
-}
-
-static HRESULT ffb_req_dispatch(const union ffb_req_any *req)
-{
-    switch (req->hdr.cmd) {
-    case FFB_CMD_TOGGLE:
-        return ffb_req_toggle(req->bytes);
-    case FFB_CMD_CONSTANT_FORCE:
-        return ffb_req_constant_force(req->bytes);
-    case FFB_CMD_RUMBLE:
-        return ffb_req_rumble(req->bytes);
-    case FFB_CMD_DAMPER:
-        return ffb_req_damper(req->bytes);
-
-    /* There are some test mode specfic commands which doesn't seem to be used in
-       game at all. The same is true for the initialization phase. */
-
-    default:
-        dprintf("FFB: Unhandled command %02x\n", req->hdr.cmd);
-
-        return S_OK;
-    }
-}
-
-static HRESULT ffb_req_toggle(const uint8_t *bytes)
-{
-    uint8_t activate = bytes[2];
-
-    if (activate == 0x01) {
-        dprintf("FFB: Activated\n");
-    } else {
-        dprintf("FFB: Deactivated\n");
-    }
-
-    if (ffb_ops->toggle != NULL) {
-        ffb_ops->toggle(activate == 0x01);
-    }
-
-    return S_OK;
-}
-
-static HRESULT ffb_req_constant_force(const uint8_t *bytes)
-{
-    // dprintf("FFB: Constant force\n");
-
-    uint8_t direction = bytes[1];
-    uint8_t force = bytes[2];
-
-    if (direction == 0x0) {
-        // Right
-        force = 128 - force;
-    }
-
-    // Update max strength if the current force is greater
-    if (force > max_constant_force) {
-        max_constant_force = force;
-    }
-
-    // dprintf("FFB: Constant Force Strength: %d (Max: %d)\n", force, max_constant_force);
-    if (ffb_ops->constant_force != NULL) {
-        ffb_ops->constant_force(direction, force);
-    }
-
-    return S_OK;
-}
-
-static HRESULT ffb_req_rumble(const uint8_t *bytes)
-{
-    // dprintf("FFB: Rumble\n");
-
-    uint8_t force = bytes[1];
-    uint8_t period = bytes[2];
-
-    // Update max strength if the current force is greater
-    if (force > max_rumble) {
-        max_rumble = force;
-    }
-
-    if (period > max_period) {
-        max_period = period;
-    }
-
-    // dprintf("FFB: Rumble Period: %d (Max %d), Strength: %d (Max: %d)\n", period, max_period, force, max_rumble);
-    if (ffb_ops->rumble != NULL) {
-        ffb_ops->rumble(force, period);
-    }
-
-    return S_OK;
-}
-
-static HRESULT ffb_req_damper(const uint8_t *bytes)
-{
-    // dprintf("FFB: Damper\n");
-
-    uint8_t force = bytes[2];
-
-    // Update max strength if the current force is greater
-    if (force > max_damper) {
-        max_damper = force;
-    }
-
-    // dprintf("FFB: Damper Strength: %d (Max: %d)\n", force, max_damper);
-    if (ffb_ops->damper != NULL) {
-        ffb_ops->damper(force);
-    }
-
-    return S_OK;
-}

board/ffb.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <windows.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-struct ffb_config {
-    bool enable;
-};
-
-struct ffb_ops {
-    void (*toggle)(bool active);
-    void (*constant_force)(uint8_t direction, uint8_t force);
-    void (*rumble)(uint8_t force, uint8_t period);
-    void (*damper)(uint8_t force);
-};
-
-HRESULT ffb_hook_init(
-        const struct ffb_config *cfg,
-        const struct ffb_ops *ops,
-        unsigned int port_no);

board/io3.c

@@ -80,11 +80,6 @@ static HRESULT io3_cmd_read_analogs(
         struct const_iobuf *req_buf,
         struct iobuf *resp_buf);
 
-static HRESULT io3_cmd_read_rotarys(
-        struct io3 *io3,
-        struct const_iobuf *req_buf,
-        struct iobuf *resp_buf);
-
 static HRESULT io3_cmd_write_gpio(
         struct io3 *io3,
         struct const_iobuf *req_buf,
@@ -122,13 +117,6 @@ static uint8_t io3_features[] = {
 
     0x03, 8, 10, 0,
 
-    /* Feature : 0x04 : Rotary inputs
-       Param1  :    4 : Number of rotary channels
-       Param2  :    0 : N/A
-       Param3  :    0 : N/A */
-
-    0x04, 4, 0, 0,
-
     /* Feature : 0x12 : GPIO outputs
        Param1  :    3 : Number of ports (8 bits per port)
        Param2  :    0 : N/A
@@ -232,9 +220,6 @@ static HRESULT io3_cmd(
     case JVS_CMD_READ_ANALOGS:
         return io3_cmd_read_analogs(io3, req, resp);
 
-    case JVS_CMD_READ_ROTARYS:
-        return io3_cmd_read_rotarys(io3, req, resp);
-
     case JVS_CMD_WRITE_GPIO:
         return io3_cmd_write_gpio(io3, req, resp);
 
@@ -391,7 +376,7 @@ static HRESULT io3_cmd_read_switches(
         return hr;
     }
 
-#if defined(LOG_IO3)
+#if 0
     dprintf("JVS I/O: Read switches, np=%i, bpp=%i\n",
             req.num_players,
             req.bytes_per_player);
@@ -552,60 +537,6 @@ static HRESULT io3_cmd_read_analogs(
 
 }
 
-static HRESULT io3_cmd_read_rotarys(
-        struct io3 *io3,
-        struct const_iobuf *req_buf,
-        struct iobuf *resp_buf)
-{
-    struct jvs_req_read_rotarys req;
-    uint16_t rotarys[4];
-    uint8_t i;
-    HRESULT hr;
-
-    /* Read req */
-
-    hr = iobuf_read(req_buf, &req, sizeof(req));
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    if (req.nrotarys > _countof(rotarys)) {
-        dprintf("JVS I/O: Invalid analog count %i\n", req.nrotarys);
-
-        return E_FAIL;
-    }
-
-    //dprintf("JVS I/O: Read rotarys, nrotarys=%i\n", req.nrotarys);
-
-    /* Write report byte */
-
-    hr = iobuf_write_8(resp_buf, 0x01);
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    /* Write analogs */
-
-    memset(rotarys, 0, sizeof(rotarys));
-
-    if (io3->ops->read_rotarys != NULL) {
-        io3->ops->read_rotarys(io3->ops_ctx, rotarys, req.nrotarys);
-    }
-
-    for (i = 0 ; i < req.nrotarys ; i++) {
-        hr = iobuf_write_be16(resp_buf, rotarys[i]);
-
-        if (FAILED(hr)) {
-            return hr;
-        }
-    }
-
-    return hr;
-
-}
-
 static HRESULT io3_cmd_write_gpio(
         struct io3 *io3,
         struct const_iobuf *req_buf,

board/io3.h

@@ -18,7 +18,6 @@ struct io3_ops {
     void (*write_gpio)(void *ctx, uint32_t state);
     void (*read_switches)(void *ctx, struct io3_switch_state *out);
     void (*read_analogs)(void *ctx, uint16_t *analogs, uint8_t nanalogs);
-    void (*read_rotarys)(void *ctx, uint16_t *rotaries, uint8_t nrotaries);
     void (*read_coin_counter)(void *ctx, uint8_t slot_no, uint16_t *out);
 };
 

board/io4.c

@@ -7,7 +7,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
 
 #include "board/config.h"
 #include "board/guid.h"
@@ -29,7 +28,7 @@ enum {
     IO4_CMD_CLEAR_BOARD_STATUS = 0x03,
     IO4_CMD_SET_GENERAL_OUTPUT = 0x04,
     IO4_CMD_SET_PWM_OUTPUT     = 0x05,
-    IO4_CMD_SET_UNIQUE_OUTPUT  = 0x41,
+    IO4_CMD_UNIMPLEMENTED      = 0x41,
     IO4_CMD_UPDATE_FIRMWARE    = 0x85,
 };
 
@@ -41,7 +40,7 @@ struct io4_report_in {
     uint16_t buttons[2];
     uint8_t system_status;
     uint8_t usb_status;
-    uint8_t unique_input[29];
+    uint8_t unknown[29];
 };
 
 static_assert(sizeof(struct io4_report_in) == 0x40, "IO4 IN report size");
@@ -49,7 +48,7 @@ static_assert(sizeof(struct io4_report_in) == 0x40, "IO4 IN report size");
 struct io4_report_out {
     uint8_t report_id;
     uint8_t cmd;
-    uint8_t payload[IO4_REPORT_OUT_PAYLOAD_LEN];
+    uint8_t payload[62];
 };
 
 static_assert(sizeof(struct io4_report_out) == 0x40, "IO4 OUT report size");
@@ -224,11 +223,7 @@ static HRESULT io4_handle_write(struct irp *irp)
         return S_OK;
 
     case IO4_CMD_SET_GENERAL_OUTPUT:
-        // dprintf("USB I/O: GPIO Out\n");
+        dprintf("USB I/O: GPIO Out\n");
-
-        if (io4_ops->write_gpio != NULL) {
-            return io4_ops->write_gpio(out.payload, IO4_REPORT_OUT_PAYLOAD_LEN);
-        }
 
         return S_OK;
 
@@ -237,15 +232,15 @@ static HRESULT io4_handle_write(struct irp *irp)
 
         return S_OK;
 
-    case IO4_CMD_SET_UNIQUE_OUTPUT:
-        // dprintf("USB I/O: Unique Out\n");
-
-        return S_OK;
-
     case IO4_CMD_UPDATE_FIRMWARE:
         dprintf("USB I/O: Update firmware..?\n");
 
-        return E_FAIL;
+        return E_FAIL;    
+        
+    case IO4_CMD_UNIMPLEMENTED:
+        //dprintf("USB I/O: Unimplemented cmd 41\n");
+
+        return S_OK;
 
     default:
         dprintf("USB I/O: Unknown command %02x\n", out.cmd);
@@ -321,7 +316,7 @@ static HRESULT io4_async_poll(void *ctx, struct irp *irp)
     /* Delay long enough for the instigating thread in amdaemon to be satisfied
        that all queued-up reports have been drained. */
 
-    // Sleep(1);
+    Sleep(1);
 
     /* Call into ops to poll the underlying inputs */
 

board/io4.h

@@ -5,8 +5,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#define IO4_REPORT_OUT_PAYLOAD_LEN 62
-
 enum {
     /* System buttons in button[0] */
 
@@ -27,7 +25,6 @@ struct io4_state {
 
 struct io4_ops {
     HRESULT (*poll)(void *ctx, struct io4_state *state);
-    HRESULT (*write_gpio)(uint8_t* payload, size_t len);
 };
 
 HRESULT io4_hook_init(

board/led15070-cmd.h

@@ -1,81 +0,0 @@
-#pragma once
-
-#include "board/led15070-frame.h"
-
-/* Command IDs */
-
-enum {
-    LED_15070_CMD_RESET                     = 0x10,
-    LED_15070_CMD_SET_INPUT                 = 0x28, // No known use case
-    LED_15070_CMD_SET_NORMAL_12BIT          = 0x30, // TODO
-    LED_15070_CMD_SET_NORMAL_8BIT           = 0x31,
-    LED_15070_CMD_SET_MULTI_FLASH_8BIT      = 0x32,
-    LED_15070_CMD_SET_MULTI_FADE_8BIT       = 0x33,
-    LED_15070_CMD_SET_PALETTE_7_NORMAL_LED  = 0x34, // No known use case
-    LED_15070_CMD_SET_PALETTE_6_FLASH_LED   = 0x35, // No known use case
-    LED_15070_CMD_SET_15DC_OUT              = 0x36, // No known use case
-    LED_15070_CMD_SET_15GS_OUT              = 0x37, // No known use case
-    LED_15070_CMD_SET_PSC_MAX               = 0x38, // No known use case
-    LED_15070_CMD_SET_FET_OUTPUT            = 0x39,
-    LED_15070_CMD_SET_GS_PALETTE            = 0x3A,
-    LED_15070_CMD_DC_UPDATE                 = 0x3B,
-    LED_15070_CMD_GS_UPDATE                 = 0x3C,
-    LED_15070_CMD_ROTATE                    = 0x3E, // No known use case, wtf is this?
-    LED_15070_CMD_SET_DC_DATA               = 0x3F,
-    LED_15070_CMD_EEPROM_WRITE              = 0x7B,
-    LED_15070_CMD_EEPROM_READ               = 0x7C,
-    LED_15070_CMD_ACK_ON                    = 0x7D,
-    LED_15070_CMD_ACK_OFF                   = 0x7E,
-    LED_15070_CMD_BOARD_INFO                = 0xF0,
-    LED_15070_CMD_BOARD_STATUS              = 0xF1,
-    LED_15070_CMD_FW_SUM                    = 0xF2,
-    LED_15070_CMD_PROTOCOL_VER              = 0xF3,
-    LED_15070_CMD_TO_BOOT_MODE              = 0xFD,
-    LED_15070_CMD_FW_UPDATE                 = 0xFE,
-};
-
-/* Response codes */
-
-enum {
-    LED_15070_STATUS_OK                     = 0x01,
-    LED_15070_STATUS_SUM_ERR                = 0x02,
-    LED_15070_STATUS_PARITY_ERR             = 0x03,
-    LED_15070_STATUS_FRAMING_ERR            = 0x04,
-    LED_15070_STATUS_OVERRUN_ERR            = 0x05,
-    LED_15070_STATUS_BUFFER_OVERFLOW        = 0x06,
-};
-
-enum {
-    LED_15070_REPORT_OK                     = 0x01,
-    LED_15070_REPORT_WAIT                   = 0x02,
-    LED_15070_REPORT_ERR1                   = 0x03,
-    LED_15070_REPORT_ERR2                   = 0x04,
-};
-
-/* Request data structures */
-
-struct led15070_req_any {
-    struct led15070_hdr hdr;
-    uint8_t cmd;
-    uint8_t payload[256];
-};
-
-/* Response data structures */
-
-struct led15070_resp_any {
-    struct led15070_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    uint8_t data[32];
-};
-
-struct led15070_resp_board_info {
-    struct led15070_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    char board_num[8];
-    uint8_t endcode; // Always 0xFF
-    uint8_t fw_ver;
-};

board/led15070-frame.c

@@ -1,194 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include "board/led15070-frame.h"
-
-#include "hook/iobuf.h"
-
-static void led15070_frame_sync(struct iobuf *src);
-static HRESULT led15070_frame_accept(const struct iobuf *dest);
-static HRESULT led15070_frame_encode_byte(struct iobuf *dest, uint8_t byte);
-
-/* Frame structure:
-
-   [0] Sync byte (0xE0)
-   [1] Destination address
-   [2] Source Address
-   [3] Length of data/payload
-   [4] Data/payload
-        For requests (host to board):
-            [0] Command
-            ... Payload
-        For responses (board to host):
-            [0] Status
-            [1] Command
-            [2] Report
-            ... Payload
-   [n] Checksum: Sum of all prior bytes (excluding sync byte)
-
-   Byte stuffing:
-
-   0xD0 is an escape byte. Un-escape the subsequent byte by adding 1. */
-
-static void led15070_frame_sync(struct iobuf *src)
-{
-    size_t i;
-
-    for (i = 0 ; i < src->pos && src->bytes[i] != 0xE0 ; i++);
-
-    src->pos -= i;
-    memmove(&src->bytes[0], &src->bytes[i], i);
-}
-
-static HRESULT led15070_frame_accept(const struct iobuf *dest)
-{
-    uint8_t checksum;
-    size_t i;
-
-    if (dest->pos < 3 || dest->pos != dest->bytes[3] + 5) {
-        return S_FALSE;
-    }
-
-    checksum = 0;
-
-    for (i = 1 ; i < dest->pos - 1 ; i++) {
-        checksum += dest->bytes[i];
-    }
-    
-    //dprintf("LED checksum %02x, expected %02x\n", checksum, dest->bytes[dest->pos - 1]);
-    
-    if (checksum != dest->bytes[dest->pos - 1]) {
-        return HRESULT_FROM_WIN32(ERROR_CRC);
-    }
-
-    return S_OK;
-}
-
-HRESULT led15070_frame_decode(struct iobuf *dest, struct iobuf *src)
-{
-    uint8_t byte;
-    bool escape;
-    size_t i;
-    HRESULT hr;
-
-    assert(dest != NULL);
-    assert(dest->bytes != NULL || dest->nbytes == 0);
-    assert(dest->pos <= dest->nbytes);
-    assert(src != NULL);
-    assert(src->bytes != NULL || src->nbytes == 0);
-    assert(src->pos <= src->nbytes);
-
-    led15070_frame_sync(src);
-
-    dest->pos = 0;
-    escape = false;
-
-    for (i = 0, hr = S_FALSE ; i < src->pos && hr == S_FALSE ; i++) {
-        /* Step the FSM to unstuff another byte */
-
-        byte = src->bytes[i];
-
-        if (dest->pos >= dest->nbytes) {
-            hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-        } else if (i == 0) {
-            dest->bytes[dest->pos++] = byte;
-        } else if (byte == 0xE0) {
-            hr = E_FAIL;
-        } else if (byte == 0xD0) {
-            if (escape) {
-                hr = E_FAIL;
-            }
-
-            escape = true;
-        } else if (escape) {
-            dest->bytes[dest->pos++] = byte + 1;
-            escape = false;
-        } else {
-            dest->bytes[dest->pos++] = byte;
-        }
-
-        /* Try to accept the packet we've built up so far */
-
-        if (SUCCEEDED(hr)) {
-            hr = led15070_frame_accept(dest);
-        }
-    }
-
-    /* Handle FSM terminal state */
-
-    if (hr != S_FALSE) {
-        /* Frame was either accepted or rejected, remove it from src */
-        memmove(&src->bytes[0], &src->bytes[i], src->pos - i);
-        src->pos -= i;
-    }
-
-    return hr;
-}
-
-HRESULT led15070_frame_encode(
-        struct iobuf *dest,
-        const void *ptr,
-        size_t nbytes)
-{
-    const uint8_t *src;
-    uint8_t checksum;
-    uint8_t byte;
-    size_t i;
-    HRESULT hr;
-
-    assert(dest != NULL);
-    assert(dest->bytes != NULL || dest->nbytes == 0);
-    assert(dest->pos <= dest->nbytes);
-    assert(ptr != NULL);
-
-    src = ptr;
-
-    assert(nbytes >= 3 && src[0] == 0xE0 && src[3] + 4 == nbytes);
-
-    if (dest->pos >= dest->nbytes) {
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-    }
-
-    dest->bytes[dest->pos++] = 0xE0;
-    checksum = 0;
-    // dprintf("%02x ", 0xe0);
-
-    for (i = 1 ; i < nbytes ; i++) {
-        byte = src[i];
-        checksum += byte;
-        // dprintf("%02x ", byte);
-
-        hr = led15070_frame_encode_byte(dest, byte);
-
-        if (FAILED(hr)) {
-            return hr;
-        }
-    }
-    // dprintf("%02x \n", checksum);
-
-    return led15070_frame_encode_byte(dest, checksum);
-}
-
-static HRESULT led15070_frame_encode_byte(struct iobuf *dest, uint8_t byte)
-{
-    if (byte == 0xE0 || byte == 0xD0) {
-        if (dest->pos + 2 > dest->nbytes) {
-            return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-        }
-
-        dest->bytes[dest->pos++] = 0xD0;
-        dest->bytes[dest->pos++] = byte - 1;
-    } else {
-        if (dest->pos + 1 > dest->nbytes) {
-            return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-        }
-
-        dest->bytes[dest->pos++] = byte;
-    }
-
-    return S_OK;
-}

board/led15070-frame.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "hook/iobuf.h"
-
-enum {
-    LED_15070_FRAME_SYNC = 0xE0,
-};
-
-struct led15070_hdr {
-    uint8_t sync;
-    uint8_t dest_adr;
-    uint8_t src_adr;
-    uint8_t nbytes;
-};
-
-HRESULT led15070_frame_decode(struct iobuf *dest, struct iobuf *src);
-
-HRESULT led15070_frame_encode(
-        struct iobuf *dest,
-        const void *ptr,
-        size_t nbytes);

board/led15070.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-struct led15070_config {
-    bool enable;
-    unsigned int port_no;
-    char board_number[8];
-    uint8_t fw_ver;
-    uint16_t fw_sum;
-    wchar_t eeprom_path[MAX_PATH];
-};
-
-typedef HRESULT (*io_led_init_t)(void);
-typedef void (*io_led_set_fet_output_t)(const uint8_t *rgb);
-typedef void (*io_led_dc_update_t)(const uint8_t *rgb);
-typedef void (*io_led_gs_update_t)(const uint8_t *rgb);
-
-HRESULT led15070_hook_init(
-        const struct led15070_config *cfg,
-        io_led_init_t _led_init,
-        io_led_set_fet_output_t _led_set_fet_output,
-        io_led_dc_update_t _led_dc_update,
-        io_led_gs_update_t _led_gs_update,
-        unsigned int first_port,
-        unsigned int num_boards);

board/led15093-cmd.h

@@ -1,222 +0,0 @@
-#pragma once
-
-#include "board/led15093-frame.h"
-
-/* Command IDs */
-
-enum {
-    LED_15093_CMD_RESET                 = 0x10,
-    LED_15093_CMD_SET_TIMEOUT           = 0x11,
-    LED_15093_CMD_UNK1                  = 0x12,
-    LED_15093_CMD_SET_DISABLE_RESPONSE  = 0x14,
-    LED_15093_CMD_SET_ID                = 0x18,
-    LED_15093_CMD_CLEAR_ID              = 0x19,
-    LED_15093_CMD_SET_MAX_BRIGHT        = 0x3F, // TODO
-    LED_15093_CMD_UPDATE_LED            = 0x80,
-    LED_15093_CMD_SET_LED               = 0x81,
-    LED_15093_CMD_SET_IMM_LED           = 0x82,
-    LED_15093_CMD_SET_FADE_LED          = 0x83,
-    LED_15093_CMD_SET_FADE_LEVEL        = 0x84,
-    LED_15093_CMD_SET_FADE_SHIFT        = 0x85,
-    LED_15093_CMD_SET_AUTO_SHIFT        = 0x86,
-    LED_15093_CMD_GET_BOARD_INFO        = 0xF0,
-    LED_15093_CMD_GET_BOARD_STATUS      = 0xF1,
-    LED_15093_CMD_GET_FW_SUM            = 0xF2,
-    LED_15093_CMD_GET_PROTOCOL_VER      = 0xF3,
-    LED_15093_CMD_SET_BOOTMODE          = 0xFD,
-    LED_15093_CMD_FW_UPDATE             = 0xFE,
-};
-
-/* Response codes */
-
-enum {
-    LED_15093_STATUS_OK                     = 0x01,
-    LED_15093_STATUS_ERR_SUM                = 0x02,
-    LED_15093_STATUS_ERR_PARITY             = 0x03,
-    LED_15093_STATUS_ERR_FRAMING            = 0x04,
-    LED_15093_STATUS_ERR_OVERRUN            = 0x05,
-    LED_15093_STATUS_ERR_BUFFER_OVERFLOW    = 0x06,
-};
-
-enum {
-    LED_15093_REPORT_OK                     = 0x01,
-    LED_15093_REPORT_WAIT                   = 0x02,
-    LED_15093_REPORT_ERR1                   = 0x03,
-    LED_15093_REPORT_ERR2                   = 0x04,
-};
-
-/* Status bitmasks */
-
-enum {
-    LED_15093_STATUS_UART_ERR_SUM               = 0x01,
-    LED_15093_STATUS_UART_ERR_PARITY            = 0x02,
-    LED_15093_STATUS_UART_ERR_FRAMING           = 0x04,
-    LED_15093_STATUS_UART_ERR_OVERRUN           = 0x08,
-    LED_15093_STATUS_UART_ERR_BUFFER_OVERFLOW   = 0x10,
-};
-
-enum {
-    LED_15093_STATUS_BOARD_ERR_WDT              = 0x01,
-    LED_15093_STATUS_BOARD_ERR_TIMEOUT          = 0x02,
-    LED_15093_STATUS_BOARD_ERR_RESET            = 0x04,
-    LED_15093_STATUS_BOARD_ERR_BOR              = 0x08,
-};
-
-enum {
-    LED_15093_STATUS_CMD_ERR_BUSY               = 0x01,
-    LED_15093_STATUS_CMD_ERR_UNKNOWN            = 0x02,
-    LED_15093_STATUS_CMD_ERR_PARAM              = 0x04,
-    LED_15093_STATUS_CMD_ERR_EXE                = 0x08,
-};
-
-/* Status types for internal use */
-
-enum {
-    LED_15093_STATUS_TYPE_BOARD     = 1,
-    LED_15093_STATUS_TYPE_UART      = 2,
-    LED_15093_STATUS_TYPE_CMD       = 3,
-};
-
-/* Request data structures */
-
-struct led15093_req_reset {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    uint8_t r_type;
-};
-
-struct led15093_req_set_timeout {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    uint16_t count;
-};
-
-struct led15093_req_set_disable_response {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    bool sw;
-};
-
-struct led15093_req_set_id {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    uint8_t id;
-};
-
-struct led15093_req_set_led {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    uint8_t data[198];
-};
-
-struct led15093_req_set_fade_level {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    uint8_t depth;
-    uint8_t cycle;
-};
-
-struct led15093_req_set_fade_shift {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    uint8_t target;
-};
-
-struct led15093_req_set_auto_shift {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    uint8_t count;
-    uint8_t target;
-};
-
-struct led15093_req_get_board_status {
-    struct led15093_req_hdr hdr;
-    uint8_t cmd;
-    bool clear;
-};
-
-union led15093_req_any {
-    struct led15093_req_hdr hdr;
-    struct led15093_req_reset reset;
-    struct led15093_req_set_timeout set_timeout;
-    struct led15093_req_set_disable_response set_disable_response;
-    struct led15093_req_set_id set_id;
-    struct led15093_req_set_led set_led;
-    struct led15093_req_set_fade_level set_fade_level;
-    struct led15093_req_set_fade_shift set_fade_shift;
-    struct led15093_req_set_auto_shift set_auto_shift;
-    struct led15093_req_get_board_status get_board_status;
-    uint8_t payload[256];
-};
-
-/* Response data structures */
-
-struct led15093_resp_any {
-    struct led15093_resp_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    uint8_t data[32];
-};
-
-struct led15093_resp_timeout {
-    struct led15093_resp_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    uint8_t count_upper;
-    uint8_t count_lower;
-};
-
-struct led15093_resp_fw_sum {
-    struct led15093_resp_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    uint8_t sum_upper;
-    uint8_t sum_lower;
-};
-
-struct led15093_resp_board_info_legacy {
-    struct led15093_resp_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    char board_num[8];
-    uint8_t lf; // 0x0A (ASCII LF)
-    char chip_num[5];
-    uint8_t endcode; // Always 0xFF
-    uint8_t fw_ver;
-};
-
-struct led15093_resp_board_info {
-    struct led15093_resp_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    char board_num[8];
-    uint8_t lf; // 0x0A (ASCII LF)
-    char chip_num[5];
-    uint8_t endcode; // Always 0xFF
-    uint8_t fw_ver;
-    uint16_t rx_buf;
-};
-
-struct led15093_resp_protocol_ver {
-    struct led15093_resp_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    uint8_t mode;
-    uint8_t major_ver;
-    uint8_t minor_ver;
-};
-
-struct led15093_resp_set_auto_shift {
-    struct led15093_resp_hdr hdr;
-    uint8_t status;
-    uint8_t cmd;
-    uint8_t report;
-    uint8_t count;
-    uint8_t target;
-};

board/led15093-frame.c

@@ -1,196 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include "board/led15093-frame.h"
-
-#include "hook/iobuf.h"
-
-static void led15093_frame_sync(struct iobuf *src);
-static HRESULT led15093_frame_accept(const struct iobuf *dest);
-static HRESULT led15093_frame_encode_byte(struct iobuf *dest, uint8_t byte);
-
-/* Frame structure:
-
-   [0] Sync byte (0xE0)
-   [1] Destination address
-   [2] Source Address
-   [3] Length of data/payload
-   [4] Data/payload
-        For requests (host to board):
-            [0] Command
-            ... Payload
-        For responses (board to host):
-            [0] Status
-            [1] Command
-            [2] Report
-            ... Payload
-   [n] Checksum: Sum of all prior bytes (excluding sync byte)
-
-   Byte stuffing:
-
-   0xD0 is an escape byte. Un-escape the subsequent byte by adding 1. */
-
-static void led15093_frame_sync(struct iobuf *src)
-{
-    size_t i;
-
-    for (i = 0 ; i < src->pos && src->bytes[i] != LED_15093_FRAME_SYNC ; i++);
-
-    src->pos -= i;
-    memmove(&src->bytes[0], &src->bytes[i], i);
-}
-
-static HRESULT led15093_frame_accept(const struct iobuf *dest)
-{
-    uint8_t checksum;
-    size_t i;
-
-    if (dest->pos < 3 || dest->pos != dest->bytes[3] + 5) {
-        return S_FALSE;
-    }
-
-    checksum = 0;
-
-    for (i = 1 ; i < dest->pos - 1 ; i++) {
-        checksum += dest->bytes[i];
-    }
-
-    // dprintf("LED checksum %02x, expected %02x\n", checksum, dest->bytes[dest->pos - 1]);
-
-    if (checksum != dest->bytes[dest->pos - 1]) {
-        return HRESULT_FROM_WIN32(ERROR_CRC);
-    }
-
-    return S_OK;
-}
-
-HRESULT led15093_frame_decode(struct iobuf *dest, struct iobuf *src)
-{
-    uint8_t byte;
-    bool escape;
-    size_t i;
-    HRESULT hr;
-
-    assert(dest != NULL);
-    assert(dest->bytes != NULL || dest->nbytes == 0);
-    assert(dest->pos <= dest->nbytes);
-    assert(src != NULL);
-    assert(src->bytes != NULL || src->nbytes == 0);
-    assert(src->pos <= src->nbytes);
-
-    led15093_frame_sync(src);
-
-    dest->pos = 0;
-    escape = false;
-
-    for (i = 0, hr = S_FALSE ; i < src->pos && hr == S_FALSE ; i++) {
-        /* Step the FSM to unstuff another byte */
-
-        byte = src->bytes[i];
-
-        if (dest->pos >= dest->nbytes) {
-            hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-        } else if (i == 0) {
-            dest->bytes[dest->pos++] = byte;
-        } else if (byte == LED_15093_FRAME_SYNC) {
-            hr = E_FAIL;
-        } else if (byte == LED_15093_FRAME_ESC) {
-            if (escape) {
-                hr = E_FAIL;
-            }
-
-            escape = true;
-        } else if (escape) {
-            dest->bytes[dest->pos++] = byte + 1;
-            escape = false;
-        } else {
-            dest->bytes[dest->pos++] = byte;
-        }
-
-        /* Try to accept the packet we've built up so far */
-
-        if (SUCCEEDED(hr)) {
-            hr = led15093_frame_accept(dest);
-        }
-    }
-
-    /* Handle FSM terminal state */
-
-    if (hr != S_FALSE) {
-        /* Frame was either accepted or rejected, remove it from src */
-        memmove(&src->bytes[0], &src->bytes[i], src->pos - i);
-        src->pos -= i;
-    }
-
-    return hr;
-}
-
-HRESULT led15093_frame_encode(
-        struct iobuf *dest,
-        const void *ptr,
-        size_t nbytes)
-{
-    const uint8_t *src;
-    uint8_t checksum;
-    uint8_t byte;
-    size_t i;
-    HRESULT hr;
-
-    assert(dest != NULL);
-    assert(dest->bytes != NULL || dest->nbytes == 0);
-    assert(dest->pos <= dest->nbytes);
-    assert(ptr != NULL);
-
-    src = ptr;
-
-    assert(nbytes >= 3 &&
-            src[0] == LED_15093_FRAME_SYNC &&
-            src[3] + 4 == nbytes);
-
-    if (dest->pos >= dest->nbytes) {
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-    }
-
-    dest->bytes[dest->pos++] = LED_15093_FRAME_SYNC;
-    checksum = 0;
-    // dprintf("%02x ", LED_15093_FRAME_SYNC);
-
-    for (i = 1 ; i < nbytes ; i++) {
-        byte = src[i];
-        checksum += byte;
-        // dprintf("%02x ", byte);
-
-        hr = led15093_frame_encode_byte(dest, byte);
-
-        if (FAILED(hr)) {
-            return hr;
-        }
-    }
-    // dprintf("%02x \n", checksum);
-
-    return led15093_frame_encode_byte(dest, checksum);
-}
-
-static HRESULT led15093_frame_encode_byte(struct iobuf *dest, uint8_t byte)
-{
-    if (byte == LED_15093_FRAME_SYNC || byte == LED_15093_FRAME_ESC) {
-        if (dest->pos + 2 > dest->nbytes) {
-            return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-        }
-
-        dest->bytes[dest->pos++] = LED_15093_FRAME_ESC;
-        dest->bytes[dest->pos++] = byte - 1;
-    } else {
-        if (dest->pos + 1 > dest->nbytes) {
-            return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-        }
-
-        dest->bytes[dest->pos++] = byte;
-    }
-
-    return S_OK;
-}

board/led15093-frame.h

@@ -1,34 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "hook/iobuf.h"
-
-enum {
-    LED_15093_FRAME_SYNC = 0xE0,
-    LED_15093_FRAME_ESC  = 0xD0,
-};
-
-struct led15093_req_hdr {
-    uint8_t sync;
-    uint8_t dest_adr;
-    uint8_t src_adr;
-    uint8_t nbytes;
-};
-
-struct led15093_resp_hdr {
-    uint8_t sync;
-    uint8_t dest_adr;
-    uint8_t src_adr;
-    uint8_t nbytes;
-};
-
-HRESULT led15093_frame_decode(struct iobuf *dest, struct iobuf *src);
-
-HRESULT led15093_frame_encode(
-        struct iobuf *dest,
-        const void *ptr,
-        size_t nbytes);

board/led15093.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-struct led15093_config {
-    bool enable;
-    bool high_baudrate;
-    unsigned int port_no;
-    char board_number[8];
-    char chip_number[5];
-    char boot_chip_number[5];
-    uint8_t fw_ver;
-    uint16_t fw_sum;
-};
-
-typedef HRESULT (*io_led_init_t)(void);
-typedef void (*io_led_set_leds_t)(uint8_t board, uint8_t *rgb);
-
-HRESULT led15093_hook_init(const struct led15093_config *cfg, io_led_init_t _led_init, 
-    io_led_set_leds_t _set_leds, unsigned int first_port, unsigned int num_boards, uint8_t board_adr, uint8_t host_adr);
-

board/meson.build

@@ -19,16 +19,6 @@ board_lib = static_library(
         'io3.h',
         'io4.c',
         'io4.h',
-        'led15093-cmd.h',
-        'led15093-frame.c',
-        'led15093-frame.h',
-        'led15093.c',
-        'led15093.h',
-        'led15070-cmd.h',
-        'led15070-frame.c',
-        'led15070-frame.h',
-        'led15070.c',
-        'led15070.h',
         'sg-cmd.c',
         'sg-cmd.h',
         'sg-frame.c',
@@ -46,10 +36,5 @@ board_lib = static_library(
         'slider-frame.h',
         'vfd.c',
         'vfd.h',
-        'vfd-cmd.h',
-        'vfd-frame.c',
-        'vfd-frame.h',
-        'ffb.c',
-        'ffb.h'
     ],
 )

board/sg-cmd.h

@@ -25,13 +25,6 @@ struct sg_res_header {
     uint8_t payload_len;
 };
 
-/* struct to save the version string with its length
-   to fix NUL terminator issues */
-struct version_info {
-    const char *version;
-    uint8_t length;
-};
-
 typedef HRESULT (*sg_dispatch_fn_t)(
         void *ctx,
         const void *req,

board/sg-led-cmd.h

@@ -17,7 +17,7 @@ struct sg_led_res_reset {
 
 struct sg_led_res_get_info {
     struct sg_res_header res;
-    char payload[12];
+    uint8_t payload[9];
 };
 
 struct sg_led_req_set_color {

board/sg-led.c

@@ -27,18 +27,14 @@ static HRESULT sg_led_cmd_set_color(
         const struct sg_led *led,
         const struct sg_led_req_set_color *req);
 
-static const struct version_info led_version[] = {
+static const uint8_t sg_led_info[] = {
-    {"15084\xFF\x10\x00\x12", 9},
+    '1', '5', '0', '8', '4', 0xFF, 0x10, 0x00, 0x12,
-    {"000-00000\xFF\x11\x40", 12},
-    // maybe the same?
-    {"000-00000\xFF\x11\x40", 12}
 };
 
 void sg_led_init(
         struct sg_led *led,
         uint8_t addr,
         const struct sg_led_ops *ops,
-        unsigned int gen,
         void *ctx)
 {
     assert(led != NULL);
@@ -47,7 +43,6 @@ void sg_led_init(
     led->ops = ops;
     led->ops_ctx = ctx;
     led->addr = addr;
-    led->gen = gen;
 }
 
 void sg_led_transact(
@@ -155,11 +150,8 @@ static HRESULT sg_led_cmd_get_info(
         struct sg_led_res_get_info *res)
 {
     sg_led_dprintf(led, "Get info\n");
-
+    sg_res_init(&res->res, req, sizeof(res->payload));
-    const struct version_info *fw = &led_version[led->gen - 1];
+    memcpy(res->payload, sg_led_info, sizeof(sg_led_info));
-
-    sg_res_init(&res->res, req, fw->length);
-    memcpy(res->payload, fw->version, fw->length);
 
     return S_OK;
 }

board/sg-led.h

@@ -15,14 +15,12 @@ struct sg_led {
     const struct sg_led_ops *ops;
     void *ops_ctx;
     uint8_t addr;
-    unsigned int gen;
 };
 
 void sg_led_init(
         struct sg_led *led,
         uint8_t addr,
         const struct sg_led_ops *ops,
-        unsigned int gen,
         void *ctx);
 
 void sg_led_transact(

board/sg-nfc-cmd.h

@@ -5,21 +5,18 @@
 #pragma pack(push, 1)
 
 enum {
-    SG_NFC_CMD_GET_FW_VERSION        = 0x30,
+    SG_NFC_CMD_GET_FW_VERSION       = 0x30,
-    SG_NFC_CMD_GET_HW_VERSION        = 0x32,
+    SG_NFC_CMD_GET_HW_VERSION       = 0x32,
-    SG_NFC_CMD_RADIO_ON              = 0x40,
+    SG_NFC_CMD_RADIO_ON             = 0x40,
-    SG_NFC_CMD_RADIO_OFF             = 0x41,
+    SG_NFC_CMD_RADIO_OFF            = 0x41,
-    SG_NFC_CMD_POLL                  = 0x42,
+    SG_NFC_CMD_POLL                 = 0x42,
-    SG_NFC_CMD_MIFARE_SELECT_TAG     = 0x43,
+    SG_NFC_CMD_MIFARE_SELECT_TAG    = 0x43,
-    SG_NFC_CMD_MIFARE_SET_KEY_AIME   = 0x50,
+    SG_NFC_CMD_MIFARE_SET_KEY_BANA  = 0x50,
-    SG_NFC_CMD_MIFARE_AUTHENTICATE_A = 0x51,
+    SG_NFC_CMD_MIFARE_READ_BLOCK    = 0x52,
-    SG_NFC_CMD_MIFARE_READ_BLOCK     = 0x52,
+    SG_NFC_CMD_MIFARE_SET_KEY_AIME  = 0x54,
-    SG_NFC_CMD_MIFARE_SET_KEY_BANA   = 0x54,
+    SG_NFC_CMD_MIFARE_AUTHENTICATE  = 0x55, /* guess based on time sent */
-    SG_NFC_CMD_MIFARE_AUTHENTICATE_B = 0x55,
+    SG_NFC_CMD_RESET                = 0x62,
-    SG_NFC_CMD_TO_UPDATE_MODE        = 0x60,
+    SG_NFC_CMD_FELICA_ENCAP         = 0x71,
-    SG_NFC_CMD_SEND_HEX_DATA         = 0x61,
-    SG_NFC_CMD_RESET                 = 0x62,
-    SG_NFC_CMD_FELICA_ENCAP          = 0x71,
 };
 
 struct sg_nfc_res_get_fw_version {
@@ -34,7 +31,7 @@ struct sg_nfc_res_get_hw_version {
 
 struct sg_nfc_req_mifare_set_key {
     struct sg_req_header req;
-    uint8_t key[6];
+    uint8_t key_a[6];
 };
 
 struct sg_nfc_req_mifare_50 {

board/sg-nfc.c

@@ -60,33 +60,15 @@ static HRESULT sg_nfc_cmd_felica_encap(
         const struct sg_nfc_req_felica_encap *req,
         struct sg_nfc_res_felica_encap *res);
 
-static HRESULT sg_nfc_cmd_send_hex_data(
-        struct sg_nfc *nfc,
-        const struct sg_req_header *req,
-        struct sg_res_header *res);
-
 static HRESULT sg_nfc_cmd_dummy(
         struct sg_nfc *nfc,
         const struct sg_req_header *req,
         struct sg_res_header *res);
 
-static const struct version_info hw_version[] = {
-    {"TN32MSEC003S H/W Ver3.0", 23},
-    {"837-15286", 9},
-    {"837-15396", 9}
-};
-
-static const struct version_info fw_version[] = {
-    {"TN32MSEC003S F/W Ver1.2", 23},
-    {"\x94", 1},
-    {"\x94", 1}
-};
-
 void sg_nfc_init(
         struct sg_nfc *nfc,
         uint8_t addr,
         const struct sg_nfc_ops *ops,
-        unsigned int gen,
         void *ops_ctx)
 {
     assert(nfc != NULL);
@@ -95,7 +77,6 @@ void sg_nfc_init(
     nfc->ops = ops;
     nfc->ops_ctx = ops_ctx;
     nfc->addr = addr;
-    nfc->gen = gen;
 }
 
 #ifdef NDEBUG
@@ -189,17 +170,12 @@ static HRESULT sg_nfc_dispatch(
                 &req->felica_encap,
                 &res->felica_encap);
 
-    case SG_NFC_CMD_MIFARE_AUTHENTICATE_A:
+    case SG_NFC_CMD_MIFARE_AUTHENTICATE:
-    case SG_NFC_CMD_MIFARE_AUTHENTICATE_B:
-    case SG_NFC_CMD_SEND_HEX_DATA:
-        return sg_nfc_cmd_send_hex_data(nfc, &req->simple, &res->simple);
-
     case SG_NFC_CMD_MIFARE_SELECT_TAG:
     case SG_NFC_CMD_MIFARE_SET_KEY_AIME:
     case SG_NFC_CMD_MIFARE_SET_KEY_BANA:
     case SG_NFC_CMD_RADIO_ON:
     case SG_NFC_CMD_RADIO_OFF:
-    case SG_NFC_CMD_TO_UPDATE_MODE:
         return sg_nfc_cmd_dummy(nfc, &req->simple, &res->simple);
 
     default:
@@ -226,11 +202,9 @@ static HRESULT sg_nfc_cmd_get_fw_version(
         const struct sg_req_header *req,
         struct sg_nfc_res_get_fw_version *res)
 {
-    const struct version_info *fw = &fw_version[nfc->gen - 1];
-
     /* Dest version is not NUL terminated, this is intentional */
-    sg_res_init(&res->res, req, fw->length);
+    sg_res_init(&res->res, req, sizeof(res->version));
-    memcpy(res->version, fw->version, fw->length);
+    memcpy(res->version, "TN32MSEC003S F/W Ver1.2E", sizeof(res->version));
 
     return S_OK;
 }
@@ -240,11 +214,9 @@ static HRESULT sg_nfc_cmd_get_hw_version(
         const struct sg_req_header *req,
         struct sg_nfc_res_get_hw_version *res)
 {
-    const struct version_info *hw = &hw_version[nfc->gen - 1];
-
     /* Dest version is not NUL terminated, this is intentional */
-    sg_res_init(&res->res, req, hw->length);
+    sg_res_init(&res->res, req, sizeof(res->version));
-    memcpy(res->version, hw->version, hw->length);
+    memcpy(res->version, "TN32MSEC003S H/W Ver3.0J", sizeof(res->version));
 
     return S_OK;
 }
@@ -354,13 +326,13 @@ static HRESULT sg_nfc_poll_felica(
     felica->type = 0x20;
     felica->id_len = sizeof(felica->IDm) + sizeof(felica->PMm);
     felica->IDm = _byteswap_uint64(IDm);
-    felica->PMm = _byteswap_uint64(felica_get_amusement_ic_PMm());
+    felica->PMm = _byteswap_uint64(felica_get_generic_PMm());
 
     /* Initialize FeliCa IC emulator */
 
     nfc->felica.IDm = IDm;
-    nfc->felica.PMm = felica_get_amusement_ic_PMm();
+    nfc->felica.PMm = felica_get_generic_PMm();
-    nfc->felica.system_code = 0x88b4;
+    nfc->felica.system_code = 0x0000;
 
     return S_OK;
 }
@@ -429,7 +401,7 @@ static HRESULT sg_nfc_cmd_felica_encap(
     f_res.nbytes = sizeof(res->payload);
     f_res.pos = 1;
 
-#if defined(LOG_NFC)
+#if 0
     dprintf("FELICA OUTBOUND:\n");
     dump_const_iobuf(&f_req);
 #endif
@@ -443,7 +415,7 @@ static HRESULT sg_nfc_cmd_felica_encap(
     sg_res_init(&res->res, &req->req, f_res.pos);
     res->payload[0] = f_res.pos;
 
-#if defined(LOG_NFC)
+#if 0
     dprintf("FELICA INBOUND:\n");
     dump_iobuf(&f_res);
 #endif
@@ -451,22 +423,6 @@ static HRESULT sg_nfc_cmd_felica_encap(
     return S_OK;
 }
 
-static HRESULT sg_nfc_cmd_send_hex_data(
-        struct sg_nfc *nfc,
-        const struct sg_req_header *req,
-        struct sg_res_header *res)
-{
-    sg_res_init(res, req, 0);
-
-    /* Firmware checksum length? */
-    if (req->payload_len == 0x2b) {
-         /* The firmware is identical flag? */
-        res->status = 0x20;
-    }
-
-    return S_OK;
-}
-
 static HRESULT sg_nfc_cmd_dummy(
         struct sg_nfc *nfc,
         const struct sg_req_header *req,

board/sg-nfc.h

@@ -22,7 +22,6 @@ struct sg_nfc {
     const struct sg_nfc_ops *ops;
     void *ops_ctx;
     uint8_t addr;
-    unsigned int gen;
     struct felica felica;
     struct mifare mifare;
 };
@@ -31,7 +30,6 @@ void sg_nfc_init(
         struct sg_nfc *nfc,
         uint8_t addr,
         const struct sg_nfc_ops *ops,
-        unsigned int gen,
         void *ops_ctx);
 
 void sg_nfc_transact(

board/sg-reader.c

@@ -47,8 +47,7 @@ static struct sg_led sg_reader_led;
 
 HRESULT sg_reader_hook_init(
         const struct aime_config *cfg,
-        unsigned int default_port_no,
+        unsigned int port_no,
-        unsigned int gen,
         HINSTANCE self)
 {
     HRESULT hr;
@@ -66,31 +65,11 @@ HRESULT sg_reader_hook_init(
         return hr;
     }
 
-    unsigned int port_no = cfg->port_no;
+    sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, NULL);
-    if (port_no == 0){
+    sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, NULL);
-        port_no = default_port_no;
-    }
-
-    if (cfg->gen != 0) {
-        gen = cfg->gen;
-    }
-
-    if (gen < 1 || gen > 3) {
-        dprintf("NFC Assembly: Invalid reader generation: %u\n", gen);
-
-        return E_INVALIDARG;
-    }
-
-    sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, gen, NULL);
-    sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, gen, NULL);
 
     InitializeCriticalSection(&sg_reader_lock);
 
-    if (!cfg->high_baudrate) {
-        sg_reader_uart.baud.BaudRate = 38400;
-    }
-
-    dprintf("NFC Assembly: enabling (port=%d)\n", port_no);
     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);
@@ -121,14 +100,14 @@ static HRESULT sg_reader_handle_irp_locked(struct irp *irp)
 {
     HRESULT hr;
 
-#if defined(LOG_NFC)
+#if 0
     if (irp->op == IRP_OP_WRITE) {
         dprintf("WRITE:\n");
         dump_const_iobuf(&irp->write);
     }
 #endif
 
-#if defined(LOG_NFC)
+#if 0
     if (irp->op == IRP_OP_READ) {
         dprintf("READ:\n");
         dump_iobuf(&sg_reader_uart.readable);

board/sg-reader.h

@@ -9,13 +9,9 @@
 struct aime_config {
     struct aime_dll_config dll;
     bool enable;
-    unsigned int port_no;
-    bool high_baudrate;
-    unsigned int gen;
 };
 
 HRESULT sg_reader_hook_init(
         const struct aime_config *cfg,
-        unsigned int default_port_no,
+        unsigned int port_no,
-        unsigned int gen,
         HINSTANCE self);

board/vfd-cmd.h

@@ -1,123 +0,0 @@
-#pragma once
-
-#include "board/vfd-frame.h"
-
-enum {
-    VFD_CMD_GET_VERSION = 0x5B,
-    VFD_CMD_RESET = 0x0B,
-    VFD_CMD_CLEAR_SCREEN = 0x0C,
-    VFD_CMD_SET_BRIGHTNESS = 0x20,
-    VFD_CMD_SET_SCREEN_ON = 0x21,
-    VFD_CMD_SET_H_SCROLL = 0x22,
-    VFD_CMD_DRAW_IMAGE = 0x2E,
-    VFD_CMD_SET_CURSOR = 0x30,
-    VFD_CMD_SET_ENCODING = 0x32,
-    VFD_CMD_SET_TEXT_WND = 0x40,
-    VFD_CMD_SET_TEXT_SPEED = 0x41,
-    VFD_CMD_WRITE_TEXT = 0x50,
-    VFD_CMD_ENABLE_SCROLL = 0x51,
-    VFD_CMD_DISABLE_SCROLL = 0x52,
-    VFD_CMD_ROTATE = 0x5D,
-    VFD_CMD_CREATE_CHAR = 0xA3,
-    VFD_CMD_CREATE_CHAR2 = 0xA4,
-};
-
-enum {
-    VFD_ENC_GB2312    = 0,
-    VFD_ENC_BIG5      = 1,
-    VFD_ENC_SHIFT_JIS = 2,
-    VFD_ENC_KSC5601   = 3,
-    VFD_ENC_MAX = 3,
-};
-
-struct vfd_req_hdr {
-    uint8_t sync;
-    uint8_t cmd;
-};
-
-struct vfd_req_any {
-    struct vfd_req_hdr hdr;
-    uint8_t payload[2054];
-};
-
-struct vfd_req_board_info {
-    struct vfd_req_hdr hdr;
-    uint8_t unk1;
-};
-
-struct vfd_resp_board_info { // \x0201.20\x03
-    uint8_t unk1;
-    char version[5];
-    uint8_t unk2;
-};
-
-struct vfd_req_reset {
-    struct vfd_req_hdr hdr;
-};
-
-struct vfd_req_cls {
-    struct vfd_req_hdr hdr;
-};
-
-struct vfd_req_brightness {
-    struct vfd_req_hdr hdr;
-    uint8_t brightness;
-};
-
-struct vfd_req_power {
-    struct vfd_req_hdr hdr;
-    uint8_t power_state;
-};
-
-struct vfd_req_hscroll {
-    struct vfd_req_hdr hdr;
-    uint8_t x_pos;
-};
-
-struct vfd_req_draw {
-    struct vfd_req_hdr hdr;
-    uint16_t x0;
-    uint8_t y0;
-    uint16_t x1;
-    uint8_t y1;
-    uint8_t image[2048];
-};
-
-struct vfd_req_cursor {
-    struct vfd_req_hdr hdr;
-    uint16_t x;
-    uint8_t y;
-};
-
-struct vfd_req_encoding {
-    struct vfd_req_hdr hdr;
-    uint8_t encoding;
-};
-
-struct vfd_req_wnd {
-    struct vfd_req_hdr hdr;
-    uint16_t x0;
-    uint8_t y0;
-    uint16_t x1;
-    uint8_t y1;
-};
-
-struct vfd_req_speed {
-    struct vfd_req_hdr hdr;
-    uint8_t encoding;
-};
-
-struct vfd_req_scroll {
-    struct vfd_req_hdr hdr;
-};
-
-struct vfd_req_rotate {
-    struct vfd_req_hdr hdr;
-    uint8_t unk1;
-};
-
-struct vfd_req_create_char {
-    struct vfd_req_hdr hdr;
-    uint8_t type;
-    uint8_t pixels[32];
-};

board/vfd-frame.c

@@ -1,88 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#define SUPER_VERBOSE 1
-
-#include "board/vfd-frame.h"
-
-#include "hook/iobuf.h"
-
-#include "util/dprintf.h"
-
-static HRESULT vfd_frame_encode_byte(struct iobuf *dest, uint8_t byte);
-
-/* Frame structure:
-
-    REQUEST:
-   [0] Sync byte (0x1A or 0x1B)
-   [1] Packet ID
-   [2...n-1] Data/payload
-
-   --- OR ---
-
-   if no sync byte is given, plain static text in the currently configured encoding is expected.
-
-   RESPONSE:
-   This thing never responds, unless it's VFD_CMD_GET_VERSION
-   */
-
-bool vfd_frame_sync(struct const_iobuf *src) {
-    return src->bytes[src->pos] == VFD_SYNC_BYTE || src->bytes[src->pos] == VFD_SYNC_BYTE2;
-}
-
-HRESULT vfd_frame_encode(
-        struct iobuf *dest,
-        const void *ptr,
-        size_t nbytes) {
-    const uint8_t *src;
-    uint8_t byte;
-    size_t i;
-    HRESULT hr;
-
-    assert(dest != NULL);
-    assert(dest->bytes != NULL || dest->nbytes == 0);
-    assert(dest->pos <= dest->nbytes);
-    assert(ptr != NULL);
-
-    src = ptr;
-
-    if (dest->pos >= dest->nbytes) {
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-    }
-
-#if SUPER_VERBOSE
-    dprintf("VFD: RX Buffer:\n");
-#endif
-
-    for (i = 1; i < nbytes; i++) {
-        byte = src[i];
-#if SUPER_VERBOSE
-        dprintf("%02x ", byte);
-#endif
-
-        hr = vfd_frame_encode_byte(dest, byte);
-
-        if (FAILED(hr)) {
-            return hr;
-        }
-    }
-#if SUPER_VERBOSE
-    dprintf("\n");
-#endif
-
-    return hr;
-}
-
-static HRESULT vfd_frame_encode_byte(struct iobuf *dest, uint8_t byte) {
-    if (dest->pos + 1 > dest->nbytes) {
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
-    }
-
-    dest->bytes[dest->pos++] = byte;
-
-    return S_OK;
-}

board/vfd-frame.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "hook/iobuf.h"
-
-enum {
-    VFD_SYNC_BYTE = 0x1B,
-    VFD_SYNC_BYTE2 = 0x1A,
-};
-
-bool vfd_frame_sync(struct const_iobuf *src);
-
-HRESULT vfd_frame_encode(
-        struct iobuf *dest,
-        const void *ptr,
-        size_t nbytes);

board/vfd.c

@@ -2,17 +2,17 @@
    directly by amdaemon, and it has something to do with displaying the status
    of electronic payments.
 
-   Part number in schematics is "VFD GP1232A02A FUTABA". */
+   Part number in schematics is "VFD GP1232A02A FUTABA".
+
+   Little else about this board is known. Black-holing the RS232 comms that it
+   receives seems to be sufficient for the time being. */
 
 #include <windows.h>
 
 #include <assert.h>
 #include <stdint.h>
-#include <stdlib.h>
 
-#include "board/config.h"
 #include "board/vfd.h"
-#include "board/vfd-cmd.h"
 
 #include "hook/iohook.h"
 
@@ -21,50 +21,14 @@
 #include "util/dprintf.h"
 #include "util/dump.h"
 
-#define SUPER_VERBOSE 0
-
 static HRESULT vfd_handle_irp(struct irp *irp);
 
 static struct uart vfd_uart;
-static uint8_t vfd_written[4096];
+static uint8_t vfd_written[512];
-static uint8_t vfd_readable[4096];
+static uint8_t vfd_readable[512];
 
-static int encoding = VFD_ENC_SHIFT_JIS;
+HRESULT vfd_hook_init(unsigned int port_no)
-
-HRESULT vfd_handle_get_version(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_reset(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_clear_screen(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_set_brightness(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_set_screen_on(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_set_h_scroll(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_draw_image(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_set_cursor(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_set_encoding(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_set_text_wnd(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_set_text_speed(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_write_text(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_enable_scroll(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_disable_scroll(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_rotate(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_create_char(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-HRESULT vfd_handle_create_char2(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart);
-
-static bool utf_enabled;
-
-HRESULT vfd_hook_init(struct vfd_config *cfg, unsigned int default_port_no)
 {
-    if (!cfg->enable){
-        return S_FALSE;
-    }
-
-    utf_enabled = cfg->utf_conversion;
-
-    unsigned int port_no = cfg->port_no;
-    if (port_no == 0){
-        port_no = default_port_no;
-    }
-
-    dprintf("VFD: enabling (port=%d)\n", port_no);
     uart_init(&vfd_uart, port_no);
     vfd_uart.written.bytes = vfd_written;
     vfd_uart.written.nbytes = sizeof(vfd_written);
@@ -74,48 +38,6 @@ HRESULT vfd_hook_init(struct vfd_config *cfg, unsigned int default_port_no)
     return iohook_push_handler(vfd_handle_irp);
 }
 
-
-const char* get_encoding_name(int b){
-    switch (b){
-        case 0: return "gb2312";
-        case 1: return "big5";
-        case 2: return "shift-jis";
-        case 3: return "ks_c_5601-1987";
-        default: return "unknown";
-    }
-}
-
-void print_vfd_text(const char* str, int len){
-
-    if (utf_enabled){
-
-        wchar_t encoded[1024];
-        memset(encoded, 0, 1024 * sizeof(wchar_t));
-
-        int codepage = 0;
-        if (encoding == VFD_ENC_GB2312){
-            codepage = 936;
-        } else if (encoding == VFD_ENC_BIG5){
-            codepage = 950;
-        } else if (encoding == VFD_ENC_SHIFT_JIS){
-            codepage = 932;
-        } else if (encoding == VFD_ENC_KSC5601) {
-            codepage = 949;
-        }
-
-        if (!MultiByteToWideChar(codepage, MB_USEGLYPHCHARS, str, len, encoded, 1024)){
-            dprintf("VFD: Text conversion failed: %ld", GetLastError());
-            return;
-        }
-
-        dprintf("VFD: Text: %ls\n", encoded);
-    } else {
-
-        dprintf("VFD: Text: %s\n", str);
-
-    }
-}
-
 static HRESULT vfd_handle_irp(struct irp *irp)
 {
     HRESULT hr;
@@ -126,274 +48,15 @@ static HRESULT vfd_handle_irp(struct irp *irp)
         return iohook_invoke_next(irp);
     }
 
-    if (irp->op == IRP_OP_OPEN){
-        dprintf("VFD: Open\n");
-    } else if (irp->op == IRP_OP_CLOSE){
-        dprintf("VFD: Close\n");
-    }
-
     hr = uart_handle_irp(&vfd_uart, irp);
 
     if (FAILED(hr) || irp->op != IRP_OP_WRITE) {
         return hr;
     }
 
-#if SUPER_VERBOSE
     dprintf("VFD TX:\n");
     dump_iobuf(&vfd_uart.written);
-#endif
-
-    struct const_iobuf reader;
-    iobuf_flip(&reader, &vfd_uart.written);
-
-    struct iobuf* writer = &vfd_uart.readable;
-    for (; reader.pos < reader.nbytes ; ){
-
-        if (vfd_frame_sync(&reader)) {
-
-            reader.pos++; // get the sync byte out of the way
-
-            uint8_t cmd;
-            iobuf_read_8(&reader, &cmd);
-
-            if (cmd == VFD_CMD_GET_VERSION) {
-                hr = vfd_handle_get_version(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_RESET) {
-                hr = vfd_handle_reset(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_CLEAR_SCREEN) {
-                hr = vfd_handle_clear_screen(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_SET_BRIGHTNESS) {
-                hr = vfd_handle_set_brightness(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_SET_SCREEN_ON) {
-                hr = vfd_handle_set_screen_on(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_SET_H_SCROLL) {
-                hr = vfd_handle_set_h_scroll(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_DRAW_IMAGE) {
-                hr = vfd_handle_draw_image(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_SET_CURSOR) {
-                hr = vfd_handle_set_cursor(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_SET_ENCODING) {
-                hr = vfd_handle_set_encoding(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_SET_TEXT_WND) {
-                hr = vfd_handle_set_text_wnd(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_SET_TEXT_SPEED) {
-                hr = vfd_handle_set_text_speed(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_WRITE_TEXT) {
-                hr = vfd_handle_write_text(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_ENABLE_SCROLL) {
-                hr = vfd_handle_enable_scroll(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_DISABLE_SCROLL) {
-                hr = vfd_handle_disable_scroll(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_ROTATE) {
-                hr = vfd_handle_rotate(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_CREATE_CHAR) {
-                hr = vfd_handle_create_char(&reader, writer, &vfd_uart);
-            } else if (cmd == VFD_CMD_CREATE_CHAR2) {
-                hr = vfd_handle_create_char2(&reader, writer, &vfd_uart);
-            } else {
-                dprintf("VFD: Unknown command 0x%x\n", cmd);
-                dump_const_iobuf(&reader);
-                hr = S_FALSE;
-            }
-        } else {
-
-            // if no sync byte is sent, we are just getting plain text...
-
-            if (reader.pos < reader.nbytes){
-                int len = 0;
-
-                // read chars until we hit a new sync byte or the data ends
-                while (reader.pos + len + 1 < reader.nbytes && reader.bytes[reader.pos + len] != VFD_SYNC_BYTE && reader.bytes[reader.pos + len] != VFD_SYNC_BYTE2){
-                    len++;
-                }
-
-                char* str = malloc(len);
-                memset(str, 0, len);
-                iobuf_read(&reader, str, len);
-                print_vfd_text(str, len);
-                free(str);
-
-                reader.pos += len;
-            }
-
-        }
-
-        if (!SUCCEEDED(hr)){
-            return hr;
-        }
-
-    }
-
     vfd_uart.written.pos = 0;
 
     return hr;
 }
-
-HRESULT vfd_handle_get_version(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    dprintf("VFD: Get Version\n");
-
-    struct vfd_resp_board_info resp;
-
-    memset(&resp, 0, sizeof(resp));
-    resp.unk1 = 2;
-    strcpy(resp.version, "01.20");
-    resp.unk2 = 1;
-
-    return vfd_frame_encode(writer, &resp, sizeof(resp));
-}
-HRESULT vfd_handle_reset(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    dprintf("VFD: Reset\n");
-
-    encoding = VFD_ENC_SHIFT_JIS;
-
-    return S_FALSE;
-}
-HRESULT vfd_handle_clear_screen(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    dprintf("VFD: Clear Screen\n");
-
-    return S_FALSE;
-}
-HRESULT vfd_handle_set_brightness(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t b;
-    iobuf_read_8(reader, &b);
-
-    if (b > 4){
-        dprintf("VFD: Brightness, invalid argument\n");
-        return E_FAIL;
-    }
-
-    dprintf("VFD: Brightness, %d\n", b);
-
-    return S_FALSE;
-}
-HRESULT vfd_handle_set_screen_on(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t b;
-    iobuf_read_8(reader, &b);
-
-    if (b > 1){
-        dprintf("VFD: Screen Power, invalid argument\n");
-        return E_FAIL;
-    }
-
-    dprintf("VFD: Screen Power, %d\n", b);
-    return S_FALSE;
-}
-HRESULT vfd_handle_set_h_scroll(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t x;
-    iobuf_read_8(reader, &x);
-
-    dprintf("VFD: Horizontal Scroll, X=%d\n", x);
-    return S_FALSE;
-}
-HRESULT vfd_handle_draw_image(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    int w, h;
-    uint16_t x0, x1;
-    uint8_t y0, y1;
-    uint8_t image[2048];
-
-    iobuf_read_be16(reader, &x0);
-    iobuf_read_8(reader, &y0);
-    iobuf_read_be16(reader, &x1);
-    iobuf_read_8(reader, &y1);
-    w = x1 - x0;
-    h = y1 - y0;
-    iobuf_read(reader, image, w*h);
-
-    dprintf("VFD: Draw image, %dx%d\n", w, h);
-    return S_FALSE;
-}
-
-HRESULT vfd_handle_set_cursor(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint16_t x;
-    uint8_t y;
-
-    iobuf_read_be16(reader, &x);
-    iobuf_read_8(reader, &y);
-
-    dprintf("VFD: Set Cursor, x=%d,y=%d\n", x, y);
-
-    return S_FALSE;
-}
-
-HRESULT vfd_handle_set_encoding(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t b;
-    iobuf_read_8(reader, &b);
-
-    dprintf("VFD: Set Encoding, %d (%s)\n", b, get_encoding_name(b));
-
-    if (b < 0 || b > VFD_ENC_MAX){
-        dprintf("Invalid encoding specified\n");
-        return E_FAIL;
-    }
-
-    encoding = b;
-
-    return S_FALSE;
-}
-HRESULT vfd_handle_set_text_wnd(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint16_t x0, x1;
-    uint8_t y0, y1;
-
-    iobuf_read_be16(reader, &x0);
-    iobuf_read_8(reader, &y0);
-    iobuf_read_be16(reader, &x1);
-    iobuf_read_8(reader, &y1);
-
-    dprintf("VFD: Set Text Window, p0:%d,%d, p1:%d,%d\n", x0, y0, x1, y1);
-    return S_FALSE;
-}
-HRESULT vfd_handle_set_text_speed(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t b;
-    iobuf_read_8(reader, &b);
-
-    dprintf("VFD: Set Text Speed, %d\n", b);
-    return S_FALSE;
-}
-HRESULT vfd_handle_write_text(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t len;
-    iobuf_read_8(reader, &len);
-
-    char* str = malloc(len);
-    iobuf_read(reader, str, len);
-
-    print_vfd_text(str, len);
-    free(str);
-
-    return S_FALSE;
-}
-HRESULT vfd_handle_enable_scroll(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    dprintf("VFD: Enable Scrolling\n");
-    return S_FALSE;
-}
-HRESULT vfd_handle_disable_scroll(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    dprintf("VFD: Disable Scrolling\n");
-    return S_FALSE;
-}
-HRESULT vfd_handle_rotate(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t b;
-    iobuf_read_8(reader, &b);
-
-    dprintf("VFD: Rotate, %d\n", b);
-    return S_FALSE;
-}
-HRESULT vfd_handle_create_char(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t b;
-    iobuf_read_8(reader, &b);
-    char buf[32];
-
-    iobuf_read(reader, buf, 32);
-
-    dprintf("VFD: Create character, %d\n", b);
-    return S_FALSE;
-}
-HRESULT vfd_handle_create_char2(struct const_iobuf* reader, struct iobuf* writer, struct uart* vfd_uart){
-    uint8_t b, b2;
-    iobuf_read_8(reader, &b);
-    iobuf_read_8(reader, &b2);
-    char buf[16];
-
-    iobuf_read(reader, buf, 16);
-
-    dprintf("VFD: Create character, %d, %d\n", b, b2);
-    return S_FALSE;
-}

board/vfd.h

@@ -2,12 +2,4 @@
 
 #include <windows.h>
 
-struct vfd_config {
+HRESULT vfd_hook_init(unsigned int port_no);
-    bool enable;
-    unsigned int port_no;
-    bool utf_conversion;
-};
-
-
-HRESULT vfd_hook_init(struct vfd_config *cfg, unsigned int default_port_no);
-

carolhook/controlbd.c

@@ -78,7 +78,7 @@ static HRESULT controlbd_frame_decode(struct controlbd_req_any *req, struct iobu
     uint8_t checksum_pos = src->pos - 1;
     uint8_t calculated_checksum = 0;
     uint8_t checksum = 0;
-
+    
     if (src->pos < 6) {
         dprintf("Control Board: Decode Error, request too short (pos is 0x%08X)\n", (int)src->pos);
         return SEC_E_BUFFER_TOO_SMALL;
@@ -137,7 +137,7 @@ static HRESULT controlbd_handle_irp_locked(struct irp *irp)
 
     for (;;) {
         if (controlbd_uart.written.bytes[0] == 0xE0) {
-#if defined(LOG_CAROL_CONTROL_BD)
+#if 0
             dprintf("Control Board: TX Buffer:\n");
             dump_iobuf(&controlbd_uart.written);
 #endif
@@ -147,12 +147,12 @@ static HRESULT controlbd_handle_irp_locked(struct irp *irp)
                 return hr;
             }
 
-            hr = controlbd_req_dispatch(&req);
+            hr = controlbd_req_dispatch(&req);            
             if (FAILED(hr)) {
                 dprintf("Control Board: Dispatch Error: 0X%X\n", (int) hr);
                 return hr;
             }
-#if defined(LOG_CAROL_CONTROL_BD)
+#if 0
             dprintf("Control Board: RX Buffer:\n");
             dump_iobuf(&controlbd_uart.readable);
 #endif
@@ -206,7 +206,7 @@ static HRESULT controlbd_req_dispatch(const struct controlbd_req_any *req)
     case CONTROLBD_CMD_FIRM_SUM:
         return controlbd_req_firmware_checksum();
 
-    case CONTROLBD_CMD_TIMEOUT:
+    case CONTROLBD_CMD_TIMEOUT:        
         dprintf("Control Board: Acknowledge Timeout\n");
         return controlbd_req_ack_any(req->hdr.cmd);
 
@@ -278,7 +278,7 @@ static HRESULT controlbd_req_get_board_info(void)
     resp.rev = 0x90;
     resp.bfr_size = 0x0001;
     resp.ack = 1;
-
+    
     strcpy_s(resp.bd_no, sizeof(resp.bd_no), "15312   ");
     strcpy_s(resp.chip_no, sizeof(resp.chip_no), "6699 ");
     resp.chip_no[5] = 0xFF;
@@ -317,7 +317,7 @@ static HRESULT controlbd_req_polling(const struct controlbd_req_any *req)
     resp.unk7 = 3;
     resp.unk8 = 1;
     resp.unk9 = 1;
-
+    
     resp.btns_pressed = 0; // bit 1 is pen button, bit 2 is dodge
     resp.coord_x = 0x0;
     resp.coord_y = 0x0;

carolhook/dllmain.c

@@ -1,31 +1,3 @@
-/*
-    "Wonderland Wars" (carol*) hook
-
-    Devices:
-
-    JVS:    837-14572 "Type 3" I/O Board
-
-    [Satellite]
-
-    USB:    "WinTouch" Controller Board
-                ^ (DIPSW2 ON, Version 5.xx.xx or above)
-    COM1:   3M Touch Systems 78-0011-2353-4 Touch Controller Board
-                ^ (DIPSW2 OFF)
-    COM10:  TN32MSEC003S "Gen 1" Aime Reader
-            OR
-            837-15286 "Gen 2" Aime Reader
-                ^ (Version 1.6x.xx or above)
-    COM11:  837-15070-02 LED Controller Board
-    COM12:  837-15312 Pen Controller I/O Board
-
-    [Terminal]
-
-    COM10:  837-15286 "Gen 2" Aime Reader
-
-    *: SEGA's abbreviation for Lewis Carroll, author of Alice's Adventures in
-    Wonderland.
-*/
-
 #include <windows.h>
 
 #include <stdlib.h>
@@ -53,7 +25,6 @@
 #include "platform/platform.h"
 
 #include "util/dprintf.h"
-#include "util/env.h"
 
 static HMODULE carol_hook_mod;
 static process_entry_t carol_startup;
@@ -101,7 +72,7 @@ static DWORD CALLBACK carol_pre_startup(void)
 
     /* Config load */
 
-    carol_hook_config_load(&carol_hook_cfg, get_config_path());
+    carol_hook_config_load(&carol_hook_cfg, L".\\segatools.ini");
 
     /* Hook Win32 APIs */
 
@@ -131,7 +102,7 @@ static DWORD CALLBACK carol_pre_startup(void)
         goto fail;
     }
 
-    hr = sg_reader_hook_init(&carol_hook_cfg.aime, 10, 1, carol_hook_mod);
+    hr = sg_reader_hook_init(&carol_hook_cfg.aime, 10, carol_hook_mod);
 
     if (FAILED(hr)) {
         goto fail;
@@ -165,7 +136,7 @@ static DWORD CALLBACK carol_pre_startup(void)
     }
     /* Initialize debug helpers */
 
-    spike_hook_init(get_config_path());
+    spike_hook_init(L".\\segatools.ini");
 
     dprintf("---  End  carol_pre_startup ---\n");
 

carolhook/ledbd.c

@@ -94,7 +94,7 @@ static HRESULT ledbd_handle_irp_locked(struct irp *irp)
     }
 
     for (;;) {
-#if defined(LOG_CAROL_LED_BD)
+#if 0
         dprintf("LED Board: TX Buffer:\n");
         dump_iobuf(&ledbd_uart.written);
 #endif
@@ -165,4 +165,4 @@ static HRESULT ledbd_req_unkF0(uint8_t cmd)
     iobuf_write(&ledbd_uart.readable, resp, 16);
 
     return S_OK;
-}
+}

carolhook/touch.c

@@ -54,7 +54,7 @@ HRESULT touch_hook_init(const struct touch_config *cfg)
     if (!cfg->enable) {
         return S_OK;
     }
-
+    
     InitializeCriticalSection(&touch_lock);
 
     uart_init(&touch_uart, 1);
@@ -112,7 +112,7 @@ static HRESULT touch_handle_irp_locked(struct irp *irp)
     }
 
     for (;;) {
-#if defined(LOG_CAROL_TOUCH)
+#if 0
         dprintf("Touchscreen: TX Buffer:\n");
         dump_iobuf(&touch_uart.written);
 #endif
@@ -188,7 +188,7 @@ static void touch_scan_auto(const bool is_pressed, const uint16_t mouse_x, const
         resp.touches[0].touch_id = 1;
         tmp_x = mouse_x & 0x7FFF;
         tmp_y = mouse_y & 0x7FFF;
-
+        
         resp.touches[0].x1 = tmp_x & 0x7F;
         resp.touches[0].x2 = (tmp_x >> 7) & 0x7F;
         resp.touches[0].y1 = tmp_y & 0x7F;
@@ -201,7 +201,7 @@ static void touch_scan_auto(const bool is_pressed, const uint16_t mouse_x, const
             dprintf("Touch: Mouse down! x %02X %02X y: %02X %02X\n", resp.touches[0].x1, resp.touches[0].x2, resp.touches[0].y1, resp.touches[0].y2);
 #endif
 
-
+    
         last_x1 = resp.touches[0].x1;
         last_x2 = resp.touches[0].x2;
         last_y1 = resp.touches[0].y1;
@@ -220,7 +220,7 @@ static void touch_scan_auto(const bool is_pressed, const uint16_t mouse_x, const
     iobuf_write(&touch_uart.readable, &resp, sizeof(resp));
     LeaveCriticalSection(&touch_lock);
 
-#if defined(LOG_CAROL_TOUCH)
+#if 0     
     dprintf("Touch: RX Buffer: (pos %08x)\n", (uint32_t)touch_uart.readable.pos);
     dump_iobuf(&touch_uart.readable);
 #endif

carolio/carolio.c

@@ -8,7 +8,6 @@
 #include "carolio/carolio.h"
 #include "carolio/config.h"
 #include "util/dprintf.h"
-#include "util/env.h"
 
 static unsigned int __stdcall carol_io_touch_thread_proc(void *ctx);
 
@@ -26,7 +25,7 @@ uint16_t carol_io_get_api_version(void)
 
 HRESULT carol_io_jvs_init(void)
 {
-    carol_io_config_load(&carol_io_cfg, get_config_path());
+    carol_io_config_load(&carol_io_cfg, L".\\segatools.ini");
 
     return S_OK;
 }
@@ -179,4 +178,4 @@ static unsigned int __stdcall carol_io_touch_thread_proc(void *ctx)
     }
 
     return 0;
-}
+}

carolio/config.c

@@ -14,7 +14,7 @@ void carol_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
 }

chunihook/chuni-dll.c

@@ -30,28 +30,9 @@ const struct dll_bind_sym chuni_dll_syms[] = {
     }, {
         .sym = "chuni_io_slider_set_leds",
         .off = offsetof(struct chuni_dll, slider_set_leds),
-    }, {
-        .sym = "chuni_io_led_init",
-        .off = offsetof(struct chuni_dll, led_init),
-    }, {
-        .sym = "chuni_io_led_set_colors",
-        .off = offsetof(struct chuni_dll, led_set_leds),
     }
 };
 
-/* Helper function to determine upon dll_bind failure whether the required functions were found
-   NOTE: relies on symbols order declared above */
-static HRESULT has_enough_symbols(uint16_t version, uint8_t count)
-{
-    if ( version <= 0x0101 && count == 7 )
-        return S_OK;
-
-    if ( version >= 0x0102 && count == 9 )
-        return S_OK;
-
-    return E_FAIL;
-}
-
 struct chuni_dll chuni_dll;
 
 // Copypasta DLL binding and diagnostic message boilerplate.
@@ -111,24 +92,16 @@ HRESULT chuni_dll_init(const struct chuni_dll_config *cfg, HINSTANCE self)
     }
 
     sym = chuni_dll_syms;
-    const struct dll_bind_sym *init_sym = &sym[0];
     hr = dll_bind(&chuni_dll, src, &sym, _countof(chuni_dll_syms));
 
     if (FAILED(hr)) {
         if (src != self) {
-            // Might still be ok depending on external dll API version
+            dprintf("Chunithm IO: Custom IO DLL does not provide function "
-            int bind_count = sym - init_sym;
+                    "\"%s\". Please contact your IO DLL's developer for "
-            if ( has_enough_symbols(chuni_dll.api_version, bind_count) == S_OK )
+                    "further assistance.\n",
-            {
+                    sym->sym);
-                hr = S_OK;
-            } else {
-                dprintf("Chunithm IO: Custom IO DLL does not provide function "
-                        "\"%s\". Please contact your IO DLL's developer for "
-                        "further assistance.\n",
-                        sym->sym);
 
-                goto end;
+            goto end;
-            }
         } else {
             dprintf("Internal error: could not reflect \"%s\"\n", sym->sym);
         }

chunihook/chuni-dll.h

@@ -13,8 +13,6 @@ struct chuni_dll {
     void (*slider_start)(chuni_io_slider_callback_t callback);
     void (*slider_stop)(void);
     void (*slider_set_leds)(const uint8_t *rgb);
-    HRESULT (*led_init)(void);
-    void (*led_set_leds)(uint8_t board, uint8_t *rgb);
 };
 
 struct chuni_dll_config {

chunihook/chunihook.def

@@ -20,5 +20,3 @@ EXPORTS
     chuni_io_slider_set_leds
     chuni_io_slider_start
     chuni_io_slider_stop
-    chuni_io_led_init
-    chuni_io_led_set_colors

chunihook/config.c

@@ -44,66 +44,6 @@ void slider_config_load(struct slider_config *cfg, const wchar_t *filename)
     cfg->enable = GetPrivateProfileIntW(L"slider", L"enable", 1, filename);
 }
 
-void led15093_config_load(struct led15093_config *cfg, const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    wchar_t tmpstr[16];
-
-    memset(cfg->board_number, ' ', sizeof(cfg->board_number));
-    memset(cfg->chip_number, ' ', sizeof(cfg->chip_number));
-    memset(cfg->boot_chip_number, ' ', sizeof(cfg->boot_chip_number));
-
-    cfg->enable = GetPrivateProfileIntW(L"led15093", L"enable", 1, filename);
-    cfg->port_no = 0;
-    cfg->high_baudrate = GetPrivateProfileIntW(L"led15093", L"highBaud", 0, filename);
-    cfg->fw_ver = GetPrivateProfileIntW(L"led15093", L"fwVer", 0x90, filename);
-    cfg->fw_sum = GetPrivateProfileIntW(L"led15093", L"fwSum", 0xadf7, filename);
-
-    GetPrivateProfileStringW(
-            L"led15093",
-            L"boardNumber",
-            L"15093-06",
-            tmpstr,
-            _countof(tmpstr),
-            filename);
-
-    size_t n = wcstombs(cfg->board_number, tmpstr, sizeof(cfg->board_number));
-    for (int i = n; i < sizeof(cfg->board_number); i++)
-    {
-        cfg->board_number[i] = ' ';
-    }
-
-    GetPrivateProfileStringW(
-            L"led15093",
-            L"chipNumber",
-            L"6710 ",
-            tmpstr,
-            _countof(tmpstr),
-            filename);
-
-    n = wcstombs(cfg->chip_number, tmpstr, sizeof(cfg->chip_number));
-    for (int i = n; i < sizeof(cfg->chip_number); i++)
-    {
-        cfg->chip_number[i] = ' ';
-    }
-
-    GetPrivateProfileStringW(
-            L"led15093",
-            L"bootChipNumber",
-            L"6709 ",
-            tmpstr,
-            _countof(tmpstr),
-            filename);
-
-    n = wcstombs(cfg->boot_chip_number, tmpstr, sizeof(cfg->boot_chip_number));
-    for (int i = n; i < sizeof(cfg->boot_chip_number); i++)
-    {
-        cfg->boot_chip_number[i] = ' ';
-    }
-}
-
 void chuni_hook_config_load(
         struct chuni_hook_config *cfg,
         const wchar_t *filename)
@@ -119,5 +59,4 @@ void chuni_hook_config_load(
     gfx_config_load(&cfg->gfx, filename);
     chuni_dll_config_load(&cfg->dll, filename);
     slider_config_load(&cfg->slider, filename);
-    led15093_config_load(&cfg->led15093, filename);
 }

chunihook/config.h

@@ -6,7 +6,6 @@
 #include "amex/amex.h"
 
 #include "board/sg-reader.h"
-#include "board/led15093.h"
 
 #include "chunihook/chuni-dll.h"
 #include "chunihook/slider.h"
@@ -22,7 +21,6 @@ struct chuni_hook_config {
     struct gfx_config gfx;
     struct chuni_dll_config dll;
     struct slider_config slider;
-    struct led15093_config led15093;
 };
 
 void chuni_dll_config_load(

chunihook/dllmain.c

@@ -1,22 +1,9 @@
-/*
-    "CHUNITHM" (chuni) hook
-
-    Devices
-
-    JVS:    837-14572 "Type 3" I/O Board
-    COM1:   837-15330 Ground Slider
-    COM10:  837-15093-06 LED Controller Board
-    COM11:  837-15093-06 LED Controller Board
-    COM12:  TN32MSEC003S "Gen 1" Aime Reader
-*/
-
 #include <windows.h>
 
 #include <stdlib.h>
 
 #include "amex/amex.h"
 
-#include "board/led15093.h"
 #include "board/sg-reader.h"
 
 #include "chunihook/config.h"
@@ -36,7 +23,6 @@
 #include "platform/platform.h"
 
 #include "util/dprintf.h"
-#include "util/env.h"
 
 static HMODULE chuni_hook_mod;
 static process_entry_t chuni_startup;
@@ -72,7 +58,7 @@ static DWORD CALLBACK chuni_pre_startup(void)
 
     /* Config load */
 
-    chuni_hook_config_load(&chuni_hook_cfg, get_config_path());
+    chuni_hook_config_load(&chuni_hook_cfg, L".\\segatools.ini");
 
     /* Hook Win32 APIs */
 
@@ -110,19 +96,7 @@ static DWORD CALLBACK chuni_pre_startup(void)
         goto fail;
     }
 
-    if ( chuni_dll.led_init == NULL || chuni_dll.led_set_leds == NULL )
+    hr = sg_reader_hook_init(&chuni_hook_cfg.aime, 12, chuni_hook_mod);
-    {
-        dprintf("IO DLL doesn't support led_init/led_set_leds, cannot start LED15093 hook\n");
-    } else {
-        hr = led15093_hook_init(&chuni_hook_cfg.led15093, 
-            chuni_dll.led_init, chuni_dll.led_set_leds, 10, 2, 2, 1);
-
-        if (FAILED(hr)) {
-            goto fail;
-        }
-    }
-
-    hr = sg_reader_hook_init(&chuni_hook_cfg.aime, 12, 1, chuni_hook_mod);
 
     if (FAILED(hr)) {
         goto fail;
@@ -130,7 +104,7 @@ static DWORD CALLBACK chuni_pre_startup(void)
 
     /* Initialize debug helpers */
 
-    spike_hook_init(get_config_path());
+    spike_hook_init(L".\\segatools.ini");
 
     dprintf("---  End  chuni_pre_startup ---\n");
 

chunihook/jvs.c

@@ -101,13 +101,13 @@ static void chunithm_jvs_read_switches(void *ctx, struct io3_switch_state *out)
     out->p1 = 0x0000;
     out->p2 = 0x0000;
 
-    if (opbtn & CHUNI_IO_OPBTN_TEST) {
+    if (opbtn & 0x01) {
         out->system = 0x80;
     } else {
         out->system = 0x00;
     }
 
-    if (opbtn & CHUNI_IO_OPBTN_SERVICE) {
+    if (opbtn & 0x02) {
         out->p1 |= 0x4000;
     }
 

chunihook/slider.c

@@ -98,7 +98,7 @@ static HRESULT slider_handle_irp_locked(struct irp *irp)
     }
 
     for (;;) {
-#if defined(LOG_CHUNI_SLIDER)
+#if 0
         dprintf("TX Buffer:\n");
         dump_iobuf(&slider_uart.written);
 #endif
@@ -117,7 +117,7 @@ static HRESULT slider_handle_irp_locked(struct irp *irp)
             return hr;
         }
 
-#if defined(LOG_CHUNI_SLIDER)
+#if 0
         dprintf("Deframe Buffer:\n");
         dump_iobuf(&req_iobuf);
 #endif

chuniio/chu2to3.c

@@ -1,358 +0,0 @@
-#include <windows.h>
-
-#include <process.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include "chuniio/chu2to3.h"
-#include "util/dprintf.h"
-
-// Check windows
-#if _WIN32 || _WIN64
-    #if _WIN64
-        #define ENV64BIT
-    #else
-        #define ENV32BIT
-    #endif
-#endif
-
-// Check GCC
-#if __GNUC__
-    #if __x86_64__ || __ppc64__
-        #define ENV64BIT
-    #else
-        #define ENV32BIT
-    #endif
-#endif
-
-/* chuniio.dll dynamic loading */
-HMODULE hinstLib;
-typedef uint16_t (*chuni_io_get_api_version_t)(void);
-typedef HRESULT (*chuni_io_jvs_init_t)(void);
-typedef void (*chuni_io_jvs_poll_t)(uint8_t*, uint8_t*);
-typedef void (*chuni_io_jvs_read_coin_counter_t)(uint16_t *);
-typedef HRESULT (*chuni_io_slider_init_t)(void);
-typedef void (*chuni_io_slider_set_leds_t)(const uint8_t *);
-typedef void (*chuni_io_slider_start_t)(chuni_io_slider_callback_t);
-typedef void (*chuni_io_slider_stop_t)(void);
-typedef HRESULT (*chuni_io_led_init_t)(void);
-typedef void (*chuni_io_led_set_colors_t)(uint8_t, uint8_t *);
-
-chuni_io_get_api_version_t _chuni_io_get_api_version;
-chuni_io_jvs_init_t _chuni_io_jvs_init;
-chuni_io_jvs_poll_t _chuni_io_jvs_poll;
-chuni_io_jvs_read_coin_counter_t _chuni_io_jvs_read_coin_counter;
-chuni_io_slider_init_t _chuni_io_slider_init;
-chuni_io_slider_set_leds_t _chuni_io_slider_set_leds;
-chuni_io_slider_start_t _chuni_io_slider_start;
-chuni_io_slider_stop_t _chuni_io_slider_stop;
-chuni_io_led_init_t _chuni_io_led_init;
-chuni_io_led_set_colors_t _chuni_io_led_set_colors;
-
-/* SHMEM Handling */
-#define BUF_SIZE 1024
-#define SHMEM_WRITE(buf, size) CopyMemory((PVOID)g_pBuf, buf, size)
-#define SHMEM_READ(buf, size) CopyMemory(buf,(PVOID)g_pBuf, size)
-TCHAR g_shmem_name[]=TEXT("Local\\Chu2to3Shmem");
-HANDLE g_hMapFile;
-LPVOID g_pBuf;
-
-#pragma pack(1)
-typedef struct shared_data_s {
-    uint16_t coin_counter;
-    uint8_t  opbtn;
-    uint8_t  beams;
-    uint16_t version;
-} shared_data_t;
-
-shared_data_t g_shared_data;
-
-bool shmem_create()
-{
-   g_hMapFile = CreateFileMapping(
-                                  INVALID_HANDLE_VALUE,    // use paging file
-                                  NULL,                    // default security
-                                  PAGE_READWRITE,          // read/write access
-                                  0,                       // maximum object size (high-order DWORD)
-                                  BUF_SIZE,                // maximum object size (low-order DWORD)
-                                  g_shmem_name);           // name of mapping object
-
-   if (g_hMapFile == NULL)
-   {
-      dprintf("shmem_create : Could not create file mapping object (%ld).\n",
-             GetLastError());
-      return 0;
-   }
-   g_pBuf = MapViewOfFile(g_hMapFile,          // handle to map object
-                          FILE_MAP_ALL_ACCESS, // read/write permission
-                          0,
-                          0,
-                          BUF_SIZE);
-
-   if (g_pBuf == NULL)
-   {
-      dprintf("shmem_create : Could not map view of file (%ld).\n",
-             GetLastError());
-
-       CloseHandle(g_hMapFile);
-
-      return 0;
-   }
-
-    return 1;
-}
-
-bool shmem_load()
-{
-    g_hMapFile = OpenFileMapping(
-                                 FILE_MAP_ALL_ACCESS,   // read/write access
-                                 FALSE,                 // do not inherit the name
-                                 g_shmem_name);         // name of mapping object
-
-    if (g_hMapFile == NULL)
-    {
-        dprintf("shmem_load : Could not open file mapping object (%ld).\n", GetLastError());
-        return 0;
-   }
-
-    g_pBuf = MapViewOfFile(g_hMapFile,           // handle to map object
-                           FILE_MAP_ALL_ACCESS,  // read/write permission
-                           0,
-                           0,
-                           BUF_SIZE);
-
-    if (g_pBuf == NULL)
-    {
-        dprintf("shmem_load : Could not map view of file (%ld).\n", GetLastError());
-        CloseHandle(g_hMapFile);
-        return 0;
-    }
-
-    dprintf("shmem_load : shmem loaded succesfully.\n");
-    return 1;
-}
-
-void shmem_free()
-{
-   UnmapViewOfFile(g_pBuf);
-   CloseHandle(g_hMapFile);
-}
-
-/* jvs polling thread (to forward info to x64 dll) */
-static HANDLE jvs_poll_thread;
-static bool jvs_poll_stop_flag;
-
-static unsigned int __stdcall jvs_poll_thread_proc(void *ctx)
-{
-    while (1) {
-        _chuni_io_jvs_read_coin_counter(&g_shared_data.coin_counter);
-        g_shared_data.opbtn = 0;
-        g_shared_data.beams = 0;
-        _chuni_io_jvs_poll(&g_shared_data.opbtn, &g_shared_data.beams);
-        SHMEM_WRITE(&g_shared_data, sizeof(shared_data_t));
-        Sleep(1);
-    }
-
-    return 0;
-}
-
-uint16_t chu2to3_load_dll(const wchar_t *dllname)
-{
-    #if defined(ENV64BIT)
-    /* x64 must just open the shmem and do nothing else */
-    int errcount = 0;
-    while (!shmem_load())
-    {
-        if (errcount >= 10)
-            return -1;
-        Sleep(5000);
-        errcount++;
-    }
-    Sleep(1000);
-    return S_OK;
-    #endif
-
-    /* this is the first function called so let's setup the chuniio forwarding */
-    hinstLib = LoadLibraryW(dllname);
-    if (hinstLib == NULL) {
-        dprintf("ERROR: unable to load %S (error %ld)\n",dllname, GetLastError());
-        return -1;
-    }
-
-    _chuni_io_get_api_version = (chuni_io_get_api_version_t)GetProcAddress(hinstLib, "chuni_io_get_api_version");
-    _chuni_io_jvs_init = (chuni_io_jvs_init_t)GetProcAddress(hinstLib, "chuni_io_jvs_init");
-    _chuni_io_jvs_poll = (chuni_io_jvs_poll_t)GetProcAddress(hinstLib, "chuni_io_jvs_poll");
-    _chuni_io_jvs_read_coin_counter = (chuni_io_jvs_read_coin_counter_t)GetProcAddress(hinstLib, "chuni_io_jvs_read_coin_counter");
-    _chuni_io_slider_init = (chuni_io_slider_init_t)GetProcAddress(hinstLib, "chuni_io_slider_init");
-    _chuni_io_slider_set_leds = (chuni_io_slider_set_leds_t)GetProcAddress(hinstLib, "chuni_io_slider_set_leds");
-    _chuni_io_slider_start = (chuni_io_slider_start_t)GetProcAddress(hinstLib, "chuni_io_slider_start");
-    _chuni_io_slider_stop = (chuni_io_slider_stop_t)GetProcAddress(hinstLib, "chuni_io_slider_stop");
-    _chuni_io_led_init = (chuni_io_led_init_t)GetProcAddress(hinstLib, "chuni_io_led_init");
-    _chuni_io_led_set_colors = (chuni_io_led_set_colors_t)GetProcAddress(hinstLib, "chuni_io_led_set_colors");
-
-    /* x86 has to create the shmem */
-    if (!shmem_create())
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-/* chuniio exports */
-uint16_t chu2to3_io_get_api_version(void)
-{
-    #if defined(ENV64BIT)
-        /* This might be called too soon so let's make sure x86 has time to write to the shmem */
-        SHMEM_READ(&g_shared_data, sizeof(shared_data_t));
-        int errcount = 0;
-        while (g_shared_data.version == 0)
-        {
-            if (errcount >= 3)
-            {
-                dprintf("CHU2TO3 X64: Couldn't retrieve api version from shmem, assuming 0x0100\n");
-                return 0x0100;
-            }
-            Sleep(5000);
-            errcount++;
-            SHMEM_READ(&g_shared_data, sizeof(shared_data_t));
-        }
-        dprintf("CHU2TO3 X64: api version is %04X\n", g_shared_data.version);
-        return g_shared_data.version;
-    #endif
-
-    if ( _chuni_io_get_api_version == NULL )
-    {
-        g_shared_data.version = 0x0100;
-    }
-    else
-    {
-        g_shared_data.version = _chuni_io_get_api_version();
-    }
-    dprintf("CHU2TO3: api version is %04X\n", g_shared_data.version);
-
-    SHMEM_WRITE(&g_shared_data, sizeof(shared_data_t));
-
-    return g_shared_data.version;
-}
-
-HRESULT chu2to3_io_jvs_init(void)
-{
-    #if defined(ENV64BIT)
-    /* x86 only */
-    return S_OK;
-    #endif
-
-    _chuni_io_jvs_init();
-
-    /* start jvs poll thread now that jvs_init is done */
-    if (jvs_poll_thread != NULL) {
-        return S_OK;
-    }
-
-    jvs_poll_thread = (HANDLE) _beginthreadex(NULL,
-                                              0,
-                                              jvs_poll_thread_proc,
-                                              NULL,
-                                              0,
-                                              NULL);
-    return S_OK;
-}
-
-void chu2to3_io_jvs_read_coin_counter(uint16_t *out)
-{
-    #if defined(ENV32BIT)
-    /* x86 can perform the call and update shmem (although this call never happens) */
-    _chuni_io_jvs_read_coin_counter(&g_shared_data.coin_counter);
-    SHMEM_WRITE(&g_shared_data, sizeof(shared_data_t));
-    return;
-    #endif
-
-    /* x64 must read value from shmem and update arg */
-    SHMEM_READ(&g_shared_data, sizeof(shared_data_t));
-    if (out == NULL) {
-        return;
-    }
-    *out = g_shared_data.coin_counter;
-}
-
-void chu2to3_io_jvs_poll(uint8_t *opbtn, uint8_t *beams)
-{
-    #if defined(ENV32BIT)
-    /* x86 can perform the call and update shmem (although this call never happens) */
-    _chuni_io_jvs_poll(&g_shared_data.opbtn, &g_shared_data.beams);
-    SHMEM_WRITE(&g_shared_data, sizeof(shared_data_t));
-    return;
-    #endif
-
-    /* x64 must read value from shmem and update args */
-    SHMEM_READ(&g_shared_data, sizeof(shared_data_t));
-    *opbtn = g_shared_data.opbtn;
-    *beams = g_shared_data.beams;
-}
-
-HRESULT chu2to3_io_slider_init(void)
-{
-    #if defined(ENV64BIT)
-    /* x86 only */
-    return S_OK;
-    #endif
-
-    return _chuni_io_slider_init();
-}
-
-void chu2to3_io_slider_start(chuni_io_slider_callback_t callback)
-{
-    #if defined(ENV64BIT)
-    /* x86 only */
-    return;
-    #endif
-
-    _chuni_io_slider_start(callback);
-}
-
-void chu2to3_io_slider_stop(void)
-{
-    #if defined(ENV64BIT)
-    /* x86 only */
-    return;
-    #endif
-
-    _chuni_io_slider_stop();
-}
-
-void chu2to3_io_slider_set_leds(const uint8_t *rgb)
-{
-    #if defined(ENV64BIT)
-    /* x86 only */
-    return;
-    #endif
-
-    _chuni_io_slider_set_leds(rgb);
-}
-
-HRESULT chu2to3_io_led_init(void)
-{
-    #if defined(ENV64BIT)
-    /* x86 only */
-    return S_OK;
-    #endif
-
-    if (_chuni_io_led_init != NULL)
-        return _chuni_io_led_init();
-    return S_OK;
-}
-
-void chu2to3_io_led_set_colors(uint8_t board, uint8_t *rgb)
-{
-    #if defined(ENV64BIT)
-    /* x86 only */
-    return;
-    #endif
-
-    if (_chuni_io_led_set_colors != NULL)
-    {
-        _chuni_io_led_set_colors(board, rgb);
-    }
-}

chuniio/chu2to3.h

@@ -1,26 +0,0 @@
-#pragma once
-
-/*
-   CHU2TO3 CUSTOM IO API
-
-   This dll just mirrors chuniio dll binds but with a dynamic library loading and 
-   a SHMEM system to let a single 32bit dll talk with x86 and x64 processes at once
-*/
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-uint16_t chu2to3_io_get_api_version(void);
-HRESULT chu2to3_io_jvs_init(void);
-void chu2to3_io_jvs_poll(uint8_t *opbtn, uint8_t *beams);
-void chu2to3_io_jvs_read_coin_counter(uint16_t *total);
-HRESULT chu2to3_io_slider_init(void);
-typedef void (*chuni_io_slider_callback_t)(const uint8_t *state);
-void chu2to3_io_slider_start(chuni_io_slider_callback_t callback);
-void chu2to3_io_slider_stop(void);
-void chu2to3_io_slider_set_leds(const uint8_t *rgb);
-HRESULT chu2to3_io_led_init(void);
-void chu2to3_io_led_set_colors(uint8_t board, uint8_t *rgb);
-uint16_t chu2to3_load_dll(const wchar_t *dllname);

chuniio/chuniio.c

@@ -3,15 +3,10 @@
 #include <process.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "chuniio/chuniio.h"
 #include "chuniio/config.h"
-#include "chuniio/ledoutput.h"
-
-#include "util/dprintf.h"
-#include "util/env.h"
 
 static unsigned int __stdcall chuni_io_slider_thread_proc(void *ctx);
 
@@ -24,23 +19,13 @@ static struct chuni_io_config chuni_io_cfg;
 
 uint16_t chuni_io_get_api_version(void)
 {
-    return 0x0102;
+    return 0x0101;
 }
 
 HRESULT chuni_io_jvs_init(void)
 {
-    chuni_io_config_load(&chuni_io_cfg, get_config_path());
+    chuni_io_config_load(&chuni_io_cfg, L".\\segatools.ini");
-    
+
-    led_init_mutex = CreateMutex(
-        NULL,              // default security attributes
-        FALSE,             // initially not owned
-        NULL);             // unnamed mutex
-    
-    if (led_init_mutex == NULL)
-    {
-        return E_FAIL;
-    }
-    
     return S_OK;
 }
 
@@ -50,7 +35,7 @@ void chuni_io_jvs_read_coin_counter(uint16_t *out)
         return;
     }
 
-    if (GetAsyncKeyState(chuni_io_cfg.vk_coin) & 0x8000) {
+    if (GetAsyncKeyState(chuni_io_cfg.vk_coin)) {
         if (!chuni_io_coin) {
             chuni_io_coin = true;
             chuni_io_coins++;
@@ -66,52 +51,38 @@ void chuni_io_jvs_poll(uint8_t *opbtn, uint8_t *beams)
 {
     size_t i;
 
-    if (GetAsyncKeyState(chuni_io_cfg.vk_test) & 0x8000) {
+    if (GetAsyncKeyState(chuni_io_cfg.vk_test)) {
-        *opbtn |= CHUNI_IO_OPBTN_TEST;
+        *opbtn |= 0x01; /* Test */
     }
 
-    if (GetAsyncKeyState(chuni_io_cfg.vk_service) & 0x8000) {
+    if (GetAsyncKeyState(chuni_io_cfg.vk_service)) {
-        *opbtn |= CHUNI_IO_OPBTN_SERVICE;
+        *opbtn |= 0x02; /* Service */
     }
 
-    if (chuni_io_cfg.vk_ir_emu) {
+    if (GetAsyncKeyState(chuni_io_cfg.vk_ir)) {
-        // Use emulated AIR
+        if (chuni_io_hand_pos < 6) {
-        if (GetAsyncKeyState(chuni_io_cfg.vk_ir_emu)) {
+            chuni_io_hand_pos++;
-            if (chuni_io_hand_pos < 6) {
-                chuni_io_hand_pos++;
-            }
-        } else {
-            if (chuni_io_hand_pos > 0) {
-                chuni_io_hand_pos--;
-            }
-        }
-
-        for (i = 0 ; i < 6 ; i++) {
-            if (chuni_io_hand_pos > i) {
-                *beams |= (1 << i);
-            }
         }
     } else {
-        // Use actual AIR
+        if (chuni_io_hand_pos > 0) {
-        for (i = 0; i < 6; i++) {
+            chuni_io_hand_pos--;
-            if (GetAsyncKeyState(chuni_io_cfg.vk_ir[i]) & 0x8000) {
+        }
-                *beams |= (1 << i);
+    }
-            } else {
+
-                *beams &= ~(1 << i);
+    for (i = 0 ; i < 6 ; i++) {
-            }
+        if (chuni_io_hand_pos > i) {
+            *beams |= (1 << i);
         }
     }
 }
 
 HRESULT chuni_io_slider_init(void)
 {
-    return led_output_init(&chuni_io_cfg); // because of slider LEDs
+    return S_OK;
 }
 
 void chuni_io_slider_start(chuni_io_slider_callback_t callback)
 {
-    BOOL status;
-
     if (chuni_io_slider_thread != NULL) {
         return;
     }
@@ -141,7 +112,6 @@ void chuni_io_slider_stop(void)
 
 void chuni_io_slider_set_leds(const uint8_t *rgb)
 {
-    led_output_update(2, rgb);
 }
 
 static unsigned int __stdcall chuni_io_slider_thread_proc(void *ctx)
@@ -167,13 +137,3 @@ static unsigned int __stdcall chuni_io_slider_thread_proc(void *ctx)
 
     return 0;
 }
-
-HRESULT chuni_io_led_init(void)
-{
-    return led_output_init(&chuni_io_cfg);
-}
-
-void chuni_io_led_set_colors(uint8_t board, uint8_t *rgb)
-{ 
-    led_output_update(board, rgb);
-}

chuniio/chuniio.h

@@ -8,7 +8,6 @@
    - 0x0100: Initial API version (assumed if chuni_io_get_api_version is not
      exported)
    - 0x0101: Fix IR beam mappings
-   - 0x0102: Add air tower led and billboard support
 */
 
 #include <windows.h>
@@ -16,12 +15,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-enum {
-    CHUNI_IO_OPBTN_TEST = 0x01,
-    CHUNI_IO_OPBTN_SERVICE = 0x02,
-    CHUNI_IO_OPBTN_COIN = 0x04,
-};
-
 /* Get the version of the Chunithm IO API that this DLL supports. This
    function should return a positive 16-bit integer, where the high byte is
    the major version and the low byte is the minor version (as defined by the
@@ -139,46 +132,10 @@ void chuni_io_slider_start(chuni_io_slider_callback_t callback);
 void chuni_io_slider_stop(void);
 
 /* Update the RGB lighting on the slider. A pointer to an array of 32 * 3 = 96
-  bytes is supplied, organized in BRG format.
+   bytes is supplied. The illuminated areas on the touch slider are some
-   The first set of bytes is the right-most slider key, and from there the bytes
+   combination of rectangular regions and dividing lines between these regions
-   alternate between the dividers and the keys until the left-most key. 
+   but the exact mapping of this lighting control buffer is still TBD.
-   There are 31 illuminated sections in total.
 
    Minimum API version: 0x0100 */
 
 void chuni_io_slider_set_leds(const uint8_t *rgb);
-
-/* Initialize LED emulation. This function will be called before any
-   other chuni_io_led_*() function calls.
-
-   All subsequent calls may originate from arbitrary threads and some may
-   overlap with each other. Ensuring synchronization inside your IO DLL is
-   your responsibility. 
-
-   Minimum API version: 0x0102 */
-
-HRESULT chuni_io_led_init(void);
-
-/* Update the RGB LEDs. rgb is a pointer to an array of up to 63 * 3 = 189 bytes.
-
-   Chunithm uses two chains/boards with WS2811 protocol (each logical led corresponds to 3 physical leds). 
-   board 0 is on the left side and board 1 on the right side of the cab
-
-   Board 0 has 53 LEDs:
-     [0]-[49]: snakes through left half of billboard (first column starts at top)
-     [50]-[52]: left side partition LEDs
-   
-   Board 1 has 63 LEDs:
-     [0]-[59]: right half of billboard (first column starts at bottom)
-     [60]-[62]: right side partition LEDs
-   
-   Board 2 is the slider and has 31 LEDs:
-     [0]-[31]: slider LEDs right to left BRG, alternating between keys and dividers 
-
-   Each rgb value is comprised of 3 bytes in R,G,B order
-
-   NOTE: billboard strips have alternating direction (bottom to top, top to bottom, ...)
-
-   Minimum API version: 0x0102 */
-
-void chuni_io_led_set_colors(uint8_t board, uint8_t *rgb);

chuniio/config.c

@@ -1,10 +1,9 @@
 #include <windows.h>
 
+#include <stdlib.h>
 #include <assert.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "chuniio/config.h"
 
@@ -19,35 +18,20 @@ static const int chuni_io_default_cells[] = {
     'S', 'S', 'S', 'S',
 };
 
-static const int chuni_io_default_ir[] = {
-    '4', '5', '6', '7', '8', '9'
-};
-
 void chuni_io_config_load(
         struct chuni_io_config *cfg,
         const wchar_t *filename)
 {
     wchar_t key[16];
     int i;
-    wchar_t port_input[6];
 
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    // Technically it's io4 but leave this for compatibility with old configs.
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
-    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename);
+    cfg->vk_ir = GetPrivateProfileIntW(L"io3", L"ir", VK_SPACE, filename);
-    cfg->vk_ir_emu = GetPrivateProfileIntW(L"io3", L"ir", VK_SPACE, filename);
-
-    for (i = 0 ; i < 6 ; i++) {
-        swprintf_s(key, _countof(key), L"ir%i", i + 1);
-        cfg->vk_ir[i] = GetPrivateProfileIntW(
-                L"ir",
-                key,
-                chuni_io_default_ir[i],
-                filename);
-    }
 
     for (i = 0 ; i < 32 ; i++) {
         swprintf_s(key, _countof(key), L"cell%i", i + 1);
@@ -57,27 +41,4 @@ void chuni_io_config_load(
                 chuni_io_default_cells[i],
                 filename);
     }
-
-    cfg->cab_led_output_pipe = GetPrivateProfileIntW(L"led", L"cabLedOutputPipe", 1, filename);
-    cfg->cab_led_output_serial = GetPrivateProfileIntW(L"led", L"cabLedOutputSerial", 0, filename);
-    
-    cfg->controller_led_output_pipe = GetPrivateProfileIntW(L"led", L"controllerLedOutputPipe", 1, filename);
-    cfg->controller_led_output_serial = GetPrivateProfileIntW(L"led", L"controllerLedOutputSerial", 0, filename);
-
-    cfg->controller_led_output_openithm = GetPrivateProfileIntW(L"led", L"controllerLedOutputOpeNITHM", 0, filename);
-
-    cfg->led_serial_baud = GetPrivateProfileIntW(L"led", L"serialBaud", 921600, filename);
-
-    GetPrivateProfileStringW(
-            L"led",
-            L"serialPort",
-            L"COM5",
-            port_input,
-            _countof(port_input),
-            filename);
-
-    // Sanitize the output path. If it's a serial COM port, it needs to be prefixed
-    // with `\\.\`.
-    wcsncpy(cfg->led_serial_port, L"\\\\.\\", 4);
-    wcsncat_s(cfg->led_serial_port, 11, port_input, 6);
 }

chuniio/config.h

@@ -2,28 +2,13 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <stdbool.h>
 
 struct chuni_io_config {
     uint8_t vk_test;
     uint8_t vk_service;
     uint8_t vk_coin;
-    uint8_t vk_ir_emu;
+    uint8_t vk_ir;
-    uint8_t vk_ir[6];
     uint8_t vk_cell[32];
-
-    // Which ways to output LED information are enabled
-    bool cab_led_output_pipe;
-    bool cab_led_output_serial;
-    
-    bool controller_led_output_pipe;
-    bool controller_led_output_serial;
-
-    bool controller_led_output_openithm;
-
-    // The name of a COM port to output LED data on, in serial mode
-    wchar_t led_serial_port[12];
-    int32_t led_serial_baud;
 };
 
 void chuni_io_config_load(

chuniio/leddata.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <windows.h>
-#include <stdint.h>
-
-#define LED_PACKET_FRAMING 0xE0
-#define LED_PACKET_ESCAPE 0xD0
-#define LED_NUM_MAX 66
-#define LED_BOARDS_TOTAL 3
-#define LED_OUTPUT_HEADER_SIZE 2
-#define LED_OUTPUT_DATA_SIZE_MAX LED_NUM_MAX * 3 * 2  // max if every byte's escaped
-#define LED_OUTPUT_TOTAL_SIZE_MAX LED_OUTPUT_HEADER_SIZE + LED_OUTPUT_DATA_SIZE_MAX
-
-// This struct is used to send data related to the slider and billboard LEDs
-struct _chuni_led_data_buf_t {
-    uint8_t framing; // Sync byte
-    uint8_t board; // LED output the data is for (0-1: billboard, 2: slider)
-    uint8_t data[LED_OUTPUT_DATA_SIZE_MAX]; // Buffer for LEDs
-    uint8_t data_len; // How many bytes to output from the buffer
-};
-
-static uint8_t chuni_led_board_data_lens[LED_BOARDS_TOTAL] = {53*3, 63*3, 31*3};

chuniio/ledoutput.c

@@ -1,137 +0,0 @@
-#include <windows.h>
-
-#include <process.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "chuniio/config.h"
-#include "chuniio/leddata.h"
-#include "chuniio/ledoutput.h"
-#include "chuniio/pipeimpl.h"
-#include "chuniio/serialimpl.h"
-
-static struct _chuni_led_data_buf_t led_unescaped_buf[LED_BOARDS_TOTAL];
-static struct _chuni_led_data_buf_t led_escaped_buf[LED_BOARDS_TOTAL];
-
-static bool led_output_is_init = false;
-static struct chuni_io_config* config;
-static bool any_outputs_enabled;
-
-HANDLE led_init_mutex;
-
-HRESULT led_output_init(struct chuni_io_config* const cfg)
-{
-    DWORD dwWaitResult = WaitForSingleObject(led_init_mutex, INFINITE);
-    if (dwWaitResult == WAIT_FAILED)
-    {
-        return HRESULT_FROM_WIN32(GetLastError());
-        // return 1;
-    }
-    else if (dwWaitResult != WAIT_OBJECT_0)
-    {
-        return E_FAIL;
-        // return 1;
-    }
-    
-    if (!led_output_is_init)
-    {
-        config = cfg;
-        
-        // Setup the framing bytes for the packets
-        for (int i = 0; i < LED_BOARDS_TOTAL; i++) {
-            led_unescaped_buf[i].framing = LED_PACKET_FRAMING;
-            led_unescaped_buf[i].board = i;
-            led_unescaped_buf[i].data_len = chuni_led_board_data_lens[i];
-            
-            led_escaped_buf[i].framing = LED_PACKET_FRAMING;
-            led_escaped_buf[i].board = i;
-            led_escaped_buf[i].data_len = chuni_led_board_data_lens[i];
-        }
-        
-        any_outputs_enabled = config->cab_led_output_pipe || config->controller_led_output_pipe
-            || config->cab_led_output_serial || config->controller_led_output_serial;
-        
-        if (config->cab_led_output_pipe || config->controller_led_output_pipe)
-        {
-            led_pipe_init();  // don't really care about errors here tbh
-        }
-        
-        if (config->cab_led_output_serial || config->controller_led_output_serial)
-        {
-            led_serial_init(config->led_serial_port, config->led_serial_baud);
-        }
-    }
-    
-    led_output_is_init = true;
-    
-    ReleaseMutex(led_init_mutex);
-    return S_OK;
-    // return 0;
-}
-
-struct _chuni_led_data_buf_t* escape_led_data(struct _chuni_led_data_buf_t* unescaped)
-{
-    struct _chuni_led_data_buf_t* out_struct = &led_escaped_buf[unescaped->board];
-    
-    uint8_t* in_buf = unescaped->data;
-    uint8_t* out_buf = out_struct->data;
-    int i = 0;
-    int o = 0;
-    
-    while (i < unescaped->data_len)
-    {
-        uint8_t b = in_buf[i++];
-        if (b == LED_PACKET_FRAMING || b == LED_PACKET_ESCAPE)
-        {
-            out_buf[o++] = LED_PACKET_ESCAPE;
-            b--;
-        }
-        out_buf[o++] = b;
-    }
-    
-    out_struct->data_len = o;
-    
-    return out_struct;
-}
-
-void led_output_update(uint8_t board, const uint8_t* rgb)
-{
-    if (board < 0 || board > 2 || !any_outputs_enabled)
-    {
-        return;
-    }
-    
-    memcpy(led_unescaped_buf[board].data, rgb, led_unescaped_buf[board].data_len);
-    struct _chuni_led_data_buf_t* escaped_data = escape_led_data(&led_unescaped_buf[board]);
-    
-    if (board < 2)
-    {
-        // billboard (cab)
-        if (config->cab_led_output_pipe)
-        {
-            led_pipe_update(escaped_data);
-        }
-        
-        if (config->cab_led_output_serial)
-        {
-            led_serial_update(escaped_data);
-        }
-    }
-    else
-    {
-        // slider
-        if (config->controller_led_output_pipe)
-        {
-            led_pipe_update(escaped_data);
-        }
-        
-        if (config->controller_led_output_serial)
-        {
-            if (config->controller_led_output_openithm){
-                led_serial_update_openithm(rgb);
-            } else {
-                led_serial_update(escaped_data);
-            }
-        }
-    }
-}

chuniio/ledoutput.h

@@ -1,19 +0,0 @@
-/*
-    LED output functions
-    
-    Credits:
-    somewhatlurker, skogaby
-*/
-
-#pragma once
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "chuniio/config.h"
-
-extern HANDLE led_init_mutex;
-HRESULT led_output_init(struct chuni_io_config* const cfg);
-void led_output_update(uint8_t board, const uint8_t* rgb);

chuniio/meson.build

@@ -3,20 +3,10 @@ chuniio_lib = static_library(
     name_prefix : '',
     include_directories : inc,
     implicit_include_directories : false,
-
     sources : [
-        'chu2to3.c',
-        'chu2to3.h',
         'chuniio.c',
         'chuniio.h',
         'config.c',
         'config.h',
-        'leddata.h',
-        'ledoutput.c',
-        'ledoutput.h',
-        'pipeimpl.c',
-        'pipeimpl.h',
-        'serialimpl.c',
-        'serialimpl.h'
     ],
 )

chuniio/pipeimpl.c

@@ -1,160 +0,0 @@
-#include <windows.h>
-
-#include <process.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "chuniio/leddata.h"
-#include "chuniio/pipeimpl.h"
-
-static bool pipe_update[LED_BOARDS_TOTAL];
-
-// incoming data is copied into these to ensure it isn't written during output
-static struct _chuni_led_data_buf_t pipe_write_buf[LED_BOARDS_TOTAL];
-static HANDLE pipe_write_mutex;
-
-static HRESULT pipe_create(LPHANDLE hPipe, LPCWSTR lpszPipename, DWORD dwBufSize)
-{
-    *hPipe = INVALID_HANDLE_VALUE;
-    
-    *hPipe = CreateNamedPipeW( 
-        lpszPipename,                   // pipe name
-        PIPE_ACCESS_OUTBOUND,           // read/write access
-        PIPE_TYPE_BYTE |                // byte type pipe
-        PIPE_WAIT,                      // blocking mode
-        PIPE_UNLIMITED_INSTANCES,       // max. instances 
-        dwBufSize,                      // output buffer size
-        0,                              // input buffer size
-        0,                              // client time-out
-        NULL);                          // default security attribute
-    
-    if (*hPipe == INVALID_HANDLE_VALUE)
-    {
-        return E_FAIL;
-    }
-    
-    return S_OK;
-}
-
-static HRESULT pipe_write(HANDLE hPipe, LPCVOID lpBuffer, DWORD dwSize)
-{
-    DWORD cbWritten = 0;
-    
-    bool fSuccess = WriteFile( 
-        hPipe,
-        lpBuffer,
-        dwSize,
-        &cbWritten,
-        NULL);
-    
-    if (!fSuccess || cbWritten != dwSize) 
-    {
-        DWORD last_err = GetLastError();
-        return (last_err == ERROR_BROKEN_PIPE) ? E_ABORT : E_FAIL;
-    }
-
-    return S_OK;
-}
-
-static unsigned int __stdcall chuni_io_led_pipe_thread_proc(void *ctx)
-{
-    HANDLE hPipe;
-    LPCWSTR lpszPipename = L"\\\\.\\pipe\\chuni_led";
-    
-    while (true)
-    {
-        hPipe = INVALID_HANDLE_VALUE;
-        
-        if (pipe_create(&hPipe, lpszPipename, LED_OUTPUT_TOTAL_SIZE_MAX) != S_OK)
-        {
-            continue;
-        }
-        
-        // wait for a connection to the pipe
-        bool fConnected = ConnectNamedPipe(hPipe, NULL) ?
-            true : (GetLastError() == ERROR_PIPE_CONNECTED);
-        
-        while (fConnected)
-        {
-            if (WaitForSingleObject(pipe_write_mutex, INFINITE) != WAIT_OBJECT_0)
-            {
-                continue;
-            }
-            
-            for (int i = 0; i < LED_BOARDS_TOTAL; i++) {
-                if (pipe_update[i])
-                {
-                    HRESULT result = pipe_write(
-                        hPipe,
-                        &pipe_write_buf[i],
-                        LED_OUTPUT_HEADER_SIZE + pipe_write_buf[i].data_len);
-
-                    if (result != S_OK)
-                    {
-                        //if (result == E_ABORT) 
-                        //{
-                            fConnected = false;
-                        //}
-                        break;
-                    }
-                    
-                    pipe_update[i] = false;
-                }
-            }
-            
-            ReleaseMutex(pipe_write_mutex);
-        }
-        
-        FlushFileBuffers(hPipe); 
-        DisconnectNamedPipe(hPipe);
-        CloseHandle(hPipe);
-    }
-    
-    return 0;
-}
-
-HRESULT led_pipe_init()
-{
-    pipe_write_mutex = CreateMutex(
-        NULL,              // default security attributes
-        FALSE,             // initially not owned
-        NULL);             // unnamed mutex
-    
-    if (pipe_write_mutex == NULL)
-    {
-        return E_FAIL;
-    }
-    
-    // clear out update bools
-    for (int i = 0; i < LED_BOARDS_TOTAL; i++) {
-        pipe_update[i] = false;
-    }
-    
-    _beginthreadex(
-            NULL,
-            0,
-            chuni_io_led_pipe_thread_proc,
-            0,
-            0,
-            NULL);
-    
-    return S_OK;
-}
-
-void led_pipe_update(struct _chuni_led_data_buf_t* data)
-{
-    if (data->board > 2)
-    {
-        return;
-    }
-    
-    if (WaitForSingleObject(pipe_write_mutex, INFINITE) != WAIT_OBJECT_0)
-    {
-        return;
-    }
-    
-    memcpy(&pipe_write_buf[data->board], data, sizeof(struct _chuni_led_data_buf_t));
-    pipe_update[data->board] = true;
-    
-    ReleaseMutex(pipe_write_mutex);
-}

chuniio/pipeimpl.h

@@ -1,15 +0,0 @@
-/*
-    Pipe implementation for chuniio
-    
-    Credits:
-    somewhatlurker, skogaby
-*/
-
-#pragma once
-
-#include <windows.h>
-
-#include "chuniio/leddata.h"
-
-HRESULT led_pipe_init();
-void led_pipe_update(struct _chuni_led_data_buf_t* data);

chuniio/serialimpl.c

@@ -1,123 +0,0 @@
-#include <windows.h>
-
-#include <process.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "chuniio/leddata.h"
-#include "chuniio/serialimpl.h"
-#include "util/dprintf.h"
-
-static HANDLE serial_port;
-static HANDLE serial_write_mutex;
-
-HRESULT led_serial_init(wchar_t led_com[12], DWORD baud)
-{
-    // Setup the serial communications
-    BOOL status;
-
-    serial_port = CreateFileW(led_com,
-            GENERIC_READ | GENERIC_WRITE,
-            0,
-            NULL,
-            OPEN_EXISTING,
-            0,
-            NULL);
-    
-    if (serial_port == INVALID_HANDLE_VALUE)
-        dprintf("Chunithm Serial LEDs: Failed to open COM port (Attempted on %S)\n", led_com);
-    else
-        dprintf("Chunithm Serial LEDs: COM port success!\n");
-            
-    DCB dcb_serial_params = { 0 };
-    dcb_serial_params.DCBlength = sizeof(dcb_serial_params);
-    status = GetCommState(serial_port, &dcb_serial_params);
-    
-    dcb_serial_params.BaudRate = baud;
-    dcb_serial_params.ByteSize = 8;
-    dcb_serial_params.StopBits = ONESTOPBIT;
-    dcb_serial_params.Parity   = NOPARITY; 
-    SetCommState(serial_port, &dcb_serial_params);
-    
-    COMMTIMEOUTS timeouts = { 0 };
-    timeouts.ReadIntervalTimeout         = 50;
-    timeouts.ReadTotalTimeoutConstant    = 50; 
-    timeouts.ReadTotalTimeoutMultiplier  = 10;
-    timeouts.WriteTotalTimeoutConstant   = 50;
-    timeouts.WriteTotalTimeoutMultiplier = 10;
-    
-    SetCommTimeouts(serial_port, &timeouts);
-
-    if (!status)
-    {
-        return E_FAIL;
-    }
-
-    serial_write_mutex = CreateMutex(
-        NULL,              // default security attributes
-        FALSE,             // initially not owned
-        NULL);             // unnamed mutex
-
-    if (serial_write_mutex == NULL)
-    {
-        return E_FAIL;
-    }
-
-    return S_OK;
-}
-
-void led_serial_update(struct _chuni_led_data_buf_t* data)
-{
-    if (data->board > 2)
-    {
-        return;
-    }
-    
-    if (WaitForSingleObject(serial_write_mutex, INFINITE) != WAIT_OBJECT_0)
-    {
-        return;
-    }
-
-    BOOL status = true;
-    DWORD bytes_written = 0;
-
-    if (serial_port != INVALID_HANDLE_VALUE) {
-        status = WriteFile(
-            serial_port, 
-            data, 
-            LED_OUTPUT_HEADER_SIZE + data->data_len, 
-            &bytes_written, 
-            NULL);
-    }
-
-    if (!status) {
-        DWORD last_err = GetLastError();
-        // dprintf("Chunithm Serial LEDs: Serial port write failed -- %d\n", last_err); 
-    }
-    
-    ReleaseMutex(serial_write_mutex);
-}
-
-void led_serial_update_openithm(const uint8_t* rgb)
-{
-    if (serial_port != INVALID_HANDLE_VALUE)
-    {
-        char led_buffer[100];
-        DWORD bytes_to_write;               // No of bytes to write into the port
-        DWORD bytes_written = 0;            // No of bytes written to the port
-        bytes_to_write = sizeof(led_buffer);
-        BOOL status;
-        
-        led_buffer[0] = 0xAA;
-        led_buffer[1] = 0xAA;
-        memcpy(led_buffer+2, rgb, sizeof(uint8_t) * 96);
-        led_buffer[98] = 0xDD;
-        led_buffer[99] = 0xDD;
-        
-        status = WriteFile(serial_port,     // Handle to the Serial port
-                           led_buffer,      // Data to be written to the port
-                           bytes_to_write,  // No of bytes to write
-                           &bytes_written,  // Bytes written
-                           NULL);
-    }
-}

chuniio/serialimpl.h

@@ -1,17 +0,0 @@
-/*
-    Serial LED implementation for chuniio
-    
-    Credits:
-    somewhatlurker, skogaby
-*/
-
-#pragma once
-
-#include <windows.h>
-#include <stdint.h>
-
-#include "chuniio/leddata.h"
-
-HRESULT led_serial_init(wchar_t led_com[12], DWORD baud);
-void led_serial_update(struct _chuni_led_data_buf_t* data);
-void led_serial_update_openithm(const uint8_t* rgb);

chusanhook/chuni-dll.c

@@ -1,190 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdlib.h>
-
-#include "chuniio/chu2to3.h"
-#include "chusanhook/chuni-dll.h"
-
-#include "util/dll-bind.h"
-#include "util/dprintf.h"
-
-const struct dll_bind_sym chuni_dll_syms[] = {
-    {
-        .sym = "chuni_io_jvs_init",
-        .off = offsetof(struct chuni_dll, jvs_init),
-    }, {
-        .sym = "chuni_io_jvs_poll",
-        .off = offsetof(struct chuni_dll, jvs_poll),
-    }, {
-        .sym = "chuni_io_jvs_read_coin_counter",
-        .off = offsetof(struct chuni_dll, jvs_read_coin_counter),
-    }, {
-        .sym = "chuni_io_slider_init",
-        .off = offsetof(struct chuni_dll, slider_init),
-    }, {
-        .sym = "chuni_io_slider_start",
-        .off = offsetof(struct chuni_dll, slider_start),
-    }, {
-        .sym = "chuni_io_slider_stop",
-        .off = offsetof(struct chuni_dll, slider_stop),
-    }, {
-        .sym = "chuni_io_slider_set_leds",
-        .off = offsetof(struct chuni_dll, slider_set_leds),
-    }, {
-        .sym = "chuni_io_led_init",
-        .off = offsetof(struct chuni_dll, led_init),
-    }, {
-        .sym = "chuni_io_led_set_colors",
-        .off = offsetof(struct chuni_dll, led_set_leds),
-    }
-};
-
-const struct dll_bind_sym chu2to3_dll_syms[] = {
-    {
-        .sym = "chu2to3_io_jvs_init",
-        .off = offsetof(struct chuni_dll, jvs_init),
-    }, {
-        .sym = "chu2to3_io_jvs_poll",
-        .off = offsetof(struct chuni_dll, jvs_poll),
-    }, {
-        .sym = "chu2to3_io_jvs_read_coin_counter",
-        .off = offsetof(struct chuni_dll, jvs_read_coin_counter),
-    }, {
-        .sym = "chu2to3_io_slider_init",
-        .off = offsetof(struct chuni_dll, slider_init),
-    }, {
-        .sym = "chu2to3_io_slider_start",
-        .off = offsetof(struct chuni_dll, slider_start),
-    }, {
-        .sym = "chu2to3_io_slider_stop",
-        .off = offsetof(struct chuni_dll, slider_stop),
-    }, {
-        .sym = "chu2to3_io_slider_set_leds",
-        .off = offsetof(struct chuni_dll, slider_set_leds),
-    }, {
-        .sym = "chu2to3_io_led_init",
-        .off = offsetof(struct chuni_dll, led_init),
-    }, {
-        .sym = "chu2to3_io_led_set_colors",
-        .off = offsetof(struct chuni_dll, led_set_leds),
-    }
-};
-
-/* Helper function to determine upon dll_bind failure whether the required functions were found
-   NOTE: relies on symbols order declared above */
-static HRESULT has_enough_symbols(uint16_t version, uint8_t count)
-{
-    if ( version <= 0x0101 && count == 7 )
-        return S_OK;
-
-    if ( version >= 0x0102 && count == 9 )
-        return S_OK;
-
-    return E_FAIL;
-}
-
-struct chuni_dll chuni_dll;
-
-// Copypasta DLL binding and diagnostic message boilerplate.
-// Not much of this lends itself to being easily factored out. Also there
-// will be a lot of API-specific branching code here eventually as new API
-// versions get defined, so even though these functions all look the same
-// now this won't remain the case forever.
-
-HRESULT chuni_dll_init(const struct chuni_dll_config *cfg, HINSTANCE self)
-{
-    uint16_t (*get_api_version)(void);
-    const struct dll_bind_sym *sym;
-    HINSTANCE owned;
-    HINSTANCE src;
-    HRESULT hr;
-
-    assert(cfg != NULL);
-    assert(self != NULL);
-
-    owned = NULL;
-    src = self;
-
-    if (cfg->chu2to3) {
-        dprintf("Chunithm IO: using chu2to3 engine for IO DLL: %S\n", cfg->path);
-	} else if (cfg->path[0] != L'\0') {
-        owned = LoadLibraryW(cfg->path);
-
-        if (owned == NULL) {
-            hr = HRESULT_FROM_WIN32(GetLastError());
-            dprintf("Chunithm IO: Failed to load IO DLL: %lx: %S\n",
-                    hr,
-                    cfg->path);
-
-            goto end;
-        }
-
-        dprintf("Chunithm IO: Using custom IO DLL: %S\n", cfg->path);
-        src = owned;
-    }
-
-    if (cfg->chu2to3) {
-        if (chu2to3_load_dll(cfg->path) != 0)
-		    dprintf("Could not init chu2to3 engine\n");
-
-        get_api_version = (void *) GetProcAddress(src, "chu2to3_io_get_api_version");
-    }
-	else
-	{
-        get_api_version = (void *) GetProcAddress(src, "chuni_io_get_api_version");
-	}
-
-    if (get_api_version != NULL) {
-        chuni_dll.api_version = get_api_version();
-    } else {
-        chuni_dll.api_version = 0x0100;
-        dprintf("Custom IO DLL does not expose chuni_io_get_api_version, "
-                "assuming API version 1.0.\n"
-                "Please ask the developer to update their DLL.\n");
-    }
-
-    if (chuni_dll.api_version >= 0x0200) {
-        hr = E_NOTIMPL;
-        dprintf("Chunithm IO: Custom IO DLL implements an unsupported "
-                "API version (%#04x). Please update Segatools.\n",
-                chuni_dll.api_version);
-
-        goto end;
-    }
-
-    sym = cfg->chu2to3 ? chu2to3_dll_syms : chuni_dll_syms;
-    const struct dll_bind_sym *init_sym = &sym[0];
-
-    hr = dll_bind(&chuni_dll, src, &sym, _countof(chuni_dll_syms));
-
-    if (FAILED(hr)) {
-        if (src != self) {
-            // Might still be ok depending on external dll API version
-            int bind_count = sym - init_sym;
-            if ( has_enough_symbols(chuni_dll.api_version, bind_count) == S_OK )
-            {
-                hr = S_OK;
-            } else {
-                dprintf("Chunithm IO: Custom IO DLL does not provide function "
-                        "\"%s\". Please contact your IO DLL's developer for "
-                        "further assistance.\n",
-                        sym->sym);
-                dprintf("imported %d symbols\n", bind_count);
-                goto end;
-            }
-        } else {
-            dprintf("Internal error: could not reflect \"%s\"\n", sym->sym);
-        }
-    }
-
-    owned = NULL;
-
-end:
-    if (owned != NULL) {
-        FreeLibrary(owned);
-    }
-
-    return hr;
-}

chusanhook/chuni-dll.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include "chuniio/chuniio.h"
-
-struct chuni_dll {
-    uint16_t api_version;
-    HRESULT (*jvs_init)(void);
-    void (*jvs_poll)(uint8_t *opbtn, uint8_t *beams);
-    void (*jvs_read_coin_counter)(uint16_t *total);
-    HRESULT (*slider_init)(void);
-    void (*slider_start)(chuni_io_slider_callback_t callback);
-    void (*slider_stop)(void);
-    void (*slider_set_leds)(const uint8_t *rgb);
-    HRESULT (*led_init)(void);
-    void (*led_set_leds)(uint8_t board, uint8_t *rgb);
-};
-
-struct chuni_dll_config {
-    wchar_t path[MAX_PATH];
-    uint8_t chu2to3;
-};
-
-extern struct chuni_dll chuni_dll;
-
-HRESULT chuni_dll_init(const struct chuni_dll_config *cfg, HINSTANCE self);

chusanhook/chusanhook.def

@@ -1,34 +0,0 @@
-LIBRARY chusanhook
-
-EXPORTS
-    Direct3DCreate9
-    aime_io_get_api_version
-    aime_io_init
-    aime_io_led_set_color
-    aime_io_nfc_get_aime_id
-    aime_io_nfc_get_felica_id
-    aime_io_nfc_poll
-    amDllVideoClose @2
-    amDllVideoGetVBiosVersion @4
-    amDllVideoOpen @1
-    amDllVideoSetResolution @3
-    chuni_io_get_api_version
-    chuni_io_jvs_init
-    chuni_io_jvs_poll
-    chuni_io_jvs_read_coin_counter
-    chuni_io_slider_init
-    chuni_io_slider_set_leds
-    chuni_io_slider_start
-    chuni_io_slider_stop
-    chuni_io_led_init
-    chuni_io_led_set_colors
-    chu2to3_io_get_api_version
-    chu2to3_io_jvs_init
-    chu2to3_io_jvs_poll
-    chu2to3_io_jvs_read_coin_counter
-    chu2to3_io_slider_init
-    chu2to3_io_slider_set_leds
-    chu2to3_io_slider_start
-    chu2to3_io_slider_stop
-    chu2to3_io_led_init
-    chu2to3_io_led_set_colors

chusanhook/config.c

@@ -1,168 +0,0 @@
-#include <assert.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "board/config.h"
-
-#include "hooklib/config.h"
-#include "hooklib/dvd.h"
-
-#include "gfxhook/config.h"
-
-#include "platform/config.h"
-
-#include "chusanhook/config.h"
-
-// Check windows
-#if _WIN32 || _WIN64
-    #if _WIN64
-        #define ENV64BIT
-    #else
-        #define ENV32BIT
-    #endif
-#endif
-
-// Check GCC
-#if __GNUC__
-    #if __x86_64__ || __ppc64__
-        #define ENV64BIT
-    #else
-        #define ENV32BIT
-    #endif
-#endif
-
-void chuni_dll_config_load(
-        struct chuni_dll_config *cfg,
-        const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    // Workaround for x64/x86 external IO dlls
-    // path32 for 32bit, path64 for 64bit
-    // path for 32bit only dlls (internal chu2to3 engine)
-
-    GetPrivateProfileStringW(
-            L"chuniio",
-            L"path",
-            L"",
-            cfg->path,
-            _countof(cfg->path),
-            filename);
-    if (cfg->path[0] != L'\0') {
-        cfg->chu2to3 = 1;
-    } else {
-        cfg->chu2to3 = 0;
-    #if defined(ENV32BIT)	
-			GetPrivateProfileStringW(
-					L"chuniio",
-					L"path32",
-					L"",
-					cfg->path,
-					_countof(cfg->path),
-					filename);
-    #elif defined(ENV64BIT)
-        GetPrivateProfileStringW(
-                L"chuniio",
-                L"path64",
-                L"",
-                cfg->path,
-                _countof(cfg->path),
-                filename);
-    #else
-        #error "Unknown environment"
-    #endif
-    }
-}
-
-void slider_config_load(struct slider_config *cfg, const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    cfg->enable = GetPrivateProfileIntW(L"slider", L"enable", 1, filename);
-}
-
-void led15093_config_load(struct led15093_config *cfg, const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    wchar_t tmpstr[16];
-    bool cvt_port;
-
-    memset(cfg->board_number, ' ', sizeof(cfg->board_number));
-    memset(cfg->chip_number, ' ', sizeof(cfg->chip_number));
-    memset(cfg->boot_chip_number, ' ', sizeof(cfg->boot_chip_number));
-
-    cfg->enable = GetPrivateProfileIntW(L"led15093", L"enable", 1, filename);
-    cfg->port_no = 0;
-    cfg->high_baudrate = GetPrivateProfileIntW(L"led15093", L"highBaud", 0, filename);
-    cfg->fw_ver = GetPrivateProfileIntW(L"led15093", L"fwVer", 0x90, filename);
-    cfg->fw_sum = GetPrivateProfileIntW(L"led15093", L"fwSum", 0xadf7, filename);
-
-    GetPrivateProfileStringW(
-            L"led15093",
-            L"boardNumber",
-            L"15093-06",
-            tmpstr,
-            _countof(tmpstr),
-            filename);
-
-    size_t n = wcstombs(cfg->board_number, tmpstr, sizeof(cfg->board_number));
-    for (int i = n; i < sizeof(cfg->board_number); i++)
-    {
-        cfg->board_number[i] = ' ';
-    }
-
-    GetPrivateProfileStringW(
-            L"led15093",
-            L"chipNumber",
-            L"6710 ",
-            tmpstr,
-            _countof(tmpstr),
-            filename);
-
-    n = wcstombs(cfg->chip_number, tmpstr, sizeof(cfg->chip_number));
-    for (int i = n; i < sizeof(cfg->chip_number); i++)
-    {
-        cfg->chip_number[i] = ' ';
-    }
-
-    GetPrivateProfileStringW(
-            L"led15093",
-            L"bootChipNumber",
-            L"6709 ",
-            tmpstr,
-            _countof(tmpstr),
-            filename);
-
-    n = wcstombs(cfg->boot_chip_number, tmpstr, sizeof(cfg->boot_chip_number));
-    for (int i = n; i < sizeof(cfg->boot_chip_number); i++)
-    {
-        cfg->boot_chip_number[i] = ' ';
-    }
-}
-
-void chusan_hook_config_load(
-        struct chusan_hook_config *cfg,
-        const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    memset(cfg, 0, sizeof(*cfg));
-
-    // Force load the 64bit Aime DLL instead of the 32bit one
-    cfg->aime.dll.path64 = true;
-
-    platform_config_load(&cfg->platform, filename);
-    aime_config_load(&cfg->aime, filename);
-    dvd_config_load(&cfg->dvd, filename);
-    io4_config_load(&cfg->io4, filename);
-    gfx_config_load(&cfg->gfx, filename);
-    vfd_config_load(&cfg->vfd, filename);
-    chuni_dll_config_load(&cfg->dll, filename);
-    slider_config_load(&cfg->slider, filename);
-    led15093_config_load(&cfg->led15093, filename);
-}

chusanhook/config.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-
-#include "board/config.h"
-#include "board/led15093.h"
-
-#include "hooklib/dvd.h"
-
-#include "gfxhook/config.h"
-
-#include "platform/config.h"
-
-#include "chusanhook/chuni-dll.h"
-#include "chusanhook/slider.h"
-
-struct chusan_hook_config {
-    struct platform_config platform;
-    struct aime_config aime;
-    struct dvd_config dvd;
-    struct io4_config io4;
-    struct gfx_config gfx;
-    struct vfd_config vfd;
-    struct chuni_dll_config dll;
-    struct slider_config slider;
-    struct led15093_config led15093;
-};
-
-void chuni_dll_config_load(
-        struct chuni_dll_config *cfg,
-        const wchar_t *filename);
-void slider_config_load(struct slider_config *cfg, const wchar_t *filename);
-void chusan_hook_config_load(
-        struct chusan_hook_config *cfg,
-        const wchar_t *filename);

chusanhook/dllmain.c

@@ -1,206 +0,0 @@
-/*
-    "CHUNITHM NEW" (chusan) hook
-
-    Devices
-
-    USB:    837-15257-02 "Type 4" I/O Board
-    COM1:   837-15330 Ground Slider
-
-    [CVT mode (DIPSW2 ON)]
-
-    COM2:   837-15093-06 LED Controller Board
-    COM3:   837-15093-06 LED Controller Board
-    COM4:   837-15286 "Gen 2" Aime Reader
-
-    [SP mode (DIPSW2 OFF)]
-
-    USB:    837-15067-02 USB Serial I/F Board
-            connected to
-            837-15093-06 LED Controller Board (COM20)
-            837-15093-06 LED Controller Board (COM21)
-    COM2:   200-6275 VFD GP1232A02A FUTABA Board
-    COM4:   837-15396 "Gen 3" Aime Reader
-*/
-
-#include <windows.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "amex/amex.h"
-
-#include "board/sg-reader.h"
-#include "board/vfd.h"
-
-#include "chusanhook/config.h"
-#include "chusanhook/io4.h"
-#include "chusanhook/slider.h"
-
-#include "chuniio/chuniio.h"
-
-#include "hook/process.h"
-
-#include "gfxhook/d3d9.h"
-#include "gfxhook/gfx.h"
-
-#include "hooklib/serial.h"
-#include "hooklib/spike.h"
-
-#include "platform/platform.h"
-
-#include "util/dprintf.h"
-#include "util/env.h"
-
-static HMODULE chusan_hook_mod;
-static process_entry_t chusan_startup;
-static struct chusan_hook_config chusan_hook_cfg;
-
-static DWORD CALLBACK chusan_pre_startup(void)
-{
-    HMODULE d3dc;
-    HMODULE dbghelp;
-    HRESULT hr;
-
-    dprintf("--- Begin chusan_pre_startup ---\n");
-
-    /* Pin the D3D shader compiler. This makes startup much faster. */
-
-    d3dc = LoadLibraryW(L"D3DCompiler_43.dll");
-
-    if (d3dc != NULL) {
-        dprintf("Pinned shader compiler, hMod=%p\n", d3dc);
-    } else {
-        dprintf("Failed to load shader compiler!\n");
-    }
-
-    /* Pin dbghelp so the path hooks apply to it. */
-
-    dbghelp = LoadLibraryW(L"dbghelp.dll");
-
-    if (dbghelp != NULL) {
-        dprintf("Pinned debug helper library, hMod=%p\n", dbghelp);
-    } else {
-        dprintf("Failed to load debug helper library!\n");
-    }
-
-    /* Config load */
-
-    chusan_hook_config_load(&chusan_hook_cfg, get_config_path());
-
-    /* Hook Win32 APIs */
-    
-    dvd_hook_init(&chusan_hook_cfg.dvd, chusan_hook_mod);
-    gfx_hook_init(&chusan_hook_cfg.gfx);
-    gfx_d3d9_hook_init(&chusan_hook_cfg.gfx, chusan_hook_mod);
-    serial_hook_init();
-
-    /* Initialize emulation hooks */
-
-    hr = platform_hook_init(
-        &chusan_hook_cfg.platform,
-        "SDHD",
-        "ACA2",
-        chusan_hook_mod);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    hr = chuni_dll_init(&chusan_hook_cfg.dll, chusan_hook_mod);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    hr = chusan_io4_hook_init(&chusan_hook_cfg.io4);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    hr = slider_hook_init(&chusan_hook_cfg.slider);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    bool *dipsw = &chusan_hook_cfg.platform.system.dipsw[0];
-    bool is_cvt = dipsw[2];
-
-    for (int i = 0; i < 3; i++) {
-        switch (i) {
-        case 0:
-            dprintf("DipSw: NetInstall: %s\n", dipsw[0] ? "Server" : "Client");
-            break;
-
-        case 1:
-            dprintf("DipSw: Monitor Type: %dFPS\n", dipsw[1] ? 60 : 120);
-            break;
-
-        case 2:
-            dprintf("DipSw: Cab Type: %s\n", is_cvt ? "CVT" : "SP");
-
-            break;
-        }
-    }
-
-    unsigned int first_port = is_cvt ? 2 : 20;
-
-    if (!is_cvt) {
-        hr = vfd_hook_init(&chusan_hook_cfg.vfd, 2);
-
-        if (FAILED(hr)) {
-            goto fail;
-        }
-    }
-
-    if ( chuni_dll.led_init == NULL || chuni_dll.led_set_leds == NULL )
-    {
-        dprintf("IO DLL doesn't support led_init/led_set_leds, cannot start LED15093 hook\n");
-    } else {
-        hr = led15093_hook_init(&chusan_hook_cfg.led15093, 
-            chuni_dll.led_init, chuni_dll.led_set_leds, first_port, 2, 2, 1);
-
-        if (FAILED(hr)) {
-            goto fail;
-        }
-    }
-
-    hr = sg_reader_hook_init(&chusan_hook_cfg.aime, 4, is_cvt ? 2: 3, chusan_hook_mod);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    /* Initialize debug helpers */
-
-    spike_hook_init(get_config_path());
-
-    dprintf("---  End  chusan_pre_startup ---\n");
-
-    /* Jump to EXE start address */
-
-    return chusan_startup();
-
-fail:
-    ExitProcess(EXIT_FAILURE);
-}
-
-BOOL WINAPI DllMain(HMODULE mod, DWORD cause, void *ctx)
-{
-    HRESULT hr;
-
-    if (cause != DLL_PROCESS_ATTACH) {
-        return TRUE;
-    }
-
-    chusan_hook_mod = mod;
-
-    hr = process_hijack_startup(chusan_pre_startup, &chusan_startup);
-
-    if (!SUCCEEDED(hr)) {
-        dprintf("Failed to hijack process startup: %x\n", (int) hr);
-    }
-
-    return SUCCEEDED(hr);
-}

chusanhook/io4.c

@@ -1,106 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "board/io4.h"
-
-#include "chusanhook/chuni-dll.h"
-#include "util/dprintf.h"
-
-struct chunithm_jvs_ir_mask {
-    uint16_t p1;
-    uint16_t p2;
-};
-
-// Incorrect IR beam mappings retained for backward compatibility
-static const struct chunithm_jvs_ir_mask chunithm_jvs_ir_masks_v1[] = {
-    { 0, 1 << 13 },
-    { 1 << 13, 0 },
-    { 0, 1 << 12 },
-    { 1 << 12, 0 },
-    { 0, 1 << 11 },
-    { 1 << 11, 0 },
-};
-
-static const struct chunithm_jvs_ir_mask chunithm_jvs_ir_masks[] = {
-    { 1 << 13, 0 },
-    { 0, 1 << 13 },
-    { 1 << 12, 0 },
-    { 0, 1 << 12 },
-    { 1 << 11, 0 },
-    { 0, 1 << 11 },
-};
-
-static HRESULT chusan_io4_poll(void* ctx, struct io4_state* state);
-static uint16_t coins;
-
-static const struct io4_ops chusan_io4_ops = {
-    .poll = chusan_io4_poll,
-};
-
-HRESULT chusan_io4_hook_init(const struct io4_config* cfg)
-{
-    HRESULT hr;
-
-    assert(chuni_dll.jvs_init != NULL);
-
-    dprintf("USB I/O: Starting IO backend\n");
-    hr = chuni_dll.jvs_init();
-
-    if (FAILED(hr)) {
-        dprintf("USB I/O: Backend error, I/O disconnected: %x\n", (int)hr);
-
-        return hr;
-    }
-
-    io4_hook_init(cfg, &chusan_io4_ops, NULL);
-
-    return S_OK;
-}
-
-static HRESULT chusan_io4_poll(void* ctx, struct io4_state* state)
-{
-    const struct chunithm_jvs_ir_mask *masks;
-    uint8_t opbtn;
-    uint8_t beams;
-    size_t i;
-
-    memset(state, 0, sizeof(*state));
-
-    opbtn = 0;
-    beams = 0;
-
-    chuni_dll.jvs_poll(&opbtn, &beams);
-    chuni_dll.jvs_read_coin_counter(&coins);
-
-    if (chuni_dll.api_version >= 0x0101) {
-        // Use correct mapping
-        masks = chunithm_jvs_ir_masks;
-    } else {
-        // Use backwards-compatible incorrect mapping
-        masks = chunithm_jvs_ir_masks_v1;
-    }
-
-    if (opbtn & CHUNI_IO_OPBTN_TEST) {
-        state->buttons[0] |= IO4_BUTTON_TEST;
-    }
-
-    if (opbtn & CHUNI_IO_OPBTN_SERVICE) {
-        state->buttons[0] |= IO4_BUTTON_SERVICE;
-    }
-
-    // Update the coin counter with the value from jvs_read_coin_counter
-    state->chutes[0] = coins << 8;
-
-    for (i = 0; i < 6; i++) {
-        /* Beam "press" is active-low hence the ~ */
-        if (~beams & (1 << i)) {
-            state->buttons[0] |= masks[i].p1;
-            state->buttons[1] |= masks[i].p2;
-        }
-    }
-
-    return S_OK;
-}

chusanhook/io4.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-HRESULT chusan_io4_hook_init(const struct io4_config *cfg);

chusanhook/meson.build

@@ -1,31 +0,0 @@
-shared_library(
-    'chusanhook',
-    name_prefix : '',
-    include_directories : inc,
-    implicit_include_directories : false,
-    vs_module_defs : 'chusanhook.def',
-    dependencies : [
-        capnhook.get_variable('hook_dep'),
-        capnhook.get_variable('hooklib_dep'),
-    ],
-    link_with : [
-        aimeio_lib,
-        board_lib,
-        chuniio_lib,
-        gfxhook_lib,
-        hooklib_lib,
-        platform_lib,
-        util_lib,
-    ],
-    sources : [
-        'chuni-dll.c',
-        'chuni-dll.h',
-        'config.c',
-        'config.h',
-        'dllmain.c',
-        'io4.c',
-        'io4.h',
-        'slider.c',
-        'slider.h',
-    ],
-)

chusanhook/slider.c

@@ -1,249 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <process.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "board/slider-cmd.h"
-#include "board/slider-frame.h"
-
-#include "chusanhook/chuni-dll.h"
-#include "chusanhook/slider.h"
-
-#include "hook/iobuf.h"
-#include "hook/iohook.h"
-
-#include "hooklib/uart.h"
-
-#include "util/dprintf.h"
-#include "util/dump.h"
-
-static HRESULT slider_handle_irp(struct irp *irp);
-static HRESULT slider_handle_irp_locked(struct irp *irp);
-
-static HRESULT slider_req_dispatch(const union slider_req_any *req);
-static HRESULT slider_req_reset(void);
-static HRESULT slider_req_get_board_info(void);
-static HRESULT slider_req_auto_scan_start(void);
-static HRESULT slider_req_auto_scan_stop(void);
-static HRESULT slider_req_set_led(const struct slider_req_set_led *req);
-
-static void slider_res_auto_scan(const uint8_t *state);
-
-static CRITICAL_SECTION slider_lock;
-static struct uart slider_uart;
-static uint8_t slider_written_bytes[520];
-static uint8_t slider_readable_bytes[520];
-
-HRESULT slider_hook_init(const struct slider_config *cfg)
-{
-    assert(cfg != NULL);
-    assert(chuni_dll.slider_init != NULL);
-
-    if (!cfg->enable) {
-        return S_FALSE;
-    }
-
-    InitializeCriticalSection(&slider_lock);
-
-    uart_init(&slider_uart, 1);
-    slider_uart.written.bytes = slider_written_bytes;
-    slider_uart.written.nbytes = sizeof(slider_written_bytes);
-    slider_uart.readable.bytes = slider_readable_bytes;
-    slider_uart.readable.nbytes = sizeof(slider_readable_bytes);
-
-    return iohook_push_handler(slider_handle_irp);
-}
-
-static HRESULT slider_handle_irp(struct irp *irp)
-{
-    HRESULT hr;
-
-    assert(irp != NULL);
-
-    if (!uart_match_irp(&slider_uart, irp)) {
-        return iohook_invoke_next(irp);
-    }
-
-    EnterCriticalSection(&slider_lock);
-    hr = slider_handle_irp_locked(irp);
-    LeaveCriticalSection(&slider_lock);
-
-    return hr;
-}
-
-static HRESULT slider_handle_irp_locked(struct irp *irp)
-{
-    union slider_req_any req;
-    struct iobuf req_iobuf;
-    HRESULT hr;
-
-    if (irp->op == IRP_OP_OPEN) {
-        dprintf("Chunithm slider: Starting backend\n");
-        hr = chuni_dll.slider_init();
-
-        if (FAILED(hr)) {
-            dprintf("Chunithm slider: Backend error: %x\n", (int) hr);
-
-            return hr;
-        }
-    }
-
-    hr = uart_handle_irp(&slider_uart, irp);
-
-    if (FAILED(hr) || irp->op != IRP_OP_WRITE) {
-        return hr;
-    }
-
-    for (;;) {
-#if defined(LOG_CHUSAN_SLIDER)
-        dprintf("TX Buffer:\n");
-        dump_iobuf(&slider_uart.written);
-#endif
-
-        req_iobuf.bytes = req.bytes;
-        req_iobuf.nbytes = sizeof(req.bytes);
-        req_iobuf.pos = 0;
-
-        hr = slider_frame_decode(&req_iobuf, &slider_uart.written);
-
-        if (hr != S_OK) {
-            if (FAILED(hr)) {
-                dprintf("Chunithm slider: Deframe error: %x\n", (int) hr);
-            }
-
-            return hr;
-        }
-
-#if defined(LOG_CHUSAN_SLIDER)
-        dprintf("Deframe Buffer:\n");
-        dump_iobuf(&req_iobuf);
-#endif
-
-        hr = slider_req_dispatch(&req);
-
-        if (FAILED(hr)) {
-            dprintf("Chunithm slider: Processing error: %x\n", (int) hr);
-        }
-    }
-}
-
-static HRESULT slider_req_dispatch(const union slider_req_any *req)
-{
-    switch (req->hdr.cmd) {
-    case SLIDER_CMD_RESET:
-        return slider_req_reset();
-
-    case SLIDER_CMD_GET_BOARD_INFO:
-        return slider_req_get_board_info();
-
-    case SLIDER_CMD_SET_LED:
-        return slider_req_set_led(&req->set_led);
-
-    case SLIDER_CMD_AUTO_SCAN_START:
-        return slider_req_auto_scan_start();
-
-    case SLIDER_CMD_AUTO_SCAN_STOP:
-        return slider_req_auto_scan_stop();
-
-    default:
-        dprintf("Unhandled command %02x\n", req->hdr.cmd);
-
-        return S_OK;
-    }
-}
-
-static HRESULT slider_req_reset(void)
-{
-    struct slider_hdr resp;
-
-    dprintf("Chunithm slider: Reset\n");
-
-    resp.sync = 0xFF;
-    resp.cmd = SLIDER_CMD_RESET;
-    resp.nbytes = 0;
-
-    return slider_frame_encode(&slider_uart.readable, &resp, sizeof(resp));
-}
-
-static HRESULT slider_req_get_board_info(void)
-{
-    struct slider_resp_get_board_info resp;
-
-    dprintf("Chunithm slider: Get firmware version\n");
-
-    memset(&resp, 0, sizeof(resp));
-    resp.hdr.sync = SLIDER_FRAME_SYNC;
-    resp.hdr.cmd = SLIDER_CMD_GET_BOARD_INFO;
-    resp.hdr.nbytes = sizeof(resp.version);
-
-    strcpy_s(
-            resp.version,
-            sizeof(resp.version),
-            "15330   \xA0" "06712\xFF" "\x90");
-
-    return slider_frame_encode(&slider_uart.readable, &resp, sizeof(resp));
-}
-
-static HRESULT slider_req_auto_scan_start(void)
-{
-    assert(chuni_dll.slider_start != NULL);
-
-    dprintf("Chunithm slider: Start slider notifications\n");
-    chuni_dll.slider_start(slider_res_auto_scan);
-
-    /* This message is not acknowledged */
-
-    return S_OK;
-}
-
-static HRESULT slider_req_auto_scan_stop(void)
-{
-    struct slider_hdr resp;
-
-    assert(chuni_dll.slider_stop != NULL);
-
-    dprintf("Chunithm slider: Stop slider notifications\n");
-
-    /* IO DLL worker thread might attempt to invoke the callback (which needs
-       to take slider_lock, which we are currently holding) before noticing that
-       it needs to shut down. Unlock here so that we don't deadlock in that
-       situation. */
-
-    LeaveCriticalSection(&slider_lock);
-    chuni_dll.slider_stop();
-    EnterCriticalSection(&slider_lock);
-
-    resp.sync = SLIDER_FRAME_SYNC;
-    resp.cmd = SLIDER_CMD_AUTO_SCAN_STOP;
-    resp.nbytes = 0;
-
-    return slider_frame_encode(&slider_uart.readable, &resp, sizeof(resp));
-}
-
-static HRESULT slider_req_set_led(const struct slider_req_set_led *req)
-{
-    assert(chuni_dll.slider_set_leds != NULL);
-
-    chuni_dll.slider_set_leds(req->payload.rgb);
-
-    /* This message is not acknowledged */
-
-    return S_OK;
-}
-
-static void slider_res_auto_scan(const uint8_t *state)
-{
-    struct slider_resp_auto_scan resp;
-
-    resp.hdr.sync = SLIDER_FRAME_SYNC;
-    resp.hdr.cmd = SLIDER_CMD_AUTO_SCAN;
-    resp.hdr.nbytes = sizeof(resp.pressure);
-    memcpy(resp.pressure, state, sizeof(resp.pressure));
-
-    EnterCriticalSection(&slider_lock);
-    slider_frame_encode(&slider_uart.readable, &resp, sizeof(resp));
-    LeaveCriticalSection(&slider_lock);
-}

chusanhook/slider.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stdbool.h>
-
-struct slider_config {
-    bool enable;
-};
-
-HRESULT slider_hook_init(const struct slider_config *cfg);

cmhook/cm-dll.c

@@ -1,106 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "cmhook/cm-dll.h"
-
-#include "util/dll-bind.h"
-#include "util/dprintf.h"
-
-const struct dll_bind_sym cm_dll_syms[] = {
-    {
-        .sym = "cm_io_init",
-        .off = offsetof(struct cm_dll, init),
-    }, {
-        .sym = "cm_io_poll",
-        .off = offsetof(struct cm_dll, poll),
-    }, {
-        .sym = "cm_io_get_opbtns",
-        .off = offsetof(struct cm_dll, get_opbtns),
-    }
-};
-
-struct cm_dll cm_dll;
-
-// Copypasta DLL binding and diagnostic message boilerplate.
-// Not much of this lends itself to being easily factored out. Also there
-// will be a lot of API-specific branching code here eventually as new API
-// versions get defined, so even though these functions all look the same
-// now this won't remain the case forever.
-
-HRESULT cm_dll_init(const struct cm_dll_config *cfg, HINSTANCE self)
-{
-    uint16_t (*get_api_version)(void);
-    const struct dll_bind_sym *sym;
-    HINSTANCE owned;
-    HINSTANCE src;
-    HRESULT hr;
-
-    assert(cfg != NULL);
-    assert(self != NULL);
-
-    if (cfg->path[0] != L'\0') {
-        owned = LoadLibraryW(cfg->path);
-
-        if (owned == NULL) {
-            hr = HRESULT_FROM_WIN32(GetLastError());
-            dprintf("CardMaker IO: Failed to load IO DLL: %lx: %S\n",
-                    hr,
-                    cfg->path);
-
-            goto end;
-        }
-
-        dprintf("CardMaker IO: Using custom IO DLL: %S\n", cfg->path);
-        src = owned;
-    } else {
-        owned = NULL;
-        src = self;
-    }
-
-    get_api_version = (void *) GetProcAddress(src, "cm_io_get_api_version");
-
-    if (get_api_version != NULL) {
-        cm_dll.api_version = get_api_version();
-    } else {
-        cm_dll.api_version = 0x0100;
-        dprintf("Custom IO DLL does not expose cm_io_get_api_version, "
-                "assuming API version 1.0.\n"
-                "Please ask the developer to update their DLL.\n");
-    }
-
-    if (cm_dll.api_version >= 0x0200) {
-        hr = E_NOTIMPL;
-        dprintf("CardMaker IO: Custom IO DLL implements an unsupported "
-                "API version (%#04x). Please update Segatools.\n",
-                cm_dll.api_version);
-
-        goto end;
-    }
-
-    sym = cm_dll_syms;
-    hr = dll_bind(&cm_dll, src, &sym, _countof(cm_dll_syms));
-
-    if (FAILED(hr)) {
-        if (src != self) {
-            dprintf("CardMaker IO: Custom IO DLL does not provide function "
-                    "\"%s\". Please contact your IO DLL's developer for "
-                    "further assistance.\n",
-                    sym->sym);
-
-            goto end;
-        } else {
-            dprintf("Internal error: could not reflect \"%s\"\n", sym->sym);
-        }
-    }
-
-    owned = NULL;
-
-end:
-    if (owned != NULL) {
-        FreeLibrary(owned);
-    }
-
-    return hr;
-}

cmhook/cm-dll.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include "cmio/cmio.h"
-
-struct cm_dll {
-    uint16_t api_version;
-    HRESULT (*init)(void);
-    HRESULT (*poll)(void);
-    void (*get_opbtns)(uint8_t *opbtn);
-};
-
-struct cm_dll_config {
-    wchar_t path[MAX_PATH];
-};
-
-extern struct cm_dll cm_dll;
-
-HRESULT cm_dll_init(const struct cm_dll_config *cfg, HINSTANCE self);

cmhook/cmhook.def

@@ -1,73 +0,0 @@
-LIBRARY cmhook
-
-EXPORTS
-    aime_io_get_api_version
-    aime_io_init
-    aime_io_led_set_color
-    aime_io_nfc_get_aime_id
-    aime_io_nfc_get_felica_id
-    aime_io_nfc_poll
-    amDllVideoClose @2
-    amDllVideoGetVBiosVersion @4
-    amDllVideoOpen @1
-    amDllVideoSetResolution @3
-    cm_io_get_api_version
-    cm_io_get_opbtns
-    cm_io_init
-    cm_io_poll
-    CFW_init
-    CFW_term
-    CFW_open
-    CFW_close
-    CFW_listupPrinter
-    CFW_listupPrinterSN
-    CFW_selectPrinter
-    CFW_selectPrinterSN
-    CFW_getPrinterInfo
-    CFW_status
-    CFW_statusAll
-    CFW_resetPrinter
-    CFW_updateFirmware
-    CFW_getFirmwareInfo
-    CHCUSB_init
-    CHCUSB_term
-    CHCUSB_MakeThread
-    CHCUSB_open
-    CHCUSB_close
-    CHCUSB_ReleaseThread
-    CHCUSB_listupPrinter
-    CHCUSB_listupPrinterSN
-    CHCUSB_selectPrinter
-    CHCUSB_selectPrinterSN
-    CHCUSB_getPrinterInfo
-    CHCUSB_imageformat
-    CHCUSB_setmtf
-    CHCUSB_makeGamma
-    CHCUSB_setIcctableProfile
-    CHCUSB_setIcctable
-    CHCUSB_copies
-    CHCUSB_status
-    CHCUSB_statusAll
-    CHCUSB_startpage
-    CHCUSB_endpage
-    CHCUSB_write
-    CHCUSB_writeLaminate
-    CHCUSB_writeHolo
-    CHCUSB_setPrinterInfo
-    CHCUSB_setPrinterToneCurve
-    CHCUSB_getGamma
-    CHCUSB_getMtf
-    CHCUSB_cancelCopies
-    CHCUSB_getPrinterToneCurve
-    CHCUSB_blinkLED
-    CHCUSB_resetPrinter
-    CHCUSB_AttachThreadCount
-    CHCUSB_getPrintIDStatus
-    CHCUSB_setPrintStandby
-    CHCUSB_testCardFeed
-    CHCUSB_exitCard
-    CHCUSB_getCardRfidTID
-    CHCUSB_commCardRfidReader
-    CHCUSB_updateCardRfidReader
-    CHCUSB_getErrorLog
-    CHCUSB_getErrorStatus

cmhook/config.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-
-#include "board/config.h"
-
-#include "hooklib/dvd.h"
-#include "hooklib/touch.h"
-#include "hooklib/printer.h"
-
-#include "cmhook/cm-dll.h"
-
-#include "platform/config.h"
-
-#include "unityhook/config.h"
-
-struct cm_hook_config {
-    struct platform_config platform;
-    struct aime_config aime;
-    struct dvd_config dvd;
-    struct io4_config io4;
-    struct vfd_config vfd;
-    struct cm_dll_config dll;
-    struct touch_screen_config touch;
-    struct printer_config printer;
-    struct unity_config unity;
-};
-
-void cm_dll_config_load(
-        struct cm_dll_config *cfg,
-        const wchar_t *filename);
-
-void cm_hook_config_load(
-        struct cm_hook_config *cfg,
-        const wchar_t *filename);

cmhook/dllmain.c

@@ -1,138 +0,0 @@
-/*
-    "Card Maker" (cm) hook
-
-    Devices
-
-    USB:    837-15257-01 "Type 4" I/O Board
-    USB:    838-20006 "WinTouch" Controller Board
-    USB:    630-00009 Sinfonia CHC-C310 Printer
-    COM1:   837-15396 "Gen 3" Aime Reader
-    COM2:   200-6275 VFD GP1232A02A FUTABA Board
-    COM3:   220-5872 AS-6DB Coin Selector
-*/
-
-#include <windows.h>
-
-#include <stdlib.h>
-
-#include "board/io4.h"
-#include "board/sg-reader.h"
-#include "board/vfd.h"
-
-#include "hook/process.h"
-
-#include "hooklib/dvd.h"
-#include "hooklib/touch.h"
-#include "hooklib/serial.h"
-#include "hooklib/spike.h"
-
-#include "cmhook/config.h"
-#include "cmhook/io4.h"
-#include "cmhook/cm-dll.h"
-
-#include "platform/platform.h"
-
-#include "unityhook/hook.h"
-
-#include "util/dprintf.h"
-#include "util/env.h"
-
-static HMODULE cm_hook_mod;
-static process_entry_t cm_startup;
-static struct cm_hook_config cm_hook_cfg;
-
-static DWORD CALLBACK cm_pre_startup(void)
-{
-    HRESULT hr;
-
-    dprintf("--- Begin cm_pre_startup ---\n");
-
-    /* Load config */
-
-    cm_hook_config_load(&cm_hook_cfg, get_config_path());
-
-    /* Hook Win32 APIs */
-
-    dvd_hook_init(&cm_hook_cfg.dvd, cm_hook_mod);
-    touch_screen_hook_init(&cm_hook_cfg.touch, cm_hook_mod);
-    serial_hook_init();
-
-    /* Hook external DLL APIs */
-
-    printer_hook_init(&cm_hook_cfg.printer, 0, cm_hook_mod);
-
-    /* Initialize emulation hooks */
-
-    hr = platform_hook_init(
-            &cm_hook_cfg.platform,
-            "SDED",
-            "ACA1",
-            cm_hook_mod);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    hr = cm_dll_init(&cm_hook_cfg.dll, cm_hook_mod);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    hr = sg_reader_hook_init(&cm_hook_cfg.aime, 1, 1, cm_hook_mod);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    hr = vfd_hook_init(&cm_hook_cfg.vfd, 2);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    hr = cm_io4_hook_init(&cm_hook_cfg.io4);
-
-    if (FAILED(hr)) {
-        goto fail;
-    }
-
-    /* Initialize Unity native plugin DLL hooks
-
-       There seems to be an issue with other DLL hooks if `LoadLibraryW` is
-       hooked earlier in the `cmhook` initialization. */
-
-    unity_hook_init(&cm_hook_cfg.unity, cm_hook_mod, NULL);
-
-    /* Initialize debug helpers */
-
-    spike_hook_init(get_config_path());
-
-    dprintf("---  End  cm_pre_startup ---\n");
-
-    /* Jump to EXE start address */
-
-    return cm_startup();
-
-fail:
-    ExitProcess(EXIT_FAILURE);
-}
-
-BOOL WINAPI DllMain(HMODULE mod, DWORD cause, void *ctx)
-{
-    HRESULT hr;
-
-    if (cause != DLL_PROCESS_ATTACH) {
-        return TRUE;
-    }
-
-    cm_hook_mod = mod;
-
-    hr = process_hijack_startup(cm_pre_startup, &cm_startup);
-
-    if (!SUCCEEDED(hr)) {
-        dprintf("Failed to hijack process startup: %x\n", (int) hr);
-    }
-
-    return SUCCEEDED(hr);
-}

cmhook/io4.c

@@ -1,69 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "board/io4.h"
-
-#include "cmhook/cm-dll.h"
-
-#include "util/dprintf.h"
-
-static HRESULT cm_io4_poll(void *ctx, struct io4_state *state);
-static uint16_t coins;
-
-static const struct io4_ops cm_io4_ops = {
-    .poll = cm_io4_poll,
-};
-
-HRESULT cm_io4_hook_init(const struct io4_config *cfg)
-{
-    HRESULT hr;
-
-    assert(cm_dll.init != NULL);
-
-    hr = io4_hook_init(cfg, &cm_io4_ops, NULL);
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    return cm_dll.init();
-}
-
-static HRESULT cm_io4_poll(void *ctx, struct io4_state *state)
-{
-    uint8_t opbtn;
-    HRESULT hr;
-
-    assert(cm_dll.poll != NULL);
-    assert(cm_dll.get_opbtns != NULL);
-
-    memset(state, 0, sizeof(*state));
-
-    hr = cm_dll.poll();
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    opbtn = 0;
-
-    cm_dll.get_opbtns(&opbtn);
-
-    if (opbtn & CM_IO_OPBTN_TEST) {
-        state->buttons[0] |= IO4_BUTTON_TEST;
-    }
-
-    if (opbtn & CM_IO_OPBTN_SERVICE) {
-        state->buttons[0] |= IO4_BUTTON_SERVICE;
-    }
-
-    if (opbtn & CM_IO_OPBTN_COIN) {
-        coins++;
-    }
-    state->chutes[0] = coins << 8;
-
-    return S_OK;
-}

cmhook/meson.build

@@ -1,30 +0,0 @@
-shared_library(
-    'cmhook',
-    name_prefix : '',
-    include_directories : inc,
-    implicit_include_directories : false,
-    vs_module_defs : 'cmhook.def',
-    dependencies : [
-        capnhook.get_variable('hook_dep'),
-        capnhook.get_variable('hooklib_dep'),
-        xinput_lib,
-    ],
-    link_with : [
-        aimeio_lib,
-        board_lib,
-        hooklib_lib,
-        cmio_lib,
-        platform_lib,
-        unityhook_lib,
-        util_lib,
-    ],
-    sources : [
-        'config.c',
-        'config.h',
-        'dllmain.c',
-        'io4.c',
-        'io4.h',
-        'cm-dll.c',
-        'cm-dll.h',
-    ],
-)

cmio/cmio.c

@@ -1,55 +0,0 @@
-#include <windows.h>
-#include <xinput.h>
-
-#include <limits.h>
-#include <stdint.h>
-
-#include "cmio/cmio.h"
-#include "cmio/config.h"
-#include "util/env.h"
-
-static uint8_t cm_opbtn;
-static struct cm_io_config cm_io_cfg;
-static bool cm_io_coin;
-
-uint16_t cm_io_get_api_version(void)
-{
-    return 0x0100;
-}
-
-HRESULT cm_io_init(void)
-{
-    cm_io_config_load(&cm_io_cfg, get_config_path());
-    return S_OK;
-}
-
-HRESULT cm_io_poll(void)
-{
-    cm_opbtn = 0;
-
-    if (GetAsyncKeyState(cm_io_cfg.vk_test) & 0x8000) {
-        cm_opbtn |= CM_IO_OPBTN_TEST;
-    }
-
-    if (GetAsyncKeyState(cm_io_cfg.vk_service) & 0x8000) {
-        cm_opbtn |= CM_IO_OPBTN_SERVICE;
-    }
-
-    if (GetAsyncKeyState(cm_io_cfg.vk_coin) & 0x8000) {
-        if (!cm_io_coin) {
-            cm_io_coin = true;
-            cm_opbtn |= CM_IO_OPBTN_COIN;
-        }
-    } else {
-        cm_io_coin = false;
-    }
-
-    return S_OK;
-}
-
-void cm_io_get_opbtns(uint8_t *opbtn)
-{
-    if (opbtn != NULL) {
-        *opbtn = cm_opbtn;
-    }
-}

cmio/config.c

@@ -1,22 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include "cmio/config.h"
-
-void cm_io_config_load(
-        struct cm_io_config *cfg,
-        const wchar_t *filename)
-{
-    wchar_t key[16];
-    int i;
-
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename);
-}

cmio/config.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <stdbool.h>
-
-struct cm_io_config {
-    uint8_t vk_test;
-    uint8_t vk_service;
-    uint8_t vk_coin;
-};
-
-void cm_io_config_load(
-        struct cm_io_config *cfg,
-        const wchar_t *filename);

cxbhook/config.c

@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdlib.h>
 
 #include "amex/amex.h"
 #include "amex/config.h"
@@ -24,32 +23,22 @@ void cxb_dll_config_load(
         struct cxb_dll_config *cfg,
         const wchar_t *filename)
 {
-    assert(cfg != NULL);
-    assert(filename != NULL);
 
-    GetPrivateProfileStringW(
-            L"cxbio",
-            L"path",
-            L"",
-            cfg->path,
-            _countof(cfg->path),
-            filename);
 }
 
 void revio_config_load(struct revio_config *cfg, const wchar_t *filename)
 {
-    assert(cfg != NULL);
-    assert(filename != NULL);
 
-    cfg->enable = GetPrivateProfileIntW(L"revio", L"enable", 1, filename);
+}
+
+void network_config_load(struct network_config *cfg, const wchar_t *filename)
+{
+
 }
 
 void led_config_load(struct led_config *cfg, const wchar_t *filename)
 {
-    assert(cfg != NULL);
-    assert(filename != NULL);
 
-    cfg->enable = GetPrivateProfileIntW(L"led", L"enable", 1, filename);
 }
 
 void cxb_hook_config_load(
@@ -67,5 +56,6 @@ void cxb_hook_config_load(
     gfx_config_load(&cfg->gfx, filename);
     cxb_dll_config_load(&cfg->dll, filename);
     revio_config_load(&cfg->revio, filename);
+    network_config_load(&cfg->network, filename);
     led_config_load(&cfg->led, filename);
 }

cxbhook/config.h

@@ -10,6 +10,7 @@
 #include "cxbhook/cxb-dll.h"
 #include "cxbhook/revio.h"
 #include "cxbhook/led.h"
+#include "cxbhook/network.h"
 
 #include "gfxhook/gfx.h"
 
@@ -22,6 +23,7 @@ struct cxb_hook_config {
     struct gfx_config gfx;
     struct cxb_dll_config dll;
     struct revio_config revio;
+    struct network_config network;
     struct led_config led;
 };
 
@@ -30,6 +32,7 @@ void cxb_dll_config_load(
         const wchar_t *filename);
 
 void revio_config_load(struct revio_config *cfg, const wchar_t *filename);
+void network_config_load(struct network_config *cfg, const wchar_t *filename);
 void led_config_load(struct led_config *cfg, const wchar_t *filename);
 
 void cxb_hook_config_load(

cxbhook/dllmain.c

@@ -9,6 +9,7 @@
 #include "cxbhook/config.h"
 #include "cxbhook/revio.h"
 #include "cxbhook/led.h"
+#include "cxbhook/network.h"
 
 #include "cxbio/cxbio.h"
 
@@ -23,7 +24,6 @@
 #include "platform/platform.h"
 
 #include "util/dprintf.h"
-#include "util/env.h"
 
 static HMODULE cxb_hook_mod;
 static process_entry_t cxb_startup;
@@ -59,7 +59,7 @@ static DWORD CALLBACK cxb_pre_startup(void)
 
     /* Config load */
 
-    cxb_hook_config_load(&cxb_hook_cfg, get_config_path());
+    cxb_hook_config_load(&cxb_hook_cfg, L".\\segatools.ini");
 
     /* Hook Win32 APIs */
 
@@ -91,7 +91,7 @@ static DWORD CALLBACK cxb_pre_startup(void)
         goto fail;
     }
 
-    hr = sg_reader_hook_init(&cxb_hook_cfg.aime, 12, 1, cxb_hook_mod);
+    hr = sg_reader_hook_init(&cxb_hook_cfg.aime, 12, cxb_hook_mod);
 
     if (FAILED(hr)) {
         goto fail;
@@ -103,6 +103,12 @@ static DWORD CALLBACK cxb_pre_startup(void)
         goto fail;
     }
 
+    hr = network_hook_init(&cxb_hook_cfg.network);
+
+    if (FAILED(hr)) {
+        goto fail;
+    }
+
     hr = led_hook_init(&cxb_hook_cfg.led);
 
     if (FAILED(hr)) {
@@ -111,7 +117,7 @@ static DWORD CALLBACK cxb_pre_startup(void)
 
     /* Initialize debug helpers */
 
-    spike_hook_init(get_config_path());
+    spike_hook_init(L".\\segatools.ini");
 
     dprintf("---  End  cxb_pre_startup ---\n");
 

cxbhook/led.c

@@ -1,6 +1,4 @@
 #include <windows.h>
-
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -52,13 +50,7 @@ static struct hook_symbol lamp_syms[] = {
 
 HRESULT led_hook_init(struct led_config *cfg)
 {
-    assert(cfg != NULL);
+    dprintf("LED: Init\n");
-
-    if (!cfg->enable) {
-        return S_FALSE;
-    }
-    
-    dprintf("LED: Hook enabled.\n");
     return proc_addr_table_push(NULL, "CommLamp.dll", lamp_syms, _countof(lamp_syms));
 }
 

cxbhook/meson.build

@@ -29,5 +29,7 @@ shared_library(
         'revio.h',
         'led.c',
         'led.h',
+        'network.c',
+        'network.h',
     ],
 )

cxbhook/network.c

@@ -0,0 +1,13 @@
+#include <windows.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "cxbhook/network.h"
+
+#include "util/dprintf.h"
+
+HRESULT network_hook_init(struct network_config *cfg)
+{
+    dprintf("Network: Init\n");
+    return S_OK;
+}

cxbhook/network.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <windows.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <limits.h>
+
+struct network_config {
+    bool enable;
+    bool disable_ssl;
+    char title_server[PATH_MAX];
+};
+
+HRESULT network_hook_init(struct network_config *cfg);

cxbhook/revio.c

@@ -1,10 +1,8 @@
 #include <windows.h>
-
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <winuser.h>
+#include <stdlib.h>
 
 #include "cxbhook/revio.h"
 #include "cxbhook/cxb-dll.h"
@@ -85,13 +83,7 @@ static struct hook_symbol revio_syms[] = {
 
 HRESULT revio_hook_init(struct revio_config *cfg)
 {
-    assert(cfg != NULL);
+    dprintf("Revio: Init\n");
-
-    if (!cfg->enable) {
-        return S_FALSE;
-    }
-
-    dprintf("Revio: Hook enabled.\n");
     return proc_addr_table_push(NULL, "CommIo.dll", revio_syms, _countof(revio_syms));
 }
 
@@ -163,7 +155,7 @@ static int my_cCommIo_GetTrigger()
     
     out &= ~last_triggers;
 
-    // dprintf("Revio: GetTrigger %X\n", out);
+    dprintf("Revio: GetTrigger %X\n", out);
     last_triggers = out;
     return out;
 }
@@ -197,7 +189,7 @@ static int my_cCommIo_GetRelease()
 
     out &= ~btns;
     
-    // dprintf("Revio: GetRelease %X\n", out);
+    dprintf("Revio: GetRelease %X\n", out);
     last_triggers = btns;
     return out;
 }