update readme

.clang-format

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

.gitignore

@@ -18,9 +18,3 @@ build/
 
 # External dependencies
 subprojects/capnhook
-
-# For enabling debug logging on local builds
-MesonLocalOptions.mk
-
-# Some meson cache thing
-.meson-subproject-wrap-hash.txt

.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

@@ -5,19 +5,12 @@ V               ?= @
 BUILD_DIR := build
 BUILD_DIR_32 := $(BUILD_DIR)/build32
 BUILD_DIR_64 := $(BUILD_DIR)/build64
-BUILD_DIR_GAMES_32 := $(BUILD_DIR_32)/games
-BUILD_DIR_GAMES_64 := $(BUILD_DIR_64)/games
 BUILD_DIR_ZIP := $(BUILD_DIR)/zip
 
 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
 # -----------------------------------------------------------------------------
@@ -26,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

@@ -3,9 +3,9 @@ $(BUILD_DIR_ZIP)/chuni.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/chuni
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/chuni/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_32)/chunihook/chunihook.dll \
+		$(BUILD_DIR_32)/chunihook/chunihook.dll \
 		$(DIST_DIR)/chuni/segatools.ini \
-		$(DIST_DIR)/chuni/launch.bat \
+		$(DIST_DIR)/chuni/start.bat \
 		$(BUILD_DIR_ZIP)/chuni
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -18,9 +18,9 @@ $(BUILD_DIR_ZIP)/cxb.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cxb
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cxb/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_32)/cxbhook/cxbhook.dll \
+		$(BUILD_DIR_32)/cxbhook/cxbhook.dll \
 		$(DIST_DIR)/cxb/segatools.ini \
-		$(DIST_DIR)/cxb/launch.bat \
+		$(DIST_DIR)/cxb/start.bat \
 		$(BUILD_DIR_ZIP)/cxb
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -33,9 +33,9 @@ $(BUILD_DIR_ZIP)/diva.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/diva
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/diva/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/divahook/divahook.dll \
+		$(BUILD_DIR_64)/divahook/divahook.dll \
 		$(DIST_DIR)/diva/segatools.ini \
-		$(DIST_DIR)/diva/launch.bat \
+		$(DIST_DIR)/diva/start.bat \
 		$(BUILD_DIR_ZIP)/diva
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -48,9 +48,9 @@ $(BUILD_DIR_ZIP)/carol.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/carol
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/carol/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_32)/carolhook/carolhook.dll \
+		$(BUILD_DIR_32)/carolhook/carolhook.dll \
 		$(DIST_DIR)/carol/segatools.ini \
-		$(DIST_DIR)/carol/launch.bat \
+		$(DIST_DIR)/carol/start.bat \
 		$(BUILD_DIR_ZIP)/carol
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -63,9 +63,9 @@ $(BUILD_DIR_ZIP)/idz.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idz
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idz/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/idzhook/idzhook.dll \
+		$(BUILD_DIR_64)/idzhook/idzhook.dll \
 		$(DIST_DIR)/idz/segatools.ini \
-		$(DIST_DIR)/idz/launch.bat \
+		$(DIST_DIR)/idz/start.bat \
     	$(BUILD_DIR_ZIP)/idz
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -73,61 +73,14 @@ $(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_GAMES_64)/fgohook/fgohook.dll \
-		$(DIST_DIR)/fgo/segatools.ini \
-		$(DIST_DIR)/fgo/launch.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_GAMES_64)/idachook/idachook.dll \
-		$(DIST_DIR)/idac/segatools.ini \
-		$(DIST_DIR)/idac/config_hook.json \
-		$(DIST_DIR)/idac/launch.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_GAMES_64)/swdchook/swdchook.dll \
-		$(DIST_DIR)/swdc/segatools.ini \
-		$(DIST_DIR)/swdc/config_hook.json \
-		$(DIST_DIR)/swdc/launch.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
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mercury/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/mercuryhook/mercuryhook.dll \
+		$(BUILD_DIR_64)/mercuryhook/mercuryhook.dll \
 		$(DIST_DIR)/mercury/segatools.ini \
-		$(DIST_DIR)/mercury/launch.bat \
+		$(DIST_DIR)/mercury/start.bat \
     	$(BUILD_DIR_ZIP)/mercury
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -135,36 +88,15 @@ $(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/launch.bat \
-		$(BUILD_DIR_ZIP)/chusan
-	$(V)cp $(BUILD_DIR_GAMES_32)/chusanhook/chusanhook.dll \
-		$(BUILD_DIR_ZIP)/chusan/chusanhook_x86.dll
-	$(V)cp $(BUILD_DIR_GAMES_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 ... $@
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mu3
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mu3/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/mu3hook/mu3hook.dll \
+		$(BUILD_DIR_64)/mu3hook/mu3hook.dll \
 		$(DIST_DIR)/mu3/segatools.ini \
-		$(DIST_DIR)/mu3/launch.bat \
+		$(DIST_DIR)/mu3/start.bat \
     	$(BUILD_DIR_ZIP)/mu3
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -172,14 +104,29 @@ $(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
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mai2/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/mai2hook/mai2hook.dll \
+		$(BUILD_DIR_64)/mai2hook/mai2hook.dll \
 		$(DIST_DIR)/mai2/segatools.ini \
-		$(DIST_DIR)/mai2/launch.bat \
+		$(DIST_DIR)/mai2/start.bat \
     	$(BUILD_DIR_ZIP)/mai2
 	$(V)cp pki/billing.pub \
 		pki/ca.crt \
@@ -187,75 +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_GAMES_64)/cmhook/cmhook.dll \
-		$(DIST_DIR)/cm/config_hook.json \
-		$(DIST_DIR)/cm/segatools.ini \
-		$(DIST_DIR)/cm/launch.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_GAMES_64)/tokyohook/tokyohook.dll \
-		$(DIST_DIR)/tokyo/config_hook.json \
-		$(DIST_DIR)/tokyo/segatools.ini \
-		$(DIST_DIR)/tokyo/launch.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/launch.bat \
-		$(BUILD_DIR_ZIP)/kemono
-	$(V)cp $(BUILD_DIR_GAMES_32)/kemonohook/kemonohook.dll \
-		$(BUILD_DIR_ZIP)/kemono/kemonohook_x86.dll
-	$(V)cp $(BUILD_DIR_GAMES_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)/apm3.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/apm3
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/apm3/DEVICE
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/apm3hook/apm3hook.dll \
-		$(DIST_DIR)/apm3/segatools.ini \
-		$(DIST_DIR)/apm3/launch.bat \
-		$(DIST_DIR)/apm3/config_hook.json \
-    	$(BUILD_DIR_ZIP)/apm3
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-    	$(BUILD_DIR_ZIP)/apm3/DEVICE
-	$(V)strip $(BUILD_DIR_ZIP)/apm3/*.{exe,dll}
-	$(V)cd $(BUILD_DIR_ZIP)/apm3 ; zip -r ../apm3.zip *
-
 $(BUILD_DIR_ZIP)/doc.zip: \
 		$(DOC_DIR)/config \
 		$(DOC_DIR)/chunihook.md \
@@ -271,17 +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 \
-		$(BUILD_DIR_ZIP)/apm3.zip \
 		CHANGELOG.md \
 		README.md \
 

README.md

@@ -1,51 +1,2 @@
-# Segatools
-
-Version: `2025-07-27`
-
-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
-* ALL.Net P-ras MULTI Version 3
-  * starting from ALL.Net P-ras MULTI Version 3 1.01
-
-## 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).
+# This repository is no longer maintained
+Please see the new joint repository from [TeamTofuShop](https://gitea.tendokyu.moe/TeamTofuShop/segatools)

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/gpio.c

@@ -1,4 +1,5 @@
 #include <windows.h>
+#include <ntstatus.h>
 #include <winioctl.h>
 
 #include <assert.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

@@ -0,0 +1,41 @@
+#include <windows.h>
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "board/aime-dll.h"
+#include "board/config.h"
+#include "board/sg-reader.h"
+
+static void aime_dll_config_load(struct aime_dll_config *cfg, const wchar_t *filename)
+{
+    assert(cfg != NULL);
+    assert(filename != NULL);
+
+    GetPrivateProfileStringW(
+            L"aimeio",
+            L"path",
+            L"",
+            cfg->path,
+            _countof(cfg->path),
+            filename);
+}
+
+void aime_config_load(struct aime_config *cfg, const wchar_t *filename)
+{
+    assert(cfg != NULL);
+    assert(filename != NULL);
+
+    aime_dll_config_load(&cfg->dll, filename);
+    cfg->enable = GetPrivateProfileIntW(L"aime", L"enable", 1, filename);
+}
+
+void io4_config_load(struct io4_config *cfg, const wchar_t *filename)
+{
+    assert(cfg != NULL);
+    assert(filename != NULL);
+
+    cfg->enable = GetPrivateProfileIntW(L"io4", 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/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");
-
-        if (io4_ops->write_gpio != NULL) {
-            return io4_ops->write_gpio(out.payload, IO4_REPORT_OUT_PAYLOAD_LEN);
-        }
+        dprintf("USB I/O: GPIO Out\n");
 
         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/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[] = {
-    {"15084\xFF\x10\x00\x12", 9},
-    {"000-00000\xFF\x11\x40", 12},
-    // maybe the same?
-    {"000-00000\xFF\x11\x40", 12}
+static const uint8_t sg_led_info[] = {
+    '1', '5', '0', '8', '4', 0xFF, 0x10, 0x00, 0x12,
 };
 
 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");
-
-    const struct version_info *fw = &led_version[led->gen - 1];
-
-    sg_res_init(&res->res, req, fw->length);
-    memcpy(res->payload, fw->version, fw->length);
+    sg_res_init(&res->res, req, sizeof(res->payload));
+    memcpy(res->payload, sg_led_info, sizeof(sg_led_info));
 
     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_HW_VERSION           = 0x32,
-    SG_NFC_CMD_RADIO_ON                 = 0x40,
-    SG_NFC_CMD_RADIO_OFF                = 0x41,
-    SG_NFC_CMD_POLL                     = 0x42,
-    SG_NFC_CMD_MIFARE_SELECT_TAG        = 0x43,
-    SG_NFC_CMD_MIFARE_SET_KEY_AIME      = 0x50,
-    SG_NFC_CMD_MIFARE_AUTHENTICATE_AIME = 0x51,
-    SG_NFC_CMD_MIFARE_READ_BLOCK        = 0x52,
-    SG_NFC_CMD_MIFARE_SET_KEY_BANA      = 0x54,
-    SG_NFC_CMD_MIFARE_AUTHENTICATE_BANA = 0x55,
-    SG_NFC_CMD_TO_UPDATE_MODE           = 0x60,
-    SG_NFC_CMD_SEND_HEX_DATA            = 0x61,
-    SG_NFC_CMD_RESET                    = 0x62,
-    SG_NFC_CMD_FELICA_ENCAP             = 0x71,
+    SG_NFC_CMD_GET_FW_VERSION       = 0x30,
+    SG_NFC_CMD_GET_HW_VERSION       = 0x32,
+    SG_NFC_CMD_RADIO_ON             = 0x40,
+    SG_NFC_CMD_RADIO_OFF            = 0x41,
+    SG_NFC_CMD_POLL                 = 0x42,
+    SG_NFC_CMD_MIFARE_SELECT_TAG    = 0x43,
+    SG_NFC_CMD_MIFARE_SET_KEY_BANA  = 0x50,
+    SG_NFC_CMD_MIFARE_READ_BLOCK    = 0x52,
+    SG_NFC_CMD_MIFARE_SET_KEY_AIME  = 0x54,
+    SG_NFC_CMD_MIFARE_AUTHENTICATE  = 0x55, /* guess based on time sent */
+    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

@@ -2,7 +2,6 @@
 
 #include <assert.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -17,7 +16,6 @@
 
 #include "util/dprintf.h"
 #include "util/dump.h"
-#include "util/slurp.h"
 
 static HRESULT sg_nfc_dispatch(
         void *ctx,
@@ -62,35 +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,
-        unsigned int proxy_flag,
-        const wchar_t* authdata_path,
         void *ops_ctx)
 {
     assert(nfc != NULL);
@@ -99,9 +77,6 @@ void sg_nfc_init(
     nfc->ops = ops;
     nfc->ops_ctx = ops_ctx;
     nfc->addr = addr;
-    nfc->gen = gen;
-    nfc->proxy_flag = proxy_flag;
-    nfc->authdata_path = authdata_path;
 }
 
 #ifdef NDEBUG
@@ -195,17 +170,12 @@ static HRESULT sg_nfc_dispatch(
                 &req->felica_encap,
                 &res->felica_encap);
 
-    case SG_NFC_CMD_MIFARE_AUTHENTICATE_AIME:
-    case SG_NFC_CMD_MIFARE_AUTHENTICATE_BANA:
-    case SG_NFC_CMD_SEND_HEX_DATA:
-        return sg_nfc_cmd_send_hex_data(nfc, &req->simple, &res->simple);
-
+    case SG_NFC_CMD_MIFARE_AUTHENTICATE:
     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:
@@ -232,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);
-    memcpy(res->version, fw->version, fw->length);
+    sg_res_init(&res->res, req, sizeof(res->version));
+    memcpy(res->version, "TN32MSEC003S F/W Ver1.2E", sizeof(res->version));
 
     return S_OK;
 }
@@ -246,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);
-    memcpy(res->version, hw->version, hw->length);
+    sg_res_init(&res->res, req, sizeof(res->version));
+    memcpy(res->version, "TN32MSEC003S H/W Ver3.0J", sizeof(res->version));
 
     return S_OK;
 }
@@ -321,7 +287,6 @@ static HRESULT sg_nfc_poll_aime(
 
     mifare->type = 0x10;
     mifare->id_len = sizeof(mifare->uid);
-    // mifare->uid = _byteswap_ulong(0x8FBECBFF);
     mifare->uid = _byteswap_ulong(0x01020304);
 
     /* Initialize MIFARE IC emulator */
@@ -361,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.system_code = 0x88b4;
+    nfc->felica.PMm = felica_get_generic_PMm();
+    nfc->felica.system_code = 0x0000;
 
     return S_OK;
 }
@@ -389,62 +354,18 @@ static HRESULT sg_nfc_cmd_mifare_read_block(
 
     sg_nfc_dprintf(nfc, "Read uid %08x block %i\n", uid, req->payload.block_no);
 
-    if (req->payload.block_no > 14) {
+    if (req->payload.block_no > 3) {
         sg_nfc_dprintf(nfc, "MIFARE block number out of range\n");
 
         return E_FAIL;
-    } else if (req->payload.block_no >= 5){ // emoney auth encrypted
-
-        sg_res_init(&res->res, &req->req, sizeof(res->block));
-
-        char* auth;
-        long size = wslurp(nfc->authdata_path, &auth, false);
-        if (size < 0){
-            sg_nfc_dprintf(nfc, "Failed to read %ls: %lx!\n", nfc->authdata_path, GetLastError());
-            return E_FAIL;
-        }
-
-        int offset = 0;
-        if (req->payload.block_no == 6){
-            offset = 16;
-        } else if (req->payload.block_no == 8){
-            offset = 32;
-        } else if (req->payload.block_no == 9){
-            offset = 48;
-        } else if (req->payload.block_no == 10){
-            offset = 64;
-        } else if (req->payload.block_no == 12){
-            offset = 82;
-        } else if (req->payload.block_no == 13){
-            offset = 98;
-        } else if (req->payload.block_no == 14){
-            offset = 114;
-        }
-
-        for (int i = 0; i < 16 && offset + i < size; i++){
-            res->block[i] = auth[offset + i];
-        }
-
-        free(auth);
-
-    } else if (req->payload.block_no == 4){ // emoney auth plain
-
-        sg_res_init(&res->res, &req->req, sizeof(res->block));
-
-        res->block[0] = 0x54; // header
-        res->block[1] = 0x43;
-        res->block[2] = nfc->proxy_flag; // 2 or 3 depending on game (useProxy in env.json)
-        res->block[3] = 0x01; // unknown flag
-
-    } else { // read all other blocks normally
-
-        sg_res_init(&res->res, &req->req, sizeof(res->block));
-
-        memcpy( res->block,
-                nfc->mifare.sectors[0].blocks[req->payload.block_no].bytes,
-                sizeof(res->block));
     }
 
+    sg_res_init(&res->res, &req->req, sizeof(res->block));
+
+    memcpy( res->block,
+            nfc->mifare.sectors[0].blocks[req->payload.block_no].bytes,
+            sizeof(res->block));
+
     return S_OK;
 }
 
@@ -480,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
@@ -494,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
@@ -502,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,20 +22,14 @@ struct sg_nfc {
     const struct sg_nfc_ops *ops;
     void *ops_ctx;
     uint8_t addr;
-    unsigned int gen;
-    unsigned int proxy_flag;
     struct felica felica;
     struct mifare mifare;
-    const wchar_t* authdata_path;
 };
 
 void sg_nfc_init(
         struct sg_nfc *nfc,
         uint8_t addr,
         const struct sg_nfc_ops *ops,
-        unsigned int gen,
-        unsigned int proxy_flag,
-        const wchar_t* authdata_path,
         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 gen,
+        unsigned int port_no,
         HINSTANCE self)
 {
     HRESULT hr;
@@ -66,31 +65,11 @@ HRESULT sg_reader_hook_init(
         return hr;
     }
 
-    unsigned int port_no = cfg->port_no;
-    if (port_no == 0){
-        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, cfg->proxy_flag, cfg->authdata_path, NULL);
-    sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, gen, NULL);
+    sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, NULL);
+    sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, NULL);
 
     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,15 +9,9 @@
 struct aime_config {
     struct aime_dll_config dll;
     bool enable;
-    unsigned int port_no;
-    bool high_baudrate;
-    unsigned int gen;
-    unsigned int proxy_flag;
-    wchar_t authdata_path[MAX_PATH];
 };
 
 HRESULT sg_reader_hook_init(
         const struct aime_config *cfg,
-        unsigned int default_port_no,
-        unsigned int gen,
+        unsigned int port_no,
         HINSTANCE self);

board/vfd.c

@@ -0,0 +1,62 @@
+/* This is some sort of LCD display found on various cabinets. It is driven
+   directly by amdaemon, and it has something to do with displaying the status
+   of electronic payments.
+
+   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 "board/vfd.h"
+
+#include "hook/iohook.h"
+
+#include "hooklib/uart.h"
+
+#include "util/dprintf.h"
+#include "util/dump.h"
+
+static HRESULT vfd_handle_irp(struct irp *irp);
+
+static struct uart vfd_uart;
+static uint8_t vfd_written[512];
+static uint8_t vfd_readable[512];
+
+HRESULT vfd_hook_init(unsigned int port_no)
+{
+    uart_init(&vfd_uart, port_no);
+    vfd_uart.written.bytes = vfd_written;
+    vfd_uart.written.nbytes = sizeof(vfd_written);
+    vfd_uart.readable.bytes = vfd_readable;
+    vfd_uart.readable.nbytes = sizeof(vfd_readable);
+
+    return iohook_push_handler(vfd_handle_irp);
+}
+
+static HRESULT vfd_handle_irp(struct irp *irp)
+{
+    HRESULT hr;
+
+    assert(irp != NULL);
+
+    if (!uart_match_irp(&vfd_uart, irp)) {
+        return iohook_invoke_next(irp);
+    }
+
+    hr = uart_handle_irp(&vfd_uart, irp);
+
+    if (FAILED(hr) || irp->op != IRP_OP_WRITE) {
+        return hr;
+    }
+
+    dprintf("VFD TX:\n");
+    dump_iobuf(&vfd_uart.written);
+    vfd_uart.written.pos = 0;
+
+    return hr;
+}

board/vfd.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <windows.h>
+
+HRESULT vfd_hook_init(unsigned int 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;
@@ -74,6 +45,8 @@ static DWORD CALLBACK carol_pre_startup(void)
     HMODULE dbghelp;
 
     dprintf("--- Begin carol_pre_startup ---\n");
+    if ( !SetProcessDPIAware() )
+        dprintf("Failed to set process DPI awareness level!\n");
     
     /* Pin the D3D shader compiler. This makes startup much faster. */
 
@@ -99,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 */
 
@@ -129,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;
@@ -163,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;
@@ -196,12 +196,12 @@ static void touch_scan_auto(const bool is_pressed, const uint16_t mouse_x, const
 
         flg = resp.touches[0].x1 != last_x1 || resp.touches[0].x2 != last_x2 || resp.touches[0].y1 != last_y1 || resp.touches[0].y2 != last_y2;
 
-#if 0
+#if 1
         if (flg)
             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_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename);
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', 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
-            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("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

@@ -0,0 +1,62 @@
+#include <windows.h>
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "amex/amex.h"
+#include "amex/config.h"
+
+#include "board/config.h"
+#include "board/sg-reader.h"
+
+#include "chunihook/config.h"
+
+#include "gfxhook/config.h"
+
+#include "hooklib/config.h"
+
+#include "platform/config.h"
+#include "platform/platform.h"
+
+void chuni_dll_config_load(
+        struct chuni_dll_config *cfg,
+        const wchar_t *filename)
+{
+    assert(cfg != NULL);
+    assert(filename != NULL);
+
+    GetPrivateProfileStringW(
+            L"chuniio",
+            L"path",
+            L"",
+            cfg->path,
+            _countof(cfg->path),
+            filename);
+}
+
+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 chuni_hook_config_load(
+        struct chuni_hook_config *cfg,
+        const wchar_t *filename)
+{
+    assert(cfg != NULL);
+    assert(filename != NULL);
+
+    memset(cfg, 0, sizeof(*cfg));
+
+    platform_config_load(&cfg->platform, filename);
+    amex_config_load(&cfg->amex, filename);
+    aime_config_load(&cfg->aime, filename);
+    gfx_config_load(&cfg->gfx, filename);
+    chuni_dll_config_load(&cfg->dll, filename);
+    slider_config_load(&cfg->slider, 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,20 +96,7 @@ static DWORD CALLBACK chuni_pre_startup(void)
         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 {
-        unsigned int led_port_no[2] = {10, 11};
-        hr = led15093_hook_init(&chuni_hook_cfg.led15093, 
-            chuni_dll.led_init, chuni_dll.led_set_leds, led_port_no);
-
-        if (FAILED(hr)) {
-            goto fail;
-        }
-    }
-
-    hr = sg_reader_hook_init(&chuni_hook_cfg.aime, 12, 1, chuni_hook_mod);
+    hr = sg_reader_hook_init(&chuni_hook_cfg.aime, 12, chuni_hook_mod);
 
     if (FAILED(hr)) {
         goto fail;
@@ -131,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/chuniio.c

@@ -0,0 +1,139 @@
+#include <windows.h>
+
+#include <process.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "chuniio/chuniio.h"
+#include "chuniio/config.h"
+
+static unsigned int __stdcall chuni_io_slider_thread_proc(void *ctx);
+
+static bool chuni_io_coin;
+static uint16_t chuni_io_coins;
+static uint8_t chuni_io_hand_pos;
+static HANDLE chuni_io_slider_thread;
+static bool chuni_io_slider_stop_flag;
+static struct chuni_io_config chuni_io_cfg;
+
+uint16_t chuni_io_get_api_version(void)
+{
+    return 0x0101;
+}
+
+HRESULT chuni_io_jvs_init(void)
+{
+    chuni_io_config_load(&chuni_io_cfg, L".\\segatools.ini");
+
+    return S_OK;
+}
+
+void chuni_io_jvs_read_coin_counter(uint16_t *out)
+{
+    if (out == NULL) {
+        return;
+    }
+
+    if (GetAsyncKeyState(chuni_io_cfg.vk_coin)) {
+        if (!chuni_io_coin) {
+            chuni_io_coin = true;
+            chuni_io_coins++;
+        }
+    } else {
+        chuni_io_coin = false;
+    }
+
+    *out = chuni_io_coins;
+}
+
+void chuni_io_jvs_poll(uint8_t *opbtn, uint8_t *beams)
+{
+    size_t i;
+
+    if (GetAsyncKeyState(chuni_io_cfg.vk_test)) {
+        *opbtn |= 0x01; /* Test */
+    }
+
+    if (GetAsyncKeyState(chuni_io_cfg.vk_service)) {
+        *opbtn |= 0x02; /* Service */
+    }
+
+    if (GetAsyncKeyState(chuni_io_cfg.vk_ir)) {
+        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);
+        }
+    }
+}
+
+HRESULT chuni_io_slider_init(void)
+{
+    return S_OK;
+}
+
+void chuni_io_slider_start(chuni_io_slider_callback_t callback)
+{
+    if (chuni_io_slider_thread != NULL) {
+        return;
+    }
+
+    chuni_io_slider_thread = (HANDLE) _beginthreadex(
+            NULL,
+            0,
+            chuni_io_slider_thread_proc,
+            callback,
+            0,
+            NULL);
+}
+
+void chuni_io_slider_stop(void)
+{
+    if (chuni_io_slider_thread == NULL) {
+        return;
+    }
+
+    chuni_io_slider_stop_flag = true;
+
+    WaitForSingleObject(chuni_io_slider_thread, INFINITE);
+    CloseHandle(chuni_io_slider_thread);
+    chuni_io_slider_thread = NULL;
+    chuni_io_slider_stop_flag = false;
+}
+
+void chuni_io_slider_set_leds(const uint8_t *rgb)
+{
+}
+
+static unsigned int __stdcall chuni_io_slider_thread_proc(void *ctx)
+{
+    chuni_io_slider_callback_t callback;
+    uint8_t pressure[32];
+    size_t i;
+
+    callback = ctx;
+
+    while (!chuni_io_slider_stop_flag) {
+        for (i = 0 ; i < _countof(pressure) ; i++) {
+            if (GetAsyncKeyState(chuni_io_cfg.vk_cell[i]) & 0x8000) {
+                pressure[i] = 128;
+            } else {
+                pressure[i] = 0;
+            }
+        }
+
+        callback(pressure);
+        Sleep(1);
+    }
+
+    return 0;
+}

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.
-   The first set of bytes is the right-most slider key, and from there the bytes
-   alternate between the dividers and the keys until the left-most key. 
-   There are 31 illuminated sections in total.
+   bytes is supplied. The illuminated areas on the touch slider are some
+   combination of rectangular regions and dividing lines between these regions
+   but the exact mapping of this lighting control buffer is still TBD.
 
    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

@@ -0,0 +1,44 @@
+#include <windows.h>
+
+#include <stdlib.h>
+#include <assert.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#include "chuniio/config.h"
+
+static const int chuni_io_default_cells[] = {
+    'L', 'L', 'L', 'L',
+    'K', 'K', 'K', 'K',
+    'J', 'J', 'J', 'J',
+    'H', 'H', 'H', 'H',
+    'G', 'G', 'G', 'G',
+    'F', 'F', 'F', 'F',
+    'D', 'D', 'D', 'D',
+    'S', 'S', 'S', 'S',
+};
+
+void chuni_io_config_load(
+        struct chuni_io_config *cfg,
+        const wchar_t *filename)
+{
+    wchar_t key[16];
+    int i;
+
+    assert(cfg != NULL);
+    assert(filename != NULL);
+
+    cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename);
+    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
+    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
+    cfg->vk_ir = GetPrivateProfileIntW(L"io3", L"ir", VK_SPACE, filename);
+
+    for (i = 0 ; i < 32 ; i++) {
+        swprintf_s(key, _countof(key), L"cell%i", i + 1);
+        cfg->vk_cell[i] = GetPrivateProfileIntW(
+                L"slider",
+                key,
+                chuni_io_default_cells[i],
+                filename);
+    }
+}

chuniio/config.h

@@ -3,14 +3,14 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <stdbool.h>
-
-struct cm_io_config {
+struct chuni_io_config {
     uint8_t vk_test;
     uint8_t vk_service;
     uint8_t vk_coin;
+    uint8_t vk_ir;
+    uint8_t vk_cell[32];
 };
 
-void cm_io_config_load(
-        struct cm_io_config *cfg,
+void chuni_io_config_load(
+        struct chuni_io_config *cfg,
         const wchar_t *filename);

chuniio/meson.build

@@ -1,11 +1,11 @@
-kemonoio_lib = static_library(
-    'kemonoio_lib',
+chuniio_lib = static_library(
+    'chuniio',
     name_prefix : '',
     include_directories : inc,
     implicit_include_directories : false,
     sources : [
-        'kemonoio.c',
-        'kemonoio.h',
+        'chuniio.c',
+        'chuniio.h',
         'config.c',
         'config.h',
     ],

common/board/config.c

@@ -1,113 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#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
-    // 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)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    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);
-    cfg->proxy_flag = GetPrivateProfileIntW(L"aime", L"proxyFlag", 2, filename);
-
-    GetPrivateProfileStringW(
-            L"aime",
-            L"authdataPath",
-            L"DEVICE\\authdata.bin",
-            cfg->authdata_path,
-            _countof(cfg->authdata_path),
-            filename);
-}
-
-void io4_config_load(struct io4_config *cfg, const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    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);
-}

common/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;
-}

common/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);

common/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;
-};

common/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;
-}

common/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);

common/board/led15070.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-struct led15070_config {
-    bool enable;
-    unsigned int port_no[2];
-    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)(uint8_t board, const uint8_t *rgb);
-typedef void (*io_led_dc_update_t)(uint8_t board, const uint8_t *rgb);
-typedef void (*io_led_gs_update_t)(uint8_t board, 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 port_no[2]);

common/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;
-};