Merge pull request 'print vfd message instead of dump hex' (#13) from Sucareto/segatools:develop into develop

Reviewed-on: #13

Package.mk

@@ -111,6 +111,7 @@ $(BUILD_DIR_ZIP)/swdc.zip:
 	$(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 \
@@ -224,6 +225,7 @@ $(BUILD_DIR_ZIP)/segatools.zip: \
 		$(BUILD_DIR_ZIP)/mu3.zip \
 		$(BUILD_DIR_ZIP)/mai2.zip \
 		$(BUILD_DIR_ZIP)/cm.zip \
+		$(BUILD_DIR_ZIP)/fgo.zip \
 		CHANGELOG.md \
 		README.md \
 

README.md

@@ -1,33 +1,33 @@
 # Segatools
 
-Version: `2023-11-22`
+Version: `2024-03-13`
 
 Loaders and hardware emulators for SEGA games that run on the Nu and ALLS platforms.
 
 ## List of supported games
 
-* Chunithm
-  * [Chunithm (Plus)](doc/chunihook.md)
-  * [Chunithm Air (Plus)](doc/chunihook.md)
-  * [Chunithm Star (Plus)](doc/chunihook.md)
-  * [Chunithm Amazon (Plus)](doc/chunihook.md)
-  * [Chunithm Crystal (Plus)](doc/chunihook.md)
-  * Chunithm SUN
+* CHUNITHM
+  * up to [CHUNITHM PARADISE LOST](doc/chunihook.md)
+  * starting from CHUNITHM NEW!!
+* crossbeats REV.
+  * up to crossbeats REV. SUNRISE
 * Initial D
   * [Initial D Arcade Stage Zero](doc/idzhook.md)
   * Initial D THE ARCADE
+* Hatsune Miku: Project DIVA Arcade
+  * up to Future Tone
 * SEGA World Drivers Championship
-  * up to SEGA World Drivers Championship 2019
+  * SEGA World Drivers Championship 2019
 * Fate/Grand Order
   * Fate/Grand Order Arcade
-* ONGEKI
-  * up to bright MEMORY
+* O.N.G.E.K.I.
+  * starting from O.N.G.E.K.I.
 * maimai DX
-  * up to maimai DX FESTiVAL PLUS
+  * starting from maimai DX
 * Card Maker
-  * up to Card Maker 1.35
-* Wacca
-  * up to WACCA Reverse
+  * starting from Card Maker
+* WACCA
+  * starting from WACCA
 
 ## End-users
 

aimeio/aimeio.c

@@ -68,7 +68,6 @@ 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",

board/aime-dll.h

@@ -18,6 +18,7 @@ struct aime_dll {
 
 struct aime_dll_config {
     wchar_t path[MAX_PATH];
+    bool path64;
 };
 
 extern struct aime_dll aime_dll;

board/config.c

@@ -8,19 +8,61 @@
 #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);
 
-    GetPrivateProfileStringW(
+    // 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)
@@ -30,7 +72,7 @@ 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->high_baudrate = GetPrivateProfileIntW(L"aime", L"highbaud", 1, filename);
+    cfg->high_baudrate = GetPrivateProfileIntW(L"aime", L"highBaud", 1, filename);
     cfg->gen = GetPrivateProfileIntW(L"aime", L"gen", 0, filename);
 }
 
@@ -41,3 +83,11 @@ 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);
+}

board/config.h

@@ -5,6 +5,8 @@
 
 #include "board/io4.h"
 #include "board/sg-reader.h"
+#include "board/vfd.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);

board/led15093.c

@@ -103,11 +103,16 @@ static uint16_t led15093_fw_sum;
 static uint8_t led15093_board_adr = 1;
 static uint8_t led15093_host_adr = 1;
 
-HRESULT led15093_hook_init(const struct led15093_config *cfg, unsigned int first_port, 
-    unsigned int num_boards, uint8_t board_adr, uint8_t host_adr)
+static io_led_init_t led_init;
+static io_led_set_leds_t set_leds;
+
+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)
 {
 
     assert(cfg != NULL);
+    assert(_led_init != NULL);
+    assert(_set_leds != NULL);
 
     if (!cfg->enable) {
         return S_FALSE;
@@ -117,6 +122,8 @@ HRESULT led15093_hook_init(const struct led15093_config *cfg, unsigned int first
         first_port = cfg->port_no;
     }
 
+    led_init = _led_init;
+    set_leds = _set_leds;
     led15093_board_adr = board_adr;
     led15093_host_adr = host_adr;
 
@@ -207,9 +214,9 @@ static HRESULT led15093_handle_irp_locked(int board, struct irp *irp)
 
         if (!v->started) {
             dprintf("LED 15093: Starting LED backend\n");
-            // hr = fgo_dll.led_init();
-            hr = S_OK;
+            hr = led_init();
 
+            // hr = S_OK;
             v->started = true;
             v->start_hr = hr;
 
@@ -229,6 +236,29 @@ static HRESULT led15093_handle_irp_locked(int board, struct irp *irp)
         }
     }
     */
+    
+    if (irp->op == IRP_OP_OPEN) {
+        dprintf("LED 15093: Starting backend DLL\n");
+        // int res = led_init();
+        hr = led_init();
+        
+        /*
+        if (res != 0) {
+            dprintf("LED 15093: Backend error, LED board disconnected: "
+                    "%d\n",
+                    res);
+
+            return E_FAIL;
+        }
+        */
+        if (FAILED(hr)) {
+            dprintf("LED 15093: Backend error, LED board disconnected: "
+                    "%x\n",
+                    (int) hr);
+
+            return hr;
+        }
+    }
 
     hr = uart_handle_irp(boarduart, irp);
 
@@ -657,8 +687,20 @@ static HRESULT led15093_req_set_imm_led(int board, const struct led15093_req_set
         return E_INVALIDARG;
     }
 
-    memcpy(v->led, req->data, req->hdr.nbytes - 1);
+    /*
+    if (board == 0) {
+        dprintf("board %d: red: %d, green: %d, blue: %d\n", board, req->data[0x96], req->data[0x97], req->data[0x98]);
+	}
+	else if (board == 1)
+	{
+		dprintf("board %d: red: %d, green: %d, blue: %d\n", board, req->data[0xb4], req->data[0xb5], req->data[0xb6]);
+    }
+    */
 
+    // Return the current LED data, remove const qualifier
+    set_leds(board, (uint8_t *) req->data);
+
+    memcpy(v->led, req->data, req->hdr.nbytes - 1);
     // fgo_dll.led_gr_set_imm((const uint8_t*)&v->led);
 
     if (!v->enable_response)

board/led15093.h

@@ -16,6 +16,9 @@ struct led15093_config {
     uint16_t fw_sum;
 };
 
-HRESULT led15093_hook_init(const struct led15093_config *cfg, unsigned int first_port, 
-    unsigned int num_boards, uint8_t board_adr, uint8_t host_adr);
+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/sg-cmd.h

@@ -25,6 +25,13 @@ 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.c

@@ -27,11 +27,11 @@ static HRESULT sg_led_cmd_set_color(
         const struct sg_led *led,
         const struct sg_led_req_set_color *req);
 
-const char *sg_led_info[] = {
-    "15084\xFF\x10\x00\x12",
-    "000-00000\xFF\x11\x40",
+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"
+    {"000-00000\xFF\x11\x40", 12}
 };
 
 void sg_led_init(
@@ -156,10 +156,10 @@ static HRESULT sg_led_cmd_get_info(
 {
     sg_led_dprintf(led, "Get info\n");
 
-    unsigned int len = strlen(sg_led_info[led->gen - 1]);
+    const struct version_info *fw = &led_version[led->gen - 1];
 
-    sg_res_init(&res->res, req, len);
-    memcpy(res->payload, sg_led_info[led->gen - 1], len);
+    sg_res_init(&res->res, req, fw->length);
+    memcpy(res->payload, fw->version, fw->length);
 
     return S_OK;
 }

board/sg-nfc.c

@@ -65,16 +65,16 @@ static HRESULT sg_nfc_cmd_dummy(
         const struct sg_req_header *req,
         struct sg_res_header *res);
 
-static const char *hw_version[] = {
-    "TN32MSEC003S H/W Ver3.0",
-    "837-15286",
-    "837-15396"
+static const struct version_info hw_version[] = {
+    {"TN32MSEC003S H/W Ver3.0", 23},
+    {"837-15286", 9},
+    {"837-15396", 9}
 };
 
-static const char *fw_version[] = {
-    "TN32MSEC003S F/W Ver1.2",
-    "\x94",
-    "\x94"
+static const struct version_info fw_version[] = {
+    {"TN32MSEC003S F/W Ver1.2", 23},
+    {"\x94", 1},
+    {"\x94", 1}
 };
 
 void sg_nfc_init(
@@ -217,11 +217,11 @@ static HRESULT sg_nfc_cmd_get_fw_version(
         const struct sg_req_header *req,
         struct sg_nfc_res_get_fw_version *res)
 {
-    unsigned int len = strlen(fw_version[nfc->gen - 1]);
+    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, len);
-    memcpy(res->version, fw_version[nfc->gen - 1], len);
+    sg_res_init(&res->res, req, fw->length);
+    memcpy(res->version, fw->version, fw->length);
 
     return S_OK;
 }
@@ -231,11 +231,11 @@ static HRESULT sg_nfc_cmd_get_hw_version(
         const struct sg_req_header *req,
         struct sg_nfc_res_get_hw_version *res)
 {
-    unsigned int len = strlen(hw_version[nfc->gen - 1]);
+    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, len);
-    memcpy(res->version, hw_version[nfc->gen - 1], len);
+    sg_res_init(&res->res, req, hw->length);
+    memcpy(res->version, hw->version, hw->length);
 
     return S_OK;
 }

board/vfd.c

@@ -26,15 +26,25 @@ 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];
+UINT codepage;
 
-HRESULT vfd_hook_init(unsigned int port_no)
+HRESULT vfd_hook_init(const struct vfd_config *cfg, unsigned int port_no)
 {
+    assert(cfg != NULL);
+
+    if (!cfg->enable) {
+        return S_FALSE;
+    }
+
     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);
 
+    codepage = GetACP();
+    dprintf("VFD: hook enabled.\n");
+
     return iohook_push_handler(vfd_handle_irp);
 }
 
@@ -54,8 +64,60 @@ static HRESULT vfd_handle_irp(struct irp *irp)
         return hr;
     }
 
-    dprintf("VFD TX:\n");
-    dump_iobuf(&vfd_uart.written);
+    uint8_t cmd = 0;
+    uint8_t str_1[512];
+    uint8_t str_2[512];
+    uint8_t str_1_len = 0;
+    uint8_t str_2_len = 0;
+    for (size_t i = 0; i < vfd_uart.written.pos; i++) {
+        if (vfd_uart.written.bytes[i] == 0x1B) {
+            i++;
+            cmd = vfd_uart.written.bytes[i];
+            if (cmd == 0x30) {
+                i += 3;
+            }
+            else if (cmd == 0x50) {
+                i++;
+            }
+            continue;
+        }
+        if (cmd == 0x30) {
+            str_1[str_1_len++] = vfd_uart.written.bytes[i];
+        }
+        else if (cmd == 0x50) {
+            str_2[str_2_len++] = vfd_uart.written.bytes[i];
+        }
+    }
+
+    if (str_1_len) {
+        str_1[str_1_len++] = '\0';
+        if (codepage != 932) {
+            WCHAR buffer[512];
+            MultiByteToWideChar(932, 0, (LPCSTR)str_1, str_1_len, buffer, str_1_len);
+            char str_recode[str_1_len * 3];
+            WideCharToMultiByte(codepage, 0, buffer, str_1_len, str_recode, str_1_len * 3, NULL, NULL);
+            dprintf("VFD: %s\n", str_recode);
+        }
+        else {
+            dprintf("VFD: %s\n", str_1);
+        }
+    }
+
+    if (str_2_len) {
+        str_2[str_2_len++] = '\0';
+        if (codepage != 932) {
+            WCHAR buffer[512];
+            MultiByteToWideChar(932, 0, (LPCSTR)str_2, str_2_len, buffer, str_2_len);
+            char str_recode[str_2_len * 3];
+            WideCharToMultiByte(codepage, 0, buffer, str_2_len, str_recode, str_2_len * 3, NULL, NULL);
+            dprintf("VFD: %s\n", str_recode);
+        } else {
+            dprintf("VFD: %s\n", str_2);
+        }
+    }
+
+    // dprintf("VFD TX:\n");
+    // dump_iobuf(&vfd_uart.written);
     vfd_uart.written.pos = 0;
 
     return hr;

board/vfd.h

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

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", '1', filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
+    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);
 }

chunihook/chuni-dll.c

@@ -30,9 +30,28 @@ 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.
@@ -92,16 +111,24 @@ 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) {
-            dprintf("Chunithm IO: Custom IO DLL does not provide function "
-                    "\"%s\". Please contact your IO DLL's developer for "
-                    "further assistance.\n",
-                    sym->sym);
+            // 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);
 
-            goto end;
+                goto end;
+            }
         } else {
             dprintf("Internal error: could not reflect \"%s\"\n", sym->sym);
         }

chunihook/chuni-dll.h

@@ -13,6 +13,8 @@ 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,3 +20,5 @@ 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

@@ -56,7 +56,7 @@ void led15093_config_load(struct led15093_config *cfg, const wchar_t *filename)
 
     cfg->enable = GetPrivateProfileIntW(L"led15093", L"enable", 1, filename);
     cfg->port_no = 0;
-    cfg->high_baudrate = GetPrivateProfileIntW(L"led15093", L"highBaudrate", 0, filename);
+    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);
 

chunihook/dllmain.c

@@ -4,6 +4,7 @@
 
 #include "amex/amex.h"
 
+#include "board/led15093.h"
 #include "board/sg-reader.h"
 
 #include "chunihook/config.h"
@@ -96,10 +97,16 @@ static DWORD CALLBACK chuni_pre_startup(void)
         goto fail;
     }
 
-    hr = led15093_hook_init(&chuni_hook_cfg.led15093, 10, 2, 2, 1);
+    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(&chuni_hook_cfg.led15093, 
+            chuni_dll.led_init, chuni_dll.led_set_leds, 10, 2, 2, 1);
 
-    if (FAILED(hr)) {
-        goto fail;
+        if (FAILED(hr)) {
+            goto fail;
+        }
     }
 
     hr = sg_reader_hook_init(&chuni_hook_cfg.aime, 12, 1, chuni_hook_mod);

chuniio/chu2to3.c

@@ -0,0 +1,358 @@
+#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

@@ -0,0 +1,26 @@
+#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

@@ -7,6 +7,7 @@
 
 #include "chuniio/chuniio.h"
 #include "chuniio/config.h"
+#include "chuniio/ledoutput.h"
 
 #include "util/dprintf.h"
 
@@ -18,17 +19,26 @@ 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;
-static HANDLE chuni_io_slider_led_port;
 
 uint16_t chuni_io_get_api_version(void)
 {
-    return 0x0101;
+    return 0x0102;
 }
 
 HRESULT chuni_io_jvs_init(void)
 {
     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;
 }
 
@@ -38,7 +48,7 @@ void chuni_io_jvs_read_coin_counter(uint16_t *out)
         return;
     }
 
-    if (GetAsyncKeyState(chuni_io_cfg.vk_coin)) {
+    if (GetAsyncKeyState(chuni_io_cfg.vk_coin) & 0x8000) {
         if (!chuni_io_coin) {
             chuni_io_coin = true;
             chuni_io_coins++;
@@ -62,15 +72,6 @@ void chuni_io_jvs_poll(uint8_t *opbtn, uint8_t *beams)
         *opbtn |= CHUNI_IO_OPBTN_SERVICE;
     }
 
-    if (GetAsyncKeyState(chuni_io_cfg.vk_coin) & 0x8000) {
-        if (!chuni_io_coin) {
-            chuni_io_coin = true;
-            *opbtn |= CHUNI_IO_OPBTN_COIN;
-        }
-    } else {
-        chuni_io_coin = false;
-    }
-
     if (chuni_io_cfg.vk_ir_emu) {
         // Use emulated AIR
         if (GetAsyncKeyState(chuni_io_cfg.vk_ir_emu)) {
@@ -90,19 +91,19 @@ void chuni_io_jvs_poll(uint8_t *opbtn, uint8_t *beams)
         }
     } else {
         // Use actual AIR
-        // IR format is beams[5:0] = {b5,b6,b3,b4,b1,b2};
-        for (i = 0 ; i < 3 ; i++) {
-            if (GetAsyncKeyState(chuni_io_cfg.vk_ir[i*2]) & 0x8000)
-                *beams |= (1 << (i*2+1));
-            if (GetAsyncKeyState(chuni_io_cfg.vk_ir[i*2+1]) & 0x8000)
-                *beams |= (1 << (i*2));
+        for (i = 0; i < 6; i++) {
+            if(GetAsyncKeyState(chuni_io_cfg.vk_ir[i]) & 0x8000) {
+                *beams |= (1 << i);
+            } else {
+                *beams &= ~(1 << i);
+            }
         }
     }
 }
 
 HRESULT chuni_io_slider_init(void)
 {
-    return S_OK;
+    return led_output_init(&chuni_io_cfg); // because of slider LEDs
 }
 
 void chuni_io_slider_start(chuni_io_slider_callback_t callback)
@@ -120,39 +121,6 @@ void chuni_io_slider_start(chuni_io_slider_callback_t callback)
             callback,
             0,
             NULL);
-
-    chuni_io_slider_led_port = CreateFileW(chuni_io_cfg.led_com,
-            GENERIC_READ | GENERIC_WRITE,
-            0,
-            NULL,
-            OPEN_EXISTING,
-            0,
-            NULL);
-    
-    if (chuni_io_slider_led_port == INVALID_HANDLE_VALUE)
-        dprintf("Chunithm LEDs: Failed to open COM port (Attempted on %S)\n", chuni_io_cfg.led_com);
-    else
-        dprintf("Chunithm LEDs: COM Port Success!\n");
-            
-    DCB dcb_serial_params = { 0 };
-    dcb_serial_params.DCBlength = sizeof(dcb_serial_params);
-    status = GetCommState(chuni_io_slider_led_port, &dcb_serial_params);
-    
-    dcb_serial_params.BaudRate = CBR_115200;  // Setting BaudRate = 115200
-    dcb_serial_params.ByteSize = 8;         // Setting ByteSize = 8
-    dcb_serial_params.StopBits = ONESTOPBIT;// Setting StopBits = 1
-    dcb_serial_params.Parity   = NOPARITY;  // Setting Parity = None
-    SetCommState(chuni_io_slider_led_port, &dcb_serial_params);
-    
-    COMMTIMEOUTS timeouts = { 0 };
-    timeouts.ReadIntervalTimeout         = 50; // in milliseconds
-    timeouts.ReadTotalTimeoutConstant    = 50; // in milliseconds
-    timeouts.ReadTotalTimeoutMultiplier  = 10; // in milliseconds
-    timeouts.WriteTotalTimeoutConstant   = 50; // in milliseconds
-    timeouts.WriteTotalTimeoutMultiplier = 10; // in milliseconds
-    
-    SetCommTimeouts(chuni_io_slider_led_port, &timeouts);
-
 }
 
 void chuni_io_slider_stop(void)
@@ -167,34 +135,11 @@ void chuni_io_slider_stop(void)
     CloseHandle(chuni_io_slider_thread);
     chuni_io_slider_thread = NULL;
     chuni_io_slider_stop_flag = false;
-
-    dprintf("Chunithm LEDs: Closing COM port\n");
-    CloseHandle(chuni_io_slider_led_port);
 }
 
 void chuni_io_slider_set_leds(const uint8_t *rgb)
 {
-    if (chuni_io_slider_led_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(chuni_io_slider_led_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);
-    }
-
+    led_output_update(2, rgb);
 }
 
 static unsigned int __stdcall chuni_io_slider_thread_proc(void *ctx)
@@ -220,3 +165,13 @@ 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,6 +8,7 @@
    - 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>
@@ -145,3 +146,30 @@ void chuni_io_slider_stop(void);
    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
+
+   left side has 5*10 rgb values for the billboard, followed by 3 rgb values for the air tower
+   right side has 6*10 rgb values for the billboard, followed by 3 rgb values for the air tower
+   
+   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

@@ -34,9 +34,9 @@ void chuni_io_config_load(
     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_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename);
+    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_ir_emu = GetPrivateProfileIntW(L"io3", L"ir", VK_SPACE, filename);
 
     for (i = 0 ; i < 6 ; i++) {
@@ -57,7 +57,24 @@ void chuni_io_config_load(
                 filename);
     }
 
-    GetPrivateProfileStringW(L"slider", L"ledport", L"COM2", port_input, 6, filename);
-    wcsncpy(cfg->led_com, L"\\\\.\\", 4);
-    wcsncat_s(cfg->led_com, 11, port_input, 6);
+    cfg->led_output_pipe = GetPrivateProfileIntW(L"led", L"cabLedOutputPipe", 1, filename);
+    cfg->led_output_serial = GetPrivateProfileIntW(L"led", L"cabLedOutputSerial", 0, filename);
+    
+    cfg->slider_led_output_pipe = GetPrivateProfileIntW(L"led", L"controllerLedOutputPipe", 1, filename);
+    cfg->slider_led_output_serial = GetPrivateProfileIntW(L"led", L"controllerLedOutputSerial", 0, filename);
+
+    cfg->led_serial_baud = GetPrivateProfileIntW(L"led", L"serialBaud", 921600, filename);
+
+    GetPrivateProfileStringW(
+            L"led",
+            L"serialPort",
+            L"COM5",
+            port_input,
+            6,
+            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

@@ -10,7 +10,18 @@ struct chuni_io_config {
     uint8_t vk_ir_emu;
     uint8_t vk_ir[6];
     uint8_t vk_cell[32];
-    wchar_t led_com[12];
+
+    // Which ways to output LED information are enabled
+    bool led_output_pipe;
+    bool led_output_serial;
+    
+    bool slider_led_output_pipe;
+    bool slider_led_output_serial;
+
+    // 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

@@ -0,0 +1,22 @@
+#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 {
+    byte framing; // Sync byte
+    uint8_t board; // LED output the data is for (0-1: billboard, 2: slider)
+    byte data[LED_OUTPUT_DATA_SIZE_MAX]; // Buffer for LEDs
+    byte data_len; // How many bytes to output from the buffer
+};
+
+static byte chuni_led_board_data_lens[LED_BOARDS_TOTAL] = {53*3, 63*3, 31*3};

chuniio/ledoutput.c

@@ -0,0 +1,133 @@
+#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->led_output_pipe || config->slider_led_output_pipe
+            || config->led_output_serial || config->slider_led_output_serial;
+        
+        if (config->led_output_pipe || config->slider_led_output_pipe)
+        {
+            led_pipe_init();  // don't really care about errors here tbh
+        }
+        
+        if (config->led_output_serial || config->slider_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];
+    
+    byte* in_buf = unescaped->data;
+    byte* out_buf = out_struct->data;
+    int i = 0;
+    int o = 0;
+    
+    while (i < unescaped->data_len)
+    {
+        byte 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 byte* 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
+        if (config->led_output_pipe)
+        {
+            led_pipe_update(escaped_data);
+        }
+        
+        if (config->led_output_serial)
+        {
+            led_serial_update(escaped_data);
+        }
+    }
+    else
+    {
+        // slider
+        if (config->slider_led_output_pipe)
+        {
+            led_pipe_update(escaped_data);
+        }
+        
+        if (config->slider_led_output_serial)
+        {
+            led_serial_update(escaped_data);
+        }
+    }
+}

chuniio/ledoutput.h

@@ -0,0 +1,19 @@
+/*
+    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 byte* rgb);

chuniio/meson.build

@@ -5,9 +5,18 @@ chuniio_lib = static_library(
     implicit_include_directories : false,
     c_pch : '../precompiled.h',
     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

@@ -0,0 +1,160 @@
+#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

@@ -0,0 +1,14 @@
+/*
+    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

@@ -0,0 +1,99 @@
+#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);
+}

chuniio/serialimpl.h

@@ -0,0 +1,15 @@
+/*
+    Serial LED implementation for chuniio
+    
+    Credits:
+    somewhatlurker, skogaby
+*/
+
+#pragma once
+
+#include <windows.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);

chusanhook/chuni-dll.c

@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include "chuniio/chu2to3.h"
 #include "chusanhook/chuni-dll.h"
 
 #include "util/dll-bind.h"
@@ -30,9 +31,59 @@ 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),
     }
 };
 
+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.
@@ -52,7 +103,12 @@ HRESULT chuni_dll_init(const struct chuni_dll_config *cfg, HINSTANCE self)
     assert(cfg != NULL);
     assert(self != NULL);
 
-    if (cfg->path[0] != L'\0') {
+    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) {
@@ -66,12 +122,18 @@ HRESULT chuni_dll_init(const struct chuni_dll_config *cfg, HINSTANCE self)
 
         dprintf("Chunithm IO: Using custom IO DLL: %S\n", cfg->path);
         src = owned;
-    } else {
-        owned = NULL;
-        src = self;
     }
 
-    get_api_version = (void *) GetProcAddress(src, "chuni_io_get_api_version");
+    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();
@@ -91,17 +153,26 @@ HRESULT chuni_dll_init(const struct chuni_dll_config *cfg, HINSTANCE self)
         goto end;
     }
 
-    sym = chuni_dll_syms;
+    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) {
-            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;
+            // 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);
         }

chusanhook/chuni-dll.h

@@ -13,10 +13,13 @@ 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 {
     wchar_t path[MAX_PATH];
+    uint8_t chu2to3;
 };
 
 extern struct chuni_dll chuni_dll;

chusanhook/chusanhook.def

@@ -20,3 +20,15 @@ EXPORTS
     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

@@ -39,16 +39,27 @@ void chuni_dll_config_load(
 
     // Workaround for x64/x86 external IO dlls
     // path32 for 32bit, path64 for 64bit
-    // for else.. is that possible? idk
+    // path for 32bit only dlls (internal chu2to3 engine)
 
-    #if defined(ENV32BIT)
-        GetPrivateProfileStringW(
-                L"chuniio",
-                L"path32",
-                L"",
-                cfg->path,
-                _countof(cfg->path),
-                filename);
+    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",
@@ -60,7 +71,7 @@ void chuni_dll_config_load(
     #else
         #error "Unknown environment"
     #endif
-    
+    }
 }
 
 void slider_config_load(struct slider_config *cfg, const wchar_t *filename)
@@ -85,7 +96,7 @@ void led15093_config_load(struct led15093_config *cfg, const wchar_t *filename)
 
     cfg->enable = GetPrivateProfileIntW(L"led15093", L"enable", 1, filename);
     cfg->port_no = 0;
-    cfg->high_baudrate = GetPrivateProfileIntW(L"led15093", L"highBaudrate", 0, filename);
+    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);
 
@@ -141,11 +152,15 @@ void chusan_hook_config_load(
 
     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

@@ -20,6 +20,7 @@ struct chusan_hook_config {
     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;

chusanhook/dllmain.c

@@ -100,11 +100,7 @@ static DWORD CALLBACK chusan_pre_startup(void)
     }
 
     bool *dipsw = &chusan_hook_cfg.platform.dipsw.dipsw[0];
-
-    if (dipsw[1] != dipsw[2]) {
-        dprintf("DipSw: DipSw2 and 3 must be set to the same value!\n");
-        goto fail;
-    }
+    bool is_cvt = dipsw[2];
 
     for (int i = 0; i < 3; i++) {
         switch (i) {
@@ -117,21 +113,35 @@ static DWORD CALLBACK chusan_pre_startup(void)
             break;
 
         case 2:
-            dprintf("DipSw: Aime Reader: %s\n", dipsw[2] ? "CVT" : "SP");
+            dprintf("DipSw: Cab Type: %s\n", is_cvt ? "CVT" : "SP");
 
             break;
         }
     }
 
-    unsigned int first_port = dipsw[1] ? 2 : 20;
+    unsigned int first_port = is_cvt ? 2 : 20;
 
-    hr = led15093_hook_init(&chusan_hook_cfg.led15093, first_port, 2, 2, 1);
+    if (!is_cvt) {
+        hr = vfd_hook_init(&chusan_hook_cfg.vfd, 2);
 
-    if (FAILED(hr)) {
-        goto fail;
+        if (FAILED(hr)) {
+            goto fail;
+        }
     }
 
-    hr = sg_reader_hook_init(&chusan_hook_cfg.aime, 4, dipsw[2] ? 2 : 3, chusan_hook_mod);
+    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;

chusanhook/io4.c

@@ -73,6 +73,7 @@ static HRESULT chusan_io4_poll(void* ctx, struct io4_state* state)
     beams = 0;
 
     chuni_dll.jvs_poll(&opbtn, &beams);
+    chuni_dll.jvs_read_coin_counter(&coins);
 
     if (chuni_dll.api_version >= 0x0101) {
         // Use correct mapping
@@ -90,9 +91,7 @@ static HRESULT chusan_io4_poll(void* ctx, struct io4_state* state)
         state->buttons[0] |= IO4_BUTTON_SERVICE;
     }
 
-    if (opbtn & CHUNI_IO_OPBTN_COIN) {
-        coins++;
-    }
+    // Update the coin counter with the value from jvs_read_coin_counter
     state->chutes[0] = coins << 8;
 
     for (i = 0; i < 6; i++) {

chusanhook/led1509306.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stdbool.h>
-
-struct led1509306_config {
-    bool enable;
-    bool cvt_port;
-    char board_number[8];
-    char chip_number[5];
-    uint8_t fw_ver;
-    uint16_t fw_sum;
-};
-
-HRESULT led1509306_hook_init(const struct led1509306_config *cfg);

cmhook/config.c

@@ -37,6 +37,8 @@ void cm_hook_config_load(
     aime_config_load(&cfg->aime, filename);
     dvd_config_load(&cfg->dvd, filename);
     io4_config_load(&cfg->io4, filename);
+    vfd_config_load(&cfg->vfd, filename);
     touch_screen_config_load(&cfg->touch, filename);
     cm_dll_config_load(&cfg->dll, filename);
+    unity_config_load(&cfg->unity, filename);
 }

cmhook/config.h

@@ -11,13 +11,17 @@
 
 #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 unity_config unity;
 };
 
 void cm_dll_config_load(

cmhook/dllmain.c

@@ -16,10 +16,11 @@
 #include "cmhook/config.h"
 #include "cmhook/io4.h"
 #include "cmhook/cm-dll.h"
-#include "cmhook/unity.h"
 
 #include "platform/platform.h"
 
+#include "unityhook/hook.h"
+
 #include "util/dprintf.h"
 
 static HMODULE cm_hook_mod;
@@ -60,7 +61,7 @@ static DWORD CALLBACK cm_pre_startup(void)
         goto fail;
     }
 
-    hr = vfd_hook_init(2);
+    hr = vfd_hook_init(&cm_hook_cfg.vfd, 2);
 
     if (FAILED(hr)) {
         goto fail;
@@ -83,7 +84,7 @@ static DWORD CALLBACK cm_pre_startup(void)
        There seems to be an issue with other DLL hooks if `LoadLibraryW` is
        hooked earlier in the `cmhook` initialization. */
 
-    unity_hook_init();
+    unity_hook_init(&cm_hook_cfg.unity, cm_hook_mod);
 
     /* Initialize debug helpers */
 

cmhook/meson.build

@@ -16,6 +16,7 @@ shared_library(
         hooklib_lib,
         cmio_lib,
         platform_lib,
+        unityhook_lib,
         util_lib,
     ],
     sources : [
@@ -26,7 +27,5 @@ shared_library(
         'io4.h',
         'cm-dll.c',
         'cm-dll.h',
-        'unity.h',
-        'unity.c',
     ],
 )

cmhook/unity.c

@@ -1,95 +0,0 @@
-#include <stdbool.h>
-
-#include <windows.h>
-
-#include "hook/table.h"
-
-#include "hooklib/dll.h"
-#include "hooklib/path.h"
-
-#include "util/dprintf.h"
-
-static void dll_hook_insert_hooks(HMODULE target);
-
-static HMODULE WINAPI my_LoadLibraryW(const wchar_t *name);
-static HMODULE (WINAPI *next_LoadLibraryW)(const wchar_t *name);
-
-static const struct hook_symbol unity_kernel32_syms[] = {
-    {
-        .name = "LoadLibraryW",
-        .patch = my_LoadLibraryW,
-        .link = (void **) &next_LoadLibraryW,
-    },
-};
-
-static const wchar_t *target_modules[] = {
-    L"mono.dll",
-    L"cri_ware_unity.dll",
-};
-static const size_t target_modules_len = _countof(target_modules);
-
-void unity_hook_init(void)
-{
-    dll_hook_insert_hooks(NULL);
-}
-
-static void dll_hook_insert_hooks(HMODULE target)
-{
-    hook_table_apply(
-            target,
-            "kernel32.dll",
-            unity_kernel32_syms,
-            _countof(unity_kernel32_syms));
-}
-
-static HMODULE WINAPI my_LoadLibraryW(const wchar_t *name)
-{
-    const wchar_t *name_end;
-    const wchar_t *target_module;
-    bool already_loaded;
-    HMODULE result;
-    size_t name_len;
-    size_t target_module_len;
-
-    if (name == NULL) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-
-        return NULL;
-    }
-
-    // Check if the module is already loaded
-    already_loaded = GetModuleHandleW(name) != NULL;
-
-    // Must call the next handler so the DLL reference count is incremented
-    result = next_LoadLibraryW(name);
-
-    if (!already_loaded && result != NULL) {
-        name_len = wcslen(name);
-
-        for (size_t i = 0; i < target_modules_len; i++) {
-            target_module = target_modules[i];
-            target_module_len = wcslen(target_module);
-
-            // Check if the newly loaded library is at least the length of
-            // the name of the target module
-            if (name_len < target_module_len) {
-                continue;
-            }
-
-            name_end = &name[name_len - target_module_len];
-
-            // Check if the name of the newly loaded library is one of the
-            // modules the path hooks should be injected into
-            if (_wcsicmp(name_end, target_module) != 0) {
-                continue;
-            }
-
-            dprintf("Unity: Loaded %S\n", target_module);
-
-            dll_hook_insert_hooks(result);
-            path_hook_insert_hooks(result);
-        }
-    }
-
-    return result;
-}

cmhook/unity.h

@@ -1,3 +0,0 @@
-#pragma once
-
-void unity_hook_init(void);

cmio/config.c

@@ -16,7 +16,7 @@ void cm_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    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);
 }

cxbhook/config.c

@@ -23,22 +23,32 @@ 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);
 
-}
-
-void network_config_load(struct network_config *cfg, const wchar_t *filename)
-{
-
+    cfg->enable = GetPrivateProfileIntW(L"revio", L"enable", 1, 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(
@@ -56,6 +66,5 @@ 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,7 +10,6 @@
 #include "cxbhook/cxb-dll.h"
 #include "cxbhook/revio.h"
 #include "cxbhook/led.h"
-#include "cxbhook/network.h"
 
 #include "gfxhook/gfx.h"
 
@@ -23,7 +22,6 @@ 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;
 };
 
@@ -32,7 +30,6 @@ 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,7 +9,6 @@
 #include "cxbhook/config.h"
 #include "cxbhook/revio.h"
 #include "cxbhook/led.h"
-#include "cxbhook/network.h"
 
 #include "cxbio/cxbio.h"
 
@@ -103,12 +102,6 @@ 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)) {

cxbhook/led.c

@@ -49,7 +49,13 @@ static struct hook_symbol lamp_syms[] = {
 
 HRESULT led_hook_init(struct led_config *cfg)
 {
-    dprintf("LED: Init\n");
+    assert(cfg != NULL);
+
+    if (!cfg->enable) {
+        return S_FALSE;
+    }
+    
+    dprintf("LED: Hook enabled.\n");
     return proc_addr_table_push("CommLamp.dll", lamp_syms, _countof(lamp_syms));
 }
 

cxbhook/meson.build

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

cxbhook/network.c

@@ -1,13 +0,0 @@
-#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

@@ -1,13 +0,0 @@
-#pragma once
-
-#include <windows.h>
-#include <stdbool.h>
-#include <stdint.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

@@ -82,7 +82,13 @@ static struct hook_symbol revio_syms[] = {
 
 HRESULT revio_hook_init(struct revio_config *cfg)
 {
-    dprintf("Revio: Init\n");
+    assert(cfg != NULL);
+
+    if (!cfg->enable) {
+        return S_FALSE;
+    }
+
+    dprintf("Revio: Hook enabled.\n");
     return proc_addr_table_push("CommIo.dll", revio_syms, _countof(revio_syms));
 }
 
@@ -154,7 +160,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;
 }
@@ -188,7 +194,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;
 }

dist/carol/segatools.ini

@@ -1,23 +1,56 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
-; Insert the path to the game Option directory here (contains Axxx directories)
+; Insert the path to the game Option directory here (contains MOV1, PAR0,
+; PAR1, RES0 and RES1 directories)
 option=
 ; Create an empty directory somewhere and insert the path here.
 ; This directory may be shared between multiple SEGA games.
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
+[aime]
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
+enable=1
+aimePath=DEVICE\aime.txt
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
 default=127.0.0.1
 
 [netenv]
-; Simulate an ideal LAN environment.
+; Simulate an ideal LAN environment. This may interfere with head-to-head play.
+; Chunithm is extremely picky about its LAN environment, so leaving this
+; setting enabled is strongly recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
 
 [gpio]
+; Emulated Nu DIP switch for Distribution Server setting.
+;
+; If multiple machines are present on the same LAN then set this to 1 on
+; exactly one machine and set this to 0 on all others.
 dipsw1=1
 
 [keychip]
@@ -26,6 +59,10 @@ dipsw1=1
 ; that subnet must start with 192.168.
 subnet=192.168.126.0
 
+; -----------------------------------------------------------------------------
+; Misc. hooks settings
+; -----------------------------------------------------------------------------
+
 [gfx]
 ; Force the game to run windowed.
 windowed=1
@@ -34,15 +71,31 @@ framed=1
 ; Select the monitor to run the game on. (Fullscreen only, 0 =primary screen)
 monitor=0
 
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
 [aimeio]
 ; To use a custom card reader IO DLL enter its path here.
 ; Leave empty if you want to use Segatools built-in keyboard input.
 path=
 
+; -----------------------------------------------------------------------------
+; Input settings
+; -----------------------------------------------------------------------------
+
+; Keyboard bindings are specified as hexadecimal (prefixed with 0x) or decimal
+; (not prefixed with 0x) virtual-key codes, a list of which can be found here:
+;
+; https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
+;
+; This is, admittedly, not the most user-friendly configuration method in the
+; world. An improved solution will be provided later.
+
 [io3]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72

dist/chuni/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
@@ -8,6 +12,20 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
+[aime]
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
+enable=1
+aimePath=DEVICE\aime.txt
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -18,6 +36,14 @@ default=127.0.0.1
 ; Chunithm is extremely picky about its LAN environment, so leaving this
 ; setting enabled is strongly recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
@@ -25,6 +51,10 @@ enable=1
 ; that subnet must start with 192.168.
 subnet=192.168.139.0
 
+; -----------------------------------------------------------------------------
+; Misc. hooks settings
+; -----------------------------------------------------------------------------
+
 [gfx]
 ; Force the game to run windowed.
 windowed=1
@@ -33,20 +63,65 @@ framed=1
 ; Select the monitor to run the game on. (Fullscreen only, 0 =primary screen)
 monitor=0
 
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
 [aimeio]
 ; To use a custom card reader IO DLL enter its path here.
 ; Leave empty if you want to use Segatools built-in keyboard input.
 path=
 
-[led15093]
-; 837-15093-06 LED strip emulation setting.
-enable=1
-
 [chuniio]
 ; To use a custom Chunithm IO DLL enter its path here.
 ; Leave empty if you want to use Segatools built-in keyboard input.
 path=
 
+; -----------------------------------------------------------------------------
+; LED settings
+; -----------------------------------------------------------------------------
+
+[led15093]
+; Enable emulation of the 15093-06 controlled lights, which handle the air tower 
+; RGBs and the rear LED panel (billboard) on the cabinet.
+enable=1
+
+[led]
+; Output billboard LED strip data to a named pipe called "\\.\pipe\chuni_ledstrip"
+cabLedOutputPipe=1
+; Output billboard LED strip data to serial
+cabLedOutputSerial=0
+
+; Output slider LED data to the named pipe
+controllerLedOutputPipe=1
+; Output slider LED data to the serial port
+controllerLedOutputSerial=0
+
+; Serial port to send data to if using serial output. Default is COM5.
+;serialPort=COM5
+; Baud rate for serial data
+;serialBaud=921600
+
+; Data output a sequence of bytes, with JVS-like framing.
+; Each "packet" starts with 0xE0 as a sync. To avoid E0 appearing elsewhere,
+; 0xD0 is used as an escape character -- if you receive D0 in the output, ignore
+; it and use the next sent byte plus one instead.
+;
+; After the sync is one byte for the board number that was updated, followed by
+; the red, green and blue values for each LED.
+;
+; 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
+
+
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -60,12 +135,26 @@ path=
 ; world. An improved solution will be provided later.
 
 [io3]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
+; Set to 0 for enable separate ir control. Deafult is space key.
+ir=0x20
+
+[ir]
+; Uncomment and complete the following sequence of settings to configure a
+; custom ir-cappable controller if you have one.
+;ir6=0x53
+; ... etc ...
+;ir1=0x53
+
+[slider]
+; Enable slider emulation. If you have real AC slider, set this to 0.
+; Slider serial port must be COM1.
+;enable=1
 
 ; Key bindings for each of the 32 touch cells. The default key map, depicted
 ; in left-to-right order, is as follows:
@@ -77,8 +166,8 @@ coin=0x33
 ;
 ; Uncomment and complete the following sequence of settings to configure a
 ; custom high-precision touch strip controller if you have one.
-[slider]
-;cell32=0x53
-;cell31=0x53
-;cell30=0x53
+;cell1=0x53
+;cell2=0x53
 ; ... etc ...
+;cell31=0x53
+;cell32=0x53

dist/chusan/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
@@ -8,17 +12,26 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
 [aime]
-; Enable aime reader emulation.
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
 enable=1
 aimePath=DEVICE\aime.txt
 ; Enable high baud rate.
-;highbaud=1
+;highBaud=1
 
-[aimeio]
-; x64 aimeio dll path.
-; Uncomment this if you have custom aime implementation.
-;path64=
+[vfd]
+; Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+; GP1232A02A FUTABA assembly.
+enable=1
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
 
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
@@ -30,12 +43,20 @@ default=127.0.0.1
 ; Chunithm is extremely picky about its LAN environment, so leaving this
 ; setting enabled is strongly recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.100.0
+subnet=192.168.139.0
 
 [gpio]
 ; ALLS DIP switches.
@@ -49,12 +70,16 @@ freeplay=0
 ; LAN Install: If multiple machines are present on the same LAN then set 
 ; this to 1 on exactly one machine and set this to 0 on all others.
 dipsw1=1
-; Monitor type: 0 = 120FPS (SP), 1 = 60FPS (CVT)
+; Monitor type: 0 = 120FPS, 1 = 60FPS
 dipsw2=1
-; Aime reader hardware type: 0 = SP, 1 = CVT. Both dipsw2 and dipsw3 must be
-; the same value.
+; Cab type: 0 = SP, 1 = CVT. SP will enable VFD and eMoney. This setting will switch
+; the LED 837-15093-06 COM port and the AiMe reder hardware generation as well.
 dipsw3=1
 
+; -----------------------------------------------------------------------------
+; Misc. hooks settings
+; -----------------------------------------------------------------------------
+
 [gfx]
 ; Force the game to run windowed.
 windowed=1
@@ -63,16 +88,70 @@ framed=0
 ; Select the monitor to run the game on. (Fullscreen only, 0 =primary screen)
 monitor=0
 
-[led15093]
-; 837-15093-06 LED strip emulation setting.
-enable=1
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL (x64) enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
 
 [chuniio]
-; Uncomment this if you have custom chuniio implementation.
+; Uncomment this if you have custom chuniio implementation comprised of a single 32bit DLL.
+; (will use chu2to3 engine internally)
+;path=
+
+; Uncomment both of these if you have custom chuniio implementation comprised of two DLLs.
 ; x86 chuniio to path32, x64 to path64. Both are necessary.
 ;path32=
 ;path64=
 
+; -----------------------------------------------------------------------------
+; LED settings
+; -----------------------------------------------------------------------------
+
+[led15093]
+; Enable emulation of the 15093-06 controlled lights, which handle the air tower 
+; RGBs and the rear LED panel (billboard) on the cabinet.
+enable=1
+
+[led]
+; Output billboard LED strip data to a named pipe called "\\.\pipe\chuni_led"
+cabLedOutputPipe=1
+; Output billboard LED strip data to serial
+cabLedOutputSerial=0
+
+; Output slider LED data to the named pipe
+controllerLedOutputPipe=1
+; Output slider LED data to the serial port
+controllerLedOutputSerial=0
+
+; Serial port to send data to if using serial output. Default is COM5.
+;serialPort=COM5
+; Baud rate for serial data
+;serialBaud=921600
+
+; Data output a sequence of bytes, with JVS-like framing.
+; Each "packet" starts with 0xE0 as a sync. To avoid E0 appearing elsewhere,
+; 0xD0 is used as an escape character -- if you receive D0 in the output, ignore
+; it and use the next sent byte plus one instead.
+;
+; After the sync is one byte for the board number that was updated, followed by
+; the red, green and blue values for each LED.
+;
+; 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
+
+
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -86,12 +165,12 @@ enable=1
 ; world. An improved solution will be provided later.
 
 [io3]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 ; Set to 0 for enable separate ir control. Deafult is space key.
 ir=0x20
 

dist/chusan/start.bat

@@ -2,8 +2,9 @@
 
 pushd %~dp0
 
-start /min inject_x64 -d -k chusanhook_x64.dll amdaemon.exe -c config_common.json config_server.json config_client.json config_cvt.json config_sp.json config_hook.json
+start "AM Daemon" /min inject_x64 -d -k chusanhook_x64.dll amdaemon.exe -c config_common.json config_server.json config_client.json config_cvt.json config_sp.json config_hook.json
 inject_x86 -d -k chusanhook_x86.dll chusanApp.exe
+
 taskkill /f /im amdaemon.exe > nul 2>&1
 
 echo.

dist/cm/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
@@ -8,11 +12,25 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
 [aime]
-; Enable aime reader emulation.
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
 enable=1
 aimePath=DEVICE\aime.txt
 
+[vfd]
+; Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+; GP1232A02A FUTABA assembly.
+enable=1
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -24,6 +42,10 @@ default=127.0.0.1
 ; setting enabled is recommended.
 enable=1
 
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
+
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
@@ -38,10 +60,28 @@ enable=1
 ; this to 0 on exactly one machine and set this to 1 on all others.
 dipsw1=0
 
+; -----------------------------------------------------------------------------
+; Misc. hooks settings
+; -----------------------------------------------------------------------------
+
 [touch]
 ; Enable/Disable WinTouch emulation
 enable=0
 
+[unity]
+; Path to a .NET DLL that should run before the game. Useful for loading
+; modding frameworks such as BepInEx.
+targetAssembly=
+
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -55,9 +95,9 @@ enable=0
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72

dist/cm/start.bat

@@ -2,7 +2,7 @@
 
 pushd %~dp0
 
-start /min inject -d -k cmhook.dll amdaemon.exe -c config_common.json config_server.json config_client.json config_hook.json
+start "AM Daemon" /min inject -d -k cmhook.dll amdaemon.exe -c config_common.json config_server.json config_client.json config_hook.json
 inject -d -k cmhook.dll CardMaker.exe -screen-fullscreen 0 -popupwindow -screen-width 1080 -screen-height 1920
 
 taskkill /f /im amdaemon.exe > nul 2>&1

dist/cxb/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Make sure theses are full paths and not relative or you will have a bad time
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
@@ -9,41 +13,55 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
+[aime]
+; Aime reader emulation
+enable=1
+; CXB is stupid, so we have to make the paths go back two directories. This 
+; will load the file from "resource\DEVICE\aime.txt". 
+aimePath=../DEVICE/aime.txt
+
+[led]
+; Emulation for the LED board. Currently it's just dummy responses,
+; but if somebody wants to make their keyboard or whatever light
+; up with the game they can
+enable=1
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
 default=127.0.0.1
 
+; Set the title server hostname or IP address here, as the title server
+; is hardcoded in the game.
+title=https://127.0.0.1:9002
+
 [netenv]
 ; Simulate an ideal LAN environment. This may interfere with head-to-head play.
 ; Crossbeats is extremely picky about its LAN environment, so leaving this
 ; setting enabled is strongly recommended.
 enable=1
 
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
+
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.100.0
+subnet=192.168.150.0
 billingCa=../DEVICE/ca.crt
 billingPub=../DEVICE/billing.pub
 billingType=2
 
-[gfx]
-; Force the game to run windowed.
-windowed=1
-; Add a frame to the game window if running windowed.
-framed=1
-; Select the monitor to run the game on. (Fullscreen only, 0 =primary screen)
-monitor=0
-
-[aime]
-; Aime reader emulation
-; CXB is stupid, so we have to make the paths go back one
-enable=1
-aimePath=../DEVICE/aime.txt
-felicaPath=../DEVICE/felica.txt
-
 [eeprom]
 ; See above
 path=../DEVICE/eeprom.bin
@@ -52,21 +70,54 @@ path=../DEVICE/eeprom.bin
 ; See above
 path=../DEVICE/sram.bin
 
-[led]
-; Emulation for the LED board. Currently it's just dummy responses,
-; but if somebody wants to make their keyboard or whatever light
-; up with the game they can
-enable=1
+; -----------------------------------------------------------------------------
+; Misc. hooks settings
+; -----------------------------------------------------------------------------
+
+[gfx]
+; Force the game to run windowed.
+windowed=1
+; Add a frame to the game window if running windowed.
+framed=1
+; Select the monitor to run the game on. (Fullscreen only, 0 =primary screen)
+monitor=0
+
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+[cxbio]
+; To use a custom crossbeats REV. DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+; -----------------------------------------------------------------------------
+; Input settings
+; -----------------------------------------------------------------------------
+
+; Keyboard bindings are specified as hexadecimal (prefixed with 0x) or decimal
+; (not prefixed with 0x) virtual-key codes, a list of which can be found here:
+;
+; https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
+;
+; This is, admittedly, not the most user-friendly configuration method in the
+; world. An improved solution will be provided later.
 
 [revio]
 ; Enable emulation of the rev IO board
-enabe=1
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+enable=1
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
+
 ; Menu up key. Default is up arrow.
 up=0x26
 ; Menu down key. Default is down arrow.

dist/diva/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
@@ -8,6 +12,20 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
+[aime]
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
+enable=1
+aimePath=DEVICE\aime.txt
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -19,14 +37,56 @@ default=127.0.0.1
 ; setting enabled is strongly recommended.
 enable=1
 
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
+
 [gpio]
+; Emulated Nu DIP switch for Distribution Server setting.
+;
+; If multiple machines are present on the same LAN then set this to 1 on
+; exactly one machine and set this to 0 on all others.
 dipsw1=1
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.150.0
+subnet=192.168.78.0
+
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+[divaio]
+; To use a custom Project DIVA Arcade IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in gamepad/wheel input.
+path=
+
+; -----------------------------------------------------------------------------
+; Input settings
+; -----------------------------------------------------------------------------
+
+; Keyboard bindings are specified as hexadecimal (prefixed with 0x) or decimal
+; (not prefixed with 0x) virtual-key codes, a list of which can be found here:
+;
+; https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
+;
+; This is, admittedly, not the most user-friendly configuration method in the
+; world. An improved solution will be provided later.
+
+[io3]
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 
 [slider]
 cell1=0x51

dist/fgo/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
@@ -8,49 +12,21 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
 [aime]
-; Controls emulation of the Aime card reader assembly.
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
 enable=1
 aimePath=DEVICE\aime.txt
 
-[dns]
-; Insert the hostname or IP address of the server you wish to use here.
-; Note that 127.0.0.1, localhost etc are specifically rejected.
-default=127.0.0.1
-
-[netenv]
-; Simulate an ideal LAN environment. This may interfere with head-to-head play.
-; SEGA games are somewhat picky about their LAN environment, so leaving this
-; setting enabled is recommended.
+[vfd]
+; Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+; GP1232A02A FUTABA assembly.
 enable=1
 
-; The final octet of the local host's IP address on the virtualized subnet (so,
-; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
-; local host's virtualized LAN IP is `192.168.32.11`).
-addrSuffix=11
-
-[keychip]
-; The /24 LAN subnet that the emulated keychip will tell the game to expect.
-; If you disable netenv then you must set this to your LAN's IP subnet, and
-; that subnet must start with 192.168.
-subnet=192.168.172.0
-
-[touch]
-; WinTouch emulation setting.
-enable=1
-remap=1
-cursor=1
-
-[printer]
-; Sinfonia CHC-C330 printer emulation setting.
-enable=1
-; Change the printer serial number here.
-serial_no="5A-A123"
-; Insert the path to the image output directory here.
-printerOutPath="DEVICE\print"
-; Rotate all printed images by 180 degrees.
-rotate180=1
-
 [deckReader]
 ; 837-15345 RFID deck reader emulation setting.
 enable=1
@@ -67,6 +43,78 @@ enable=1
 ; COM port number for the LED board. Has to be the same as the FTDI port.
 portNo=17
 
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
+[dns]
+; Insert the hostname or IP address of the server you wish to use here.
+; Note that 127.0.0.1, localhost etc are specifically rejected.
+default=127.0.0.1
+
+[netenv]
+; Simulate an ideal LAN environment. This may interfere with head-to-head play.
+; SEGA games are somewhat picky about their LAN environment, so leaving this
+; setting enabled is recommended.
+enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
+
+[keychip]
+; The /24 LAN subnet that the emulated keychip will tell the game to expect.
+; If you disable netenv then you must set this to your LAN's IP subnet, and
+; that subnet must start with 192.168.
+subnet=192.168.167.0
+
+[gpio]
+; ALLS DIP switches.
+enable=1
+
+; Enable freeplay mode. This will disable the coin slot and set the game to
+; freeplay. Keep in mind that some game modes (e.g. Freedom/Time Modes) will not
+; allow you to start a game in freeplay mode.
+freeplay=0
+
+; -----------------------------------------------------------------------------
+; Misc. hook settings
+; -----------------------------------------------------------------------------
+
+[touch]
+; WinTouch emulation setting.
+enable=1
+remap=1
+cursor=1
+
+[printer]
+; Sinfonia CHC-C330 printer emulation setting.
+enable=1
+; Change the printer serial number here.
+serial_no="5A-A123"
+; Insert the path to the image output directory here.
+printerOutPath="DEVICE\print"
+; Rotate all printed images by 180 degrees.
+rotate180=1
+
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+[fgoio]
+; To use a custom Fate/Grand Order Arcade IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in gamepad input.
+path=
+
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -81,9 +129,33 @@ portNo=17
 
 [io4]
 ; Input API selection for JVS input emulator.
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
+
+;   .·:'''''''''''''''''''''''''''''''''''''''''''''':·.
+;   : :  ______                            / \   []  : :
+;   : : |      |   _____                   \ /  Coin : :
+;   : : |______|  { (0) }      /--\      Attack.     : :
+;   : :   DECK     \   /      /    \                 : :
+;   : :             | |       >    <                 : :
+;   : :             | |       \    /          ___    : :
+;   : :             | |        \--/          |   |   : :
+;   : :             JOY       Noble.         |   |   : :
+;   : :                                      |___|   : :
+;   : :                                      AIME.   : :
+;   '·:..............................................:·'
+;
+; Only XInput is currently supported.
+
+; XInput bindings 
+;
+; Left Stick           Joystick
+; Left Stick Click     Reset Camera
+; Left Trigger         Dash
+; Left Shoulder        Switch Target
+; A/B                  Attack
+; X/Y                  Noble Phantasm

dist/idac/segatools.ini

@@ -1,18 +1,30 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
-; Insert the path to the game Option directory here (contains OPxx directories)
+; Insert the path to the game Option directory here (contains MVxx directories)
 option=
 ; Create an empty directory somewhere and insert the path here.
 ; This directory may be shared between multiple SEGA games.
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
 [aime]
 ; Controls emulation of the Aime card reader assembly.
 enable=1
 aimePath=DEVICE\aime.txt
 
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -24,12 +36,16 @@ default=127.0.0.1
 ; setting enabled is recommended.
 enable=1
 
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
+
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168. Set it to your LAN's subnet if you 
 ; want to play head-to-head using netenv=1.
-subnet=192.168.100.0
+subnet=192.168.158.0
 
 ; Override the keychip's region code. Most games seem to pay attention to the
 ; DS EEPROM region code and not the keychip region code, and this seems to be
@@ -59,13 +75,17 @@ dipsw3=0
 dipsw4=0
 dipsw5=0
 
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
 [aimeio]
 ; To use a custom card reader IO DLL enter its path here.
 ; Leave empty if you want to use Segatools built-in keyboard input.
 path=
 
 [idacio]
-; To use a custom Initial D The Arcade IO DLL enter its path here.
+; To use a custom Initial D THE ARCADE IO DLL enter its path here.
 ; Leave empty if you want to use Segatools built-in gamepad/wheel input.
 path=
 
@@ -82,12 +102,12 @@ path=
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 
 ; Input API selection for IO4 input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.
@@ -106,6 +126,22 @@ mode=xinput
 restrict=128
 
 [xinput]
+; XInput bindings
+;
+; Left Stick           Steering
+; Right Stick          (Steering) when "singleStickSteering" is disabled
+; Left Trigger         Brake
+; Right Trigger        Accelerator
+; Left Stick Click     Left (used for Time Up)
+; Right Stick Click    Right (used for Time Up)
+; Left Shoulder        Shift Down
+; Right Shoulder       Shift Up
+; Start/A              Start
+; Back/B               View Change
+; X                    Shift Up
+; Y                    Shift Down
+; D-Pad                D-Pad
+
 ; Left and right thumbsticks are mapped to left and right dpad buttons.
 ; Press both thumbsticks to trigger "Time Up" and exit the course.
 ; Automatically reset the simulated shifter to Neutral when XInput Start is
@@ -174,3 +210,8 @@ gear6=18
 ; (Needed when using DirectInput for the Dualshock 4 for example)
 reverseAccelAxis=0
 reverseBrakeAxis=0
+
+; Force feedback settings.
+; Strength of the force feedback spring effect in percent. Possible values
+; are 0-100.
+centerSpringStrength=30

dist/idac/start.bat

@@ -2,20 +2,6 @@
 
 pushd %~dp0
 
-REM set the APP_DIR to the Y drive
-set APP_DIR=Y:\SDGT
-
-REM create the APP_DIR if it doesn't exist and redirect it to the TEMP folder
-if not exist "%APP_DIR%" (
-    subst Y: %TEMP%
-    REM timeout /t 1
-    if not exist "%APP_DIR%" (
-        mkdir "%APP_DIR%"
-    )
-)
-
-echo Mounted the Y:\ drive to the %TEMP%\SDGT folder
-
 set AMDAEMON_CFG=config_common.json ^
 config_ex.json ^
 config_jp.json ^
@@ -39,12 +25,15 @@ config_seat_single_ex.json ^
 config_seat_single_jp.json ^
 config_hook.json
 
-start /min inject -d -k idachook.dll amdaemon.exe -c %AMDAEMON_CFG%
-inject -d -k idachook.dll ..\WindowsNoEditor\GameProject.exe -culture=en launch=Cabinet ABSLOG="..\..\..\..\..\Userdata\GameProject.log" -Master -UserDir="..\..\..\Userdata" -NotInstalled -UNATTENDED
-taskkill /f /im amdaemon.exe > nul 2>&1
+start "AM Daemon" /min inject -d -k idachook.dll amdaemon.exe -c %AMDAEMON_CFG%
 
-REM unmount the APP_DIR
-subst Y: /d > nul 2>&1
+rem JP
+rem inject -d -k idachook.dll ..\WindowsNoEditor\GameProject\Binaries\Win64\GameProject-Win64-Shipping.exe -culture=ja launch=Cabinet ABSLOG="..\..\..\..\..\Userdata\GameProject.log" -Master -UserDir="..\..\..\Userdata" -NotInstalled -UNATTENDED
+
+rem EXP
+inject -d -k idachook.dll ..\WindowsNoEditor\GameProject\Binaries\Win64\GameProject-Win64-Shipping.exe -culture=en launch=Cabinet ABSLOG="..\..\..\..\..\Userdata\GameProject.log" -Master -UserDir="..\..\..\Userdata" -NotInstalled -UNATTENDED
+
+taskkill /f /im amdaemon.exe > nul 2>&1
 
 echo.
 echo Game processes have terminated

dist/idz/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
@@ -8,6 +12,10 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
 [aime]
 ; Controls emulation of the Aime card reader assembly.
 enable=1
@@ -16,11 +24,36 @@ aimePath=DEVICE\aime.txt
 felicaGen=0
 aimeGen=1
 
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
 default=127.0.0.1
 
+[netenv]
+; Simulate an ideal LAN environment. This may interfere with head-to-head play.
+; SEGA games are somewhat picky about their LAN environment, so leaving this
+; setting enabled is recommended.
+enable=1
+; The final octet of the local host's IP address on the virtualized subnet 
+; (so, if the keychip subnet is 192.168.32.0 and this value is set to 11, 
+; then the local host's virtualized LAN IP is 192.168.32.11).
+; Needed for in store battle, one needs to set it to 12.
+;addrSuffix=12
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
+
+[keychip]
+; The /24 LAN subnet that the emulated keychip will tell the game to expect.
+; If you disable netenv then you must set this to your LAN's IP subnet, and
+; that subnet must start with 192.168.
+subnet=192.168.158.0
+
 [ds]
 ; Region code on the emulated AMEX board DS EEPROM.
 ; 1: Japan
@@ -29,23 +62,16 @@ default=127.0.0.1
 ; NOTE: Changing this setting causes a factory reset.
 region=4
 
-[netenv]
-; Simulate an ideal LAN environment. This may interfere with head-to-head play.
-; SEGA games are somewhat picky about their LAN environment, so leaving this
-; setting enabled is recommended.
-enable=1
+[gpio]
+; Emulated Nu DIP switch for Distribution Server setting.
+;
+; If multiple machines are present on the same LAN then set this to 1 on
+; exactly one machine and set this to 0 on all others.
+dipsw1=1
 
-; The final octet of the local host's IP address on the virtualized subnet 
-; (so, if the keychip subnet is 192.168.32.0 and this value is set to 11, 
-; then the local host's virtualized LAN IP is 192.168.32.11).
-; Needed for in store battle, one needs to set it to 12.
-;addrSuffix=12
-
-[keychip]
-; The /24 LAN subnet that the emulated keychip will tell the game to expect.
-; If you disable netenv then you must set this to your LAN's IP subnet, and
-; that subnet must start with 192.168.
-subnet=192.168.158.0
+; -----------------------------------------------------------------------------
+; Misc. hooks settings
+; -----------------------------------------------------------------------------
 
 [gfx]
 ; Enables the graphics hook. This is required for some Initial D Zero versions
@@ -58,12 +84,9 @@ framed=1
 ; Select the monitor to run the game on. (Fullscreen only, 0=primary screen)
 monitor=0
 
-[gpio]
-; Emulated Nu DIP switch for Distribution Server setting.
-;
-; If multiple machines are present on the same LAN then set this to 1 on
-; exactly one machine and set this to 0 on all others.
-dipsw1=1
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
 
 [aimeio]
 ; To use a custom card reader IO DLL enter its path here.
@@ -88,12 +111,12 @@ path=
 ; world. An improved solution will be provided later.
 
 [io3]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 
 ; Input API selection for JVS input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.
@@ -112,6 +135,20 @@ mode=xinput
 restrict=97
 
 [xinput]
+; XInput bindings
+;
+; Left Stick           Steering
+; Right Stick          (Steering) when "singleStickSteering" is disabled
+; Left Trigger         Brake
+; Right Trigger        Accelerator
+; Left Shoulder        Shift Down
+; Right Shoulder       Shift Up
+; Start/A              Start
+; Back/B               View Change
+; X                    Shift Up
+; Y                    Shift Down
+; D-Pad                D-Pad
+
 ; Automatically reset the simulated shifter to Neutral when XInput Start is
 ; pressed (e.g. when navigating menus between races).
 autoNeutral=1
@@ -173,3 +210,8 @@ gear6=18
 ; (Needed when using DirectInput for the Dualshock 4 for example)
 reverseAccelAxis=0
 reverseBrakeAxis=0
+
+; Force feedback settings.
+; Strength of the force feedback spring effect in percent. Possible values
+; are 0-100.
+centerSpringStrength=30

dist/mai2/segatools.ini

@@ -1,18 +1,36 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
-; Insert the path to the game Option directory here (contains Axxx, Bxxx directories)
+; Insert the path to the game Option directory here (contains Axxx directories)
 option=
 ; Create an empty directory somewhere and insert the path here.
 ; This directory may be shared between multiple SEGA games.
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
 [aime]
-; Enable aime reader emulation.
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
 enable=1
 aimePath=DEVICE\aime.txt
 
+[vfd]
+; Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+; GP1232A02A FUTABA assembly.
+enable=1
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -23,12 +41,20 @@ default=127.0.0.1
 ; SEGA games are somewhat picky about its LAN environment, so leaving this
 ; setting enabled is recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.100.0
+subnet=192.168.172.0
 
 [gpio]
 ; ALLS DIP switches.
@@ -43,6 +69,29 @@ freeplay=0
 ; this to 1 on exactly one machine and set this to 0 on all others.
 dipsw1=1
 
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+[mai2io]
+; To use a custom maimai DX IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+; -----------------------------------------------------------------------------
+; Misc. hook settings
+; -----------------------------------------------------------------------------
+
+[unity]
+; Path to a .NET DLL that should run before the game. Useful for loading
+; modding frameworks such as BepInEx.
+targetAssembly=
+
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -56,12 +105,12 @@ dipsw1=1
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 
 ; Key bindings for buttons around screen. The default key map, depicted
 ; in clockwise order, is as follows:

dist/mai2/start.bat

@@ -2,8 +2,9 @@
 
 pushd %~dp0
 
-start /min inject -d -k mai2hook.dll amdaemon.exe -f -c config_common.json config_server.json config_client.json
-inject -d -k mai2hook.dll sinmai -screen-fullscreen 0
+start "AM Daemon" /min inject -d -k mai2hook.dll amdaemon.exe -f -c config_common.json config_server.json config_client.json
+inject -d -k mai2hook.dll sinmai -screen-fullscreen 0 -popupwindow -screen-width 2160 -screen-height 1920  -silent-crashes
+
 taskkill /f /im amdaemon.exe > nul 2>&1
 
 echo.

dist/mercury/segatools.ini

@@ -1,11 +1,35 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
-amfs=amfs
+amfs=
+; Insert the path to the game Option directory here (contains Axxx directories)
+option=
 ; Create an empty directory somewhere and insert the path here.
 ; This directory may be shared between multiple SEGA games.
 ; NOTE: This has nothing to do with Windows %APPDATA%.
-appdata=appdata
-option=option
+appdata=
+
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
+[aime]
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
+enable=1
+aimePath=DEVICE\aime.txt
+
+[vfd]
+; Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+; GP1232A02A FUTABA assembly.
+enable=1
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
 
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
@@ -17,6 +41,14 @@ default=127.0.0.1
 ; SEGA games are somewhat picky about their LAN environment, so leaving this
 ; setting enabled is recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
@@ -24,9 +56,6 @@ enable=1
 ; that subnet must start with 192.168.
 subnet=192.168.174.0
 
-[gfx]
-enable=1
-
 [gpio]
 ; ALLS DIP switches.
 enable=1
@@ -40,6 +69,35 @@ freeplay=0
 ; this to 1 on exactly one machine and set this to 0 on all others.
 dipsw1=1
 
+; -----------------------------------------------------------------------------
+; Misc. hook settings
+; -----------------------------------------------------------------------------
+
+[gfx]
+enable=1
+
+; Hooks related to the touch boards
+[touch]
+enable=1
+
+; Hooks related to the LED board (codenamed Elisabeth)
+[elisabeth]
+enable=1
+
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+[mercuryio]
+; To use a custom WACCA IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -53,26 +111,14 @@ dipsw1=1
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 
 ; Volume up virtual-key code. Default is the "UP" key.
 volup=0x26
 ; Volume down virtual-key code. Default is the "DOWN" key.
 voldown=0x28
-
-; Hooks related to the touch boards
-[touch]
-enable=1
-
-; Hooks related to the LED board (codenamed Elisabeth)
-[elisabeth]
-enable=1
-
-;[mercuryio]
-; Use mercuryio.dll
-;path=mercuryio.dll

dist/mercury/start.bat

@@ -4,10 +4,10 @@ pushd %~dp0
 taskkill /f /im amdaemon.exe > nul 2>&1
 
 REM USA
-REM start inject -d -k mercuryhook.dll amdaemon.exe -f -c config.json config_lan_install_client.json config_lan_install_server.json config_video_clone.json config_video_dual.json config_video_clone_flip.json config_video_dual_flip.json config_region_exp.json config_region_chn.json config_region_usa.json
+start "AM Daemon" /min inject -d -k mercuryhook.dll amdaemon.exe -f -c config.json config_lan_install_client.json config_lan_install_server.json config_video_clone.json config_video_dual.json config_video_clone_flip.json config_video_dual_flip.json config_region_exp.json config_region_chn.json config_region_usa.json
 
 REM JP
-start inject -d -k mercuryhook.dll amdaemon.exe -f -c config.json config_lan_install_client.json config_lan_install_server.json config_video_clone.json config_video_dual.json config_video_clone_flip.json config_video_dual_flip.json config_region_exp.json config_region_chn.json config_region_jpn.json
+start "AM Daemon" /min inject -d -k mercuryhook.dll amdaemon.exe -f -c config.json config_lan_install_client.json config_lan_install_server.json config_video_clone.json config_video_dual.json config_video_clone_flip.json config_video_dual_flip.json config_region_exp.json config_region_chn.json config_region_jpn.json
 inject -d -k mercuryhook.dll ../WindowsNoEditor/Mercury/Binaries/Win64/Mercury-Win64-Shipping.exe
 
 taskkill /f /im amdaemon.exe > nul 2>&1

dist/mu3/segatools.ini

@@ -1,3 +1,7 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
@@ -8,11 +12,25 @@ option=
 ; NOTE: This has nothing to do with Windows %APPDATA%.
 appdata=
 
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
+
 [aime]
-; Controls emulation of the Aime card reader assembly.
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
 enable=1
 aimePath=DEVICE\aime.txt
 
+[vfd]
+; Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+; GP1232A02A FUTABA assembly.
+enable=1
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -24,6 +42,10 @@ default=127.0.0.1
 ; setting enabled is recommended.
 enable=1
 
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
+
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
@@ -43,12 +65,31 @@ freeplay=0
 ; this to 1 on exactly one machine and set this to 0 on all others.
 dipsw1=1
 
+; -----------------------------------------------------------------------------
+; Misc. hook settings
+; -----------------------------------------------------------------------------
+
 [gfx]
 enable=1
 
-[led15093]
-; 837-15093-06 LED board emulation setting.
-enable=1
+[unity]
+; Path to a .NET DLL that should run before the game. Useful for loading
+; modding frameworks such as BepInEx.
+targetAssembly=
+
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
+
+[aimeio]
+; To use a custom card reader IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard input.
+path=
+
+[mu3io]
+; To use a custom O.N.G.E.K.I. IO DLL enter its path here.
+; Leave empty if you want to use Segatools built-in keyboard/gamepad input.
+path=
 
 ; -----------------------------------------------------------------------------
 ; Input settings
@@ -63,28 +104,43 @@ enable=1
 ; world. An improved solution will be provided later.
 
 [io4]
-; Input API selection for JVS input emulator.
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 
 ; Set "1" to enable mouse lever emulation, "0" to use XInput
 mouse=1
 
+; XInput input bindings
+;
+; Left Stick        Lever
+; Left Trigger      Lever (move to the left)
+; Right Trigger     Lever (move to the right)
+; Left              Left red button
+; Up                Left green button
+; Right             Left blue button
+; Left Shoulder     Left side button
+; Right Shoulder    Right side button
+; X                 Right red button
+; Y                 Right green button
+; A                 Right blue button
+; Back              Left menu button
+; Start             Right menu button
+
 ; Keyboard input bindings
 left1=0x41  ; A
-left2=0x53	; S
-left3=0x44	; D
+left2=0x53  ; S
+left3=0x44  ; D
 
-leftSide=0x01	; Mouse Left
-rightSide=0x02	; Mouse Right
+leftSide=0x01   ; Mouse Left
+rightSide=0x02  ; Mouse Right
 
 right1=0x4A ; J
 right1=0x4B ; K
-right3=0x4C	; L
+right3=0x4C ; L
 
-leftMenu=0x55	; U
-rightMenu=0x4F	; O
+leftMenu=0x55   ; U
+rightMenu=0x4F  ; O

dist/mu3/start.bat

@@ -2,7 +2,7 @@
 
 pushd %~dp0
 
-start /min inject -d -k mu3hook.dll amdaemon.exe -f -c config_common.json config_server.json config_client.json
+start "AM Daemon" /min inject -d -k mu3hook.dll amdaemon.exe -f -c config_common.json config_server.json config_client.json
 inject -d -k mu3hook.dll mu3 -screen-fullscreen 0 -popupwindow -screen-width 1080 -screen-height 1920
 taskkill /f /im amdaemon.exe > nul 2>&1
 

dist/swdc/config_hook.json

@@ -0,0 +1,6 @@
+{
+    "emoney" :
+    {
+        "enable"        : false
+    }
+}

dist/swdc/segatools.ini

@@ -1,18 +1,36 @@
+; -----------------------------------------------------------------------------
+; Path settings
+; -----------------------------------------------------------------------------
+
 [vfs]
 ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
 amfs=
-; Insert the path to the game Option directory here (contains OPxx directories)
+; Insert the path to the game Option directory here (contains Axxx directories)
 option=
 ; Create an empty directory somewhere and insert the path here.
 ; This directory may be shared between multiple SEGA games.
 ; NOTE: This has nothing to do with Windows %APPDATA%.
-appdata=
+appdata=appdata
+
+; -----------------------------------------------------------------------------
+; Device settings
+; -----------------------------------------------------------------------------
 
 [aime]
-; Controls emulation of the Aime card reader assembly.
+; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
+; reader.
 enable=1
 aimePath=DEVICE\aime.txt
 
+[vfd]
+; Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+; GP1232A02A FUTABA assembly.
+enable=1
+
+; -----------------------------------------------------------------------------
+; Network settings
+; -----------------------------------------------------------------------------
+
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
 ; Note that 127.0.0.1, localhost etc are specifically rejected.
@@ -23,12 +41,33 @@ default=127.0.0.1
 ; SEGA games are somewhat picky about their LAN environment, so leaving this
 ; setting enabled is recommended.
 enable=1
+; The final octet of the local host's IP address on the virtualized subnet (so,
+; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the
+; local host's virtualized LAN IP is `192.168.32.11`).
+addrSuffix=11
+
+; -----------------------------------------------------------------------------
+; Board settings
+; -----------------------------------------------------------------------------
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; You must set this to your LAN's IP subnet, and that subnet must start with 192.168, 
 ; in order to find the MAIN cabinet.
-subnet=192.168.100.0
+subnet=192.168.160.0
+
+[gpio]
+; ALLS DIP switches.
+enable=1
+
+; Enable freeplay mode. This will disable the coin slot and set the game to
+; freeplay. Keep in mind that some game modes (e.g. Freedom/Time Modes) will not
+; allow you to start a game in freeplay mode.
+freeplay=0
+
+; -----------------------------------------------------------------------------
+; Custom IO settings
+; -----------------------------------------------------------------------------
 
 [aimeio]
 ; To use a custom card reader IO DLL enter its path here.
@@ -40,15 +79,6 @@ path=
 ; Leave empty if you want to use Segatools built-in gamepad/wheel input.
 path=
 
-[gpio]
-; ALLS DIP switches.
-enable=1
-
-; Enable freeplay mode. This will disable the coin slot and set the game to
-; freeplay. Keep in mind that some game modes (e.g. Freedom/Time Modes) will not
-; allow you to start a game in freeplay mode.
-freeplay=0
-
 ; -----------------------------------------------------------------------------
 ; Input settings
 ; -----------------------------------------------------------------------------
@@ -62,12 +92,12 @@ freeplay=0
 ; world. An improved solution will be provided later.
 
 [io4]
-; Test button virtual-key code. Default is the 1 key.
-test=0x31
-; Service button virtual-key code. Default is the 2 key.
-service=0x32
-; Keyboard button to increment coin counter. Default is the 3 key.
-coin=0x33
+; Test button virtual-key code. Default is the F1 key.
+test=0x70
+; Service button virtual-key code. Default is the F2 key.
+service=0x71
+; Keyboard button to increment coin counter. Default is the F3 key.
+coin=0x72
 
 ; Input API selection for IO4 input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.
@@ -86,6 +116,22 @@ mode=xinput
 restrict=128
 
 [xinput]
+; XInput bindings
+;
+; Left Stick           Steering
+; Right Stick          (Steering) when "singleStickSteering" is disabled
+; Left Trigger         Brake
+; Right Trigger        Accelerator
+; Left Shoulder        Left Paddle
+; Right Shoulder       Right Paddle
+; Start                Start
+; Back                 View Change
+; A                    Green (Wheel)
+; B                    Red (Wheel)
+; X                    Blue (Wheel)
+; Y                    Yellow (Wheel)
+; D-Pad                D-Pad
+
 ; Use the left thumbstick for steering instead of both on XInput Controllers.
 ; Not recommended as it will not give you the precision needed for this game.
 singleStickSteering=1
@@ -133,3 +179,8 @@ wheelGreen=10
 ; (Needed when using DirectInput for the Dualshock 4 for example)
 reverseAccelAxis=0
 reverseBrakeAxis=0
+
+; Force feedback settings.
+; Strength of the force feedback spring effect in percent. Possible values
+; are 0-100.
+centerSpringStrength=30

dist/swdc/start.bat

@@ -2,12 +2,36 @@
 
 pushd %~dp0
 
-rem Matching Server
-start /min ..\..\..\Tools\tdrserver.exe
-REM start /min inject -d -k swdchook.dll amdaemon.exe -c config.json config_LanClient.json config_MiniCabinet.json config_hook.json
-start /min inject -d -k swdchook.dll amdaemon.exe -c config.json config_LanServer.json config_MiniCabinet.json
-REM Valid -launch parameters are "PC", "Cabinet" and "MiniCabinet
-inject -d -k swdchook.dll ..\Todoroki\Binaries\Win64\Todoroki-Win64-Shipping.exe -launch=MiniCabinet -ABSLOG="..\..\..\..\..\Userdata\Todoroki.log" -UserDir="..\..\..\Userdata" -NotInstalled -UNATTENDED
+REM Root directory
+set ROOT_DIR=WindowsNoEditor
+
+rem Matching Server paths
+set MATCHING_SERVER_FILE_NAME=tdrserver.exe
+set MATCHING_SERVER_PATH=..\Tools\%MATCHING_SERVER_FILE_NAME%
+
+rem AM Daemon paths
+set DAEMON_DIR=%ROOT_DIR%\AMDaemon
+set DAEMON_CONFIG_PATH=%DAEMON_DIR%\config.json
+rem Make sure to use appdata=appdata in segatools.ini
+set DAEMON_CHECK_LAN_SERVER_PATH=appdata\SDDS\LanServer.dat
+
+rem Check if LanServer.dat is present
+if exist "%DAEMON_CHECK_LAN_SERVER_PATH%" (
+  set DAEMON_LAN_CONFIG_PATH=%DAEMON_DIR%\config_LanServer.json
+
+  start "matching_server" /min %MATCHING_SERVER_PATH%
+) else (
+  set DAEMON_LAN_CONFIG_PATH=%DAEMON_DIR%\config_LanClient.json
+)
+
+start "AM Daemon" /min inject -d -k swdchook.dll "%DAEMON_DIR%\amdaemon.exe" -c %DAEMON_CONFIG_PATH% -c %DAEMON_LAN_CONFIG_PATH% config_hook.json
+
+REM Launch Todoroki
+set APP_EXE_DIR=WindowsNoEditor\Todoroki\Binaries\Win64
+set APP_EXE_PATH=%APP_EXE_DIR%\Todoroki-Win64-Shipping.exe
+
+REM Valid -launch parameters are "Cabinet" or "MiniCabinet"
+inject -d -k swdchook.dll "%APP_EXE_PATH%" -launch="MiniCabinet" -ABSLOG="..\Userdata\Todoroki.log" -UserDir="..\Userdata" -NotInstalled -UNATTENDED
 
 taskkill /f /im amdaemon.exe > nul 2>&1
 taskkill /f /im tdrserver.exe > nul 2>&1

divaio/config.c

@@ -27,9 +27,9 @@ void diva_io_config_load(
     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_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);
 
     for (i = 0 ; i < _countof(cfg->vk_buttons) ; i++) {
         swprintf_s(key, _countof(key), L"key%i", i + 1);

doc/config/common.md

@@ -31,7 +31,7 @@ Default: `1`
 Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
 reader (COM port number varies by game).
 
-### `highbaud`
+### `highBaud`
 
 Default: `1`
 
@@ -84,6 +84,17 @@ emulates an IC card in its proximity. A variety of different IC cards can be
 emulated; the exact choice of card that is emulated depends on the presence or
 absence of the configured card ID files.
 
+## `[vfd]`
+
+Controls emulation of the VFD GP1232A02A FUTABA assembly.
+
+### `enable`
+
+Default: `1`
+
+Enable VFD emulation (currently just stubbed). Disable to use a real VFD
+GP1232A02A FUTABA assembly (COM port number varies by game).
+
 ## `[amvideo]`
 
 Controls the `amvideo.dll` stub built into Segatools. This is a DLL that is
@@ -142,6 +153,13 @@ setting. Also, loopback addresses are specifically checked for and rejected by
 the games themselves; this needs to be a LAN or WAN IP (or a hostname that
 resolves to one).
 
+### `title`
+
+Default: `title`
+
+Leave it as `title` to use the title server returned by ALL.Net. Rewrites 
+the title server hostname for certain games, such as crossbeats REV.
+
 ### `router`
 
 Default: Empty string (i.e. use value from `default` setting)
@@ -377,13 +395,29 @@ Bit values are:
 - 3: EXP: Export (for Asian markets)
 - 4: CHS: China (Simplified Chinese?)
 
+### `billingCa`
+
+Default: `DEVICE\\ca.crt`
+
+Set the billing certificate path. This has to match the one used for the 
+SSL billing server. The DER certificate must fit in 1024 bytes so it must be
+small.
+
+### `billingPub`
+
+Default: `DEVICE\\billing.pub`
+
+Set the actual keychip RSA public key path. This public key has to match the
+private key `billing.key` of the billing server in order to decrypt/encrypt
+the billing transactions.
+
 ### `billingType`
 
 Default: `1`
 
 Set the billing "type" for the keychip. The type determins what kind of revenue share,
 if any, the game maker has with SEGA. Some games may be picky and require types other 
-then 1 (ex. Crossbeats requires billing type 2), so this option is provided if this
+then 1 (ex. crossbeats REV. requires billing type 2), so this option is provided if this
 is an issue. Billing types are:
 
 - 0: No billing?
@@ -396,8 +430,8 @@ is an issue. Billing types are:
 Default: `0x64`
 
 An 8-bit bitfield of unclear meaning. The least significant bit indicates a
-developer dongle, I think? Changing this doesn't seem to have any effect on
-anything other than Project DIVA.
+developer dongle. Changing this doesn't seem to have any effect on
+anything other than SEGA AM2 games.
 
 Other values observed in the wild:
 

fgohook/config.c

@@ -48,7 +48,7 @@ void led15093_config_load(struct led15093_config *cfg, const wchar_t *filename)
 
     cfg->enable = GetPrivateProfileIntW(L"led15093", L"enable", 1, filename);
     cfg->port_no = GetPrivateProfileIntW(L"led15093", L"portNo", 0, filename);
-    cfg->high_baudrate = GetPrivateProfileIntW(L"led15093", L"highBaudrate", 0, filename);
+    cfg->high_baudrate = GetPrivateProfileIntW(L"led15093", L"highBaud", 0, filename);
     cfg->fw_ver = GetPrivateProfileIntW(L"led15093", L"fwVer", 0xA0, filename);
     cfg->fw_sum = GetPrivateProfileIntW(L"led15093", L"fwSum", 0xAA53, filename);
 
@@ -116,6 +116,7 @@ void fgo_hook_config_load(
     aime_config_load(&cfg->aime, filename);
     dvd_config_load(&cfg->dvd, filename);
     io4_config_load(&cfg->io4, filename);
+    vfd_config_load(&cfg->vfd, filename);
     touch_screen_config_load(&cfg->touch, filename);
     printer_config_load(&cfg->printer, filename);
     fgo_deck_config_load(&cfg->deck, filename);

fgohook/config.h

@@ -20,6 +20,7 @@ struct fgo_hook_config {
     struct aime_config aime;
     struct dvd_config dvd;
     struct io4_config io4;
+    struct vfd_config vfd;
     struct touch_screen_config touch;
     struct printer_config printer;
     struct deck_config deck;

fgohook/dllmain.c

@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include "board/io4.h"
+#include "board/led15093.h"
 #include "board/sg-reader.h"
 #include "board/vfd.h"
 
@@ -66,7 +67,7 @@ static DWORD CALLBACK fgo_pre_startup(void)
         goto fail;
     }
 
-    hr = vfd_hook_init(1);
+    hr = vfd_hook_init(&fgo_hook_cfg.vfd, 1);
 
     if (FAILED(hr)) {
         goto fail;
@@ -96,7 +97,8 @@ static DWORD CALLBACK fgo_pre_startup(void)
         goto fail;
     }
 
-    hr = led15093_hook_init(&fgo_hook_cfg.led15093, 17, 1, 1, 2);
+    hr = led15093_hook_init(&fgo_hook_cfg.led15093, 
+        fgo_dll.led_init, fgo_dll.led_set_leds, 17, 1, 1, 2);
 
     if (FAILED(hr)) {
         goto fail;

fgohook/fgo-dll.c

@@ -24,6 +24,12 @@ const struct dll_bind_sym fgo_dll_syms[] = {
     }, {
         .sym = "fgo_io_get_analogs",
         .off = offsetof(struct fgo_dll, get_analogs),
+    }, {
+        .sym = "fgo_io_led_init",
+        .off = offsetof(struct fgo_dll, led_init),
+    }, {
+        .sym = "fgo_io_led_set_leds",
+        .off = offsetof(struct fgo_dll, led_set_leds),
     }
 };
 

fgohook/fgo-dll.h

@@ -11,6 +11,8 @@ struct fgo_dll {
     void (*get_opbtns)(uint8_t *opbtn);
     void (*get_gamebtns)(uint8_t *gamebtn);
     void (*get_analogs)(int16_t *stick_x, int16_t *stick_y);
+    HRESULT (*led_init)(void);
+    void (*led_set_leds)(uint8_t board, uint8_t *rgb);
 };
 
 struct fgo_dll_config {

fgohook/fgohook.def

@@ -17,6 +17,8 @@ EXPORTS
     fgo_io_get_opbtns
     fgo_io_init
     fgo_io_poll
+    fgo_io_led_init
+    fgo_io_led_set_leds
     fwdlusb_open
     fwdlusb_close
     fwdlusb_listupPrinter

fgoio/config.c

@@ -14,7 +14,7 @@ void fgo_io_config_load(
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    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);
 }

fgoio/fgoio.c

@@ -67,11 +67,11 @@ HRESULT fgo_io_poll(void)
         fgo_gamebtn |= FGO_IO_GAMEBTN_TARGET;
     }
 
-    if (xb & XINPUT_GAMEPAD_A) {
+    if (xb & XINPUT_GAMEPAD_A || xb & XINPUT_GAMEPAD_B) {
         fgo_gamebtn |= FGO_IO_GAMEBTN_ATTACK;
     }
 
-    if (xb & XINPUT_GAMEPAD_Y) {
+    if (xb & XINPUT_GAMEPAD_Y || xb & XINPUT_GAMEPAD_X) {
         fgo_gamebtn |= FGO_IO_GAMEBTN_NOBLE_PHANTASHM;
     }
     
@@ -139,3 +139,13 @@ void fgo_io_get_analogs(int16_t *stick_x, int16_t *stick_y)
         *stick_y = fgo_stick_y;
     }
 }
+
+HRESULT fgo_io_led_init(void)
+{
+    return S_OK;
+}
+
+void fgo_io_led_set_leds(uint8_t board, uint8_t *rgb)
+{
+    return;
+}

fgoio/fgoio.h

@@ -69,3 +69,18 @@ void fgo_io_get_gamebtns(uint8_t *btn);
    Minimum API version: 0x0100 */
 
 void fgo_io_get_analogs(int16_t *stick_x, int16_t *stick_y);
+
+/* Initialize LED emulation. This function will be called before any
+   other fgo_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. */
+
+HRESULT fgo_io_led_init(void);
+
+/* Update the RGB LEDs. 
+   
+   Exact layout is TBD. */
+
+void fgo_io_led_set_leds(uint8_t board, uint8_t *rgb);

hooklib/dns.c

@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <windns.h>
 #include <ws2tcpip.h>
+#include <winhttp.h>
 
 #include <assert.h>
 #include <stdbool.h>
@@ -12,6 +13,8 @@
 #include "hook/hr.h"
 #include "hook/table.h"
 
+#include "util/dprintf.h"
+
 #include "hooklib/dns.h"
 
 /* Latest w32headers does not include DnsQueryEx, so we'll have to "polyfill"
@@ -66,6 +69,18 @@ static int WSAAPI hook_getaddrinfo(
         const ADDRINFOA *pHints,
         ADDRINFOA **ppResult);
 
+static HINTERNET WINAPI hook_WinHttpConnect(
+        HINTERNET hSession,
+        const wchar_t *pwszServerName,
+        INTERNET_PORT nServerPort,
+        DWORD dwReserved);
+
+static bool WINAPI hook_WinHttpCrackUrl(
+        const wchar_t *pwszUrl,
+        DWORD dwUrlLength,
+        DWORD dwFlags,
+        LPURL_COMPONENTS lpUrlComponents);
+
 /* Link pointers */
 
 static DNS_STATUS (WINAPI *next_DnsQuery_A)(
@@ -95,6 +110,18 @@ static int (WSAAPI *next_getaddrinfo)(
         const ADDRINFOA *pHints,
         ADDRINFOA **ppResult);
 
+static HINTERNET (WINAPI *next_WinHttpConnect)(
+        HINTERNET hSession,
+        const wchar_t *pwszServerName,
+        INTERNET_PORT nServerPort,
+        DWORD dwReserved);
+
+static bool (WINAPI *next_WinHttpCrackUrl)(
+        const wchar_t *pwszUrl,
+        DWORD dwUrlLength,
+        DWORD dwFlags,
+        LPURL_COMPONENTS lpUrlComponents);
+
 static const struct hook_symbol dns_hook_syms_dnsapi[] = {
     {
         .name       = "DnsQuery_A",
@@ -120,10 +147,24 @@ static const struct hook_symbol dns_hook_syms_ws2[] = {
     }
 };
 
+static const struct hook_symbol dns_hook_syms_winhttp[] = {
+    {
+        .name       = "WinHttpConnect",
+        .patch      = hook_WinHttpConnect,
+        .link       = (void **) &next_WinHttpConnect,
+    }, {
+        .name       = "WinHttpCrackUrl",
+        .patch      = hook_WinHttpCrackUrl,
+        .link       = (void **) &next_WinHttpCrackUrl,
+    }
+
+};
+
 static bool dns_hook_initted;
 static CRITICAL_SECTION dns_hook_lock;
 static struct dns_hook_entry *dns_hook_entries;
 static size_t dns_hook_nentries;
+static char received_title_url[255];
 
 static void dns_hook_init(void)
 {
@@ -145,6 +186,12 @@ static void dns_hook_init(void)
             "ws2_32.dll",
             dns_hook_syms_ws2,
             _countof(dns_hook_syms_ws2));
+    
+    hook_table_apply(
+            NULL,
+            "winhttp.dll",
+            dns_hook_syms_winhttp,
+            _countof(dns_hook_syms_winhttp));
 }
 
 HRESULT dns_hook_push(const wchar_t *from_src, const wchar_t *to_src)
@@ -460,3 +507,83 @@ end:
 
     return result;
 }
+
+static HINTERNET WINAPI hook_WinHttpConnect(
+        HINTERNET hSession,
+        const wchar_t *pwszServerName,
+        INTERNET_PORT nServerPort,
+        DWORD dwReserved)
+{
+    const struct dns_hook_entry *pos;
+    size_t i;
+
+    if (pwszServerName == NULL) {
+        return NULL;
+    }
+
+    EnterCriticalSection(&dns_hook_lock);
+
+    for (i = 0 ; i < dns_hook_nentries ; i++) {
+        pos = &dns_hook_entries[i];
+
+        if (_wcsicmp(pwszServerName, pos->from) == 0) {
+            if(pos->to == NULL) {
+                LeaveCriticalSection(&dns_hook_lock);
+                return NULL;
+            }
+
+            pwszServerName = pos->to;
+
+            break;
+        }
+    }
+
+    LeaveCriticalSection(&dns_hook_lock);
+
+    return next_WinHttpConnect(hSession, pwszServerName, nServerPort, dwReserved);
+}
+
+// Hook to replace CXB title url
+static bool WINAPI hook_WinHttpCrackUrl(
+        const wchar_t *pwszUrl,
+        DWORD dwUrlLength,
+        DWORD dwFlags,
+        LPURL_COMPONENTS lpUrlComponents)
+{
+    const struct dns_hook_entry *pos;
+    size_t i;
+
+    EnterCriticalSection(&dns_hook_lock);
+
+    for (i = 0 ; i < dns_hook_nentries ; i++) {
+        pos = &dns_hook_entries[i];
+
+        if (_wcsicmp(pwszUrl, pos->from) == 0) {
+            wchar_t* toAddr = pos->to;
+            wchar_t titleBuffer[255];
+            
+            if(wcscmp(toAddr, L"title") == 0) {
+                size_t wstr_c;
+                mbstowcs_s(&wstr_c, titleBuffer, 255, received_title_url, strlen(received_title_url));
+                toAddr = titleBuffer;
+            }
+
+            bool result = next_WinHttpCrackUrl(
+                toAddr,
+                wcslen(toAddr),
+                dwFlags,
+                lpUrlComponents
+            );
+            LeaveCriticalSection(&dns_hook_lock);
+            return result;
+        }
+    }
+
+    LeaveCriticalSection(&dns_hook_lock);
+    return next_WinHttpCrackUrl(
+        pwszUrl,
+        dwUrlLength,
+        dwFlags,
+        lpUrlComponents
+    );
+}

hooklib/path.c

@@ -101,6 +101,40 @@ static BOOL WINAPI hook_PathFileExistsA(LPCSTR pszPath);
 
 static BOOL WINAPI hook_PathFileExistsW(LPCWSTR pszPath);
 
+static BOOL WINAPI hook_MoveFileA(
+        const char *lpExistingFileName,
+        const char *lpNewFileName);
+
+static BOOL WINAPI hook_MoveFileW(
+        const wchar_t *lpExistingFileName,
+        const wchar_t *lpNewFileName);
+
+static BOOL WINAPI hook_MoveFileExA(
+        const char *lpExistingFileName,
+        const char *lpNewFileName,
+        uint32_t dwFlags);
+
+
+static BOOL WINAPI hook_ReplaceFileA(
+        const char *lpReplacedFileName,
+        const char *lpReplacementFileName,
+        const char *lpBackupFileName,
+        uint32_t dwReplaceFlags,
+        void *lpExclude,
+        void *lpReserved);
+
+static BOOL WINAPI hook_ReplaceFileW(
+        const wchar_t *lpReplacedFileName,
+        const wchar_t *lpReplacementFileName,
+        const wchar_t *lpBackupFileName,
+        uint32_t dwReplaceFlags,
+        void *lpExclude,
+        void *lpReserved);
+
+static BOOL WINAPI hook_DeleteFileA(const char *lpFileName);
+
+static BOOL WINAPI hook_DeleteFileW(const wchar_t *lpFileName);
+
 /* Link pointers */
 
 static BOOL (WINAPI *next_CreateDirectoryA)(
@@ -185,6 +219,39 @@ static BOOL (WINAPI *next_PathFileExistsA)(LPCSTR pszPath);
 
 static BOOL (WINAPI *next_PathFileExistsW)(LPCWSTR pszPath);
 
+static BOOL (WINAPI *next_MoveFileA)(
+        const char *lpExistingFileName,
+        const char *lpNewFileName);
+
+static BOOL (WINAPI *next_MoveFileW)(
+        const wchar_t *lpExistingFileName,
+        const wchar_t *lpNewFileName);
+
+static BOOL (WINAPI *next_MoveFileExA)(
+        const char *lpExistingFileName,
+        const char *lpNewFileName,
+        uint32_t dwFlags);
+
+static BOOL (WINAPI *next_ReplaceFileA)(
+        const char *lpReplacedFileName,
+        const char *lpReplacementFileName,
+        const char *lpBackupFileName,
+        uint32_t dwReplaceFlags,
+        void *lpExclude,
+        void *lpReserved);
+
+static BOOL (WINAPI *next_ReplaceFileW)(
+        const wchar_t *lpReplacedFileName,
+        const wchar_t *lpReplacementFileName,
+        const wchar_t *lpBackupFileName,
+        uint32_t dwReplaceFlags,
+        void *lpExclude,
+        void *lpReserved);
+
+static BOOL (WINAPI *next_DeleteFileA)(const char *lpFileName);
+
+static BOOL (WINAPI *next_DeleteFileW)(const wchar_t *lpFileName);
+
 /* Hook table */
 
 static const struct hook_symbol path_hook_syms[] = {
@@ -260,6 +327,34 @@ static const struct hook_symbol path_hook_syms[] = {
         .name   = "PathFileExistsW",
         .patch  = hook_PathFileExistsW,
         .link   = (void **) &next_PathFileExistsW,
+    }, {
+        .name   = "MoveFileA",
+        .patch  = hook_MoveFileA,
+        .link   = (void **) &next_MoveFileA,
+    }, {
+        .name   = "MoveFileW",
+        .patch  = hook_MoveFileW,
+        .link   = (void **) &next_MoveFileW,
+    }, {
+        .name   = "MoveFileExA",
+        .patch  = hook_MoveFileExA,
+        .link   = (void **) &next_MoveFileExA,
+    }, {
+        .name   = "ReplaceFileA",
+        .patch  = hook_ReplaceFileA,
+        .link   = (void **) &next_ReplaceFileA,
+    }, {
+        .name   = "ReplaceFileW",
+        .patch  = hook_ReplaceFileW,
+        .link   = (void **) &next_ReplaceFileW,
+    }, {
+        .name   = "DeleteFileA",
+        .patch  = hook_DeleteFileA,
+        .link   = (void **) &next_DeleteFileA,
+    }, {
+        .name   = "DeleteFileW",
+        .patch  = hook_DeleteFileW,
+        .link   = (void **) &next_DeleteFileW,
     }
 };
 
@@ -906,3 +1001,213 @@ static BOOL WINAPI hook_PathFileExistsW(LPCWSTR pszPath)
 
     return ok;
 }
+
+static BOOL WINAPI hook_MoveFileA(
+        const char *lpExistingFileName,
+        const char *lpNewFileName)
+{
+    char *oldTrans;
+    char *newTrans;
+    BOOL ok;
+
+    ok = path_transform_a(&oldTrans, lpExistingFileName);
+
+    if (!ok) {
+        return FALSE;
+    }
+
+    ok = path_transform_a(&newTrans, lpNewFileName);
+
+    if (!ok) {
+        free(oldTrans);
+
+        return FALSE;
+    }
+
+    ok = next_MoveFileA(
+        oldTrans ? oldTrans : lpExistingFileName,
+        newTrans ? newTrans : lpNewFileName);
+    
+    free(oldTrans);
+    free(newTrans);
+
+    return ok;
+}
+
+static BOOL WINAPI hook_MoveFileW(
+        const wchar_t *lpExistingFileName,
+        const wchar_t *lpNewFileName)
+{
+    wchar_t *oldTrans;
+    wchar_t *newTrans;
+    BOOL ok;
+
+    ok = path_transform_w(&oldTrans, lpExistingFileName);
+
+    if (!ok) {
+        return FALSE;
+    }
+
+    ok = path_transform_w(&newTrans, lpNewFileName);
+
+    if (!ok) {
+        free(oldTrans);
+
+        return FALSE;
+    }
+
+    ok = next_MoveFileW(
+        oldTrans ? oldTrans : lpExistingFileName,
+        newTrans ? newTrans : lpNewFileName);
+    
+    free(oldTrans);
+    free(newTrans);
+
+    return ok;
+}
+
+static BOOL WINAPI hook_MoveFileExA(
+        const char *lpExistingFileName,
+        const char *lpNewFileName,
+        uint32_t dwFlags)
+{
+    char *oldTrans;
+    char *newTrans;
+    BOOL ok;
+
+    ok = path_transform_a(&oldTrans, lpExistingFileName);
+
+    if (!ok) {
+        return FALSE;
+    }
+
+    ok = path_transform_a(&newTrans, lpNewFileName);
+
+    if (!ok) {
+        free(oldTrans);
+
+        return FALSE;
+    }
+
+    ok = next_MoveFileExA(
+        oldTrans ? oldTrans : lpExistingFileName,
+        newTrans ? newTrans : lpNewFileName,
+        dwFlags);
+    
+    free(oldTrans);
+    free(newTrans);
+
+    return ok;
+}
+
+static BOOL WINAPI hook_ReplaceFileA(
+        const char *lpReplacedFileName,
+        const char *lpReplacementFileName,
+        const char *lpBackupFileName,
+        uint32_t dwReplaceFlags,
+        void *lpExclude,
+        void *lpReserved)
+{
+    char *oldTrans;
+    char *newTrans;
+    BOOL ok;
+
+    ok = path_transform_a(&oldTrans, lpReplacedFileName);
+
+    if (!ok) {
+        return FALSE;
+    }
+
+    ok = path_transform_a(&newTrans, lpReplacementFileName);
+
+    if (!ok) {
+        free(oldTrans);
+
+        return FALSE;
+    }
+
+    ok = next_ReplaceFileA(
+        oldTrans ? oldTrans : lpReplacedFileName,
+        newTrans ? newTrans : lpReplacementFileName,
+        lpBackupFileName,
+        dwReplaceFlags,
+        lpExclude,
+        lpReserved);
+
+    free(oldTrans);
+    free(newTrans);
+
+    return ok;
+}
+
+static BOOL WINAPI hook_ReplaceFileW(
+        const wchar_t *lpReplacedFileName,
+        const wchar_t *lpReplacementFileName,
+        const wchar_t *lpBackupFileName,
+        uint32_t dwReplaceFlags,
+        void *lpExclude,
+        void *lpReserved)
+{
+    wchar_t *oldTrans;
+    wchar_t *newTrans;
+    BOOL ok;
+
+    ok = path_transform_w(&oldTrans, lpReplacedFileName);
+
+    if (!ok) {
+        return FALSE;
+    }
+
+    ok = path_transform_w(&newTrans, lpReplacementFileName);
+
+    if (!ok) {
+        free(oldTrans);
+
+        return FALSE;
+    }
+
+    ok = next_ReplaceFileW(
+        oldTrans ? oldTrans : lpReplacedFileName,
+        newTrans ? newTrans : lpReplacementFileName,
+        lpBackupFileName,
+        dwReplaceFlags,
+        lpExclude,
+        lpReserved);
+
+    free(oldTrans);
+    free(newTrans);
+
+    return ok;
+}
+
+static BOOL WINAPI hook_DeleteFileA(const char *lpFileName) 
+{
+    char *trans;
+    BOOL ok;
+
+    ok = path_transform_a(&trans, lpFileName);
+
+    if (!ok) {
+        return FALSE;
+    }
+
+    ok = next_DeleteFileA(trans ? trans: lpFileName);
+
+    return ok;
+}
+
+static BOOL WINAPI hook_DeleteFileW(const wchar_t *lpFileName)
+{
+    wchar_t *trans;
+    BOOL ok;
+
+    ok = path_transform_w(&trans, lpFileName);
+
+    if (!ok) {
+        return FALSE;
+    }
+
+    ok = next_DeleteFileW(trans ? trans: lpFileName);
+
+    return ok;
+}

idachook/idac-dll.c

@@ -12,9 +12,6 @@ const struct dll_bind_sym idac_dll_syms[] = {
     {
         .sym = "idac_io_init",
         .off = offsetof(struct idac_dll, init),
-    }, {
-        .sym = "idac_io_poll",
-        .off = offsetof(struct idac_dll, poll),
     }, {
         .sym = "idac_io_get_opbtns",
         .off = offsetof(struct idac_dll, get_opbtns),

idachook/idac-dll.h

@@ -7,7 +7,6 @@
 struct idac_dll {
     uint16_t api_version;
     HRESULT (*init)(void);
-    HRESULT (*poll)(void);
     void (*get_opbtns)(uint8_t *opbtn);
     void (*get_gamebtns)(uint8_t *gamebtn);
     void (*get_shifter)(uint8_t *gear);

idachook/idachook.def

@@ -13,7 +13,6 @@ EXPORTS
     amDllVideoSetResolution @3
     idac_io_get_api_version
     idac_io_init
-    idac_io_poll
     idac_io_get_opbtns
     idac_io_get_gamebtns
     idac_io_get_shifter

idachook/io4.c

@@ -57,7 +57,6 @@ static HRESULT idac_io4_poll(void *ctx, struct io4_state *state)
     struct idac_io_analog_state analog_state;
     HRESULT hr;
 
-    assert(idac_dll.poll != NULL);
     assert(idac_dll.get_opbtns != NULL);
     assert(idac_dll.get_gamebtns != NULL);
     assert(idac_dll.get_analogs != NULL);
@@ -65,13 +64,6 @@ static HRESULT idac_io4_poll(void *ctx, struct io4_state *state)
 
     memset(state, 0, sizeof(*state));
     memset(&analog_state, 0, sizeof(analog_state));
-
-    hr = idac_dll.poll();
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
     opbtn = 0;
     gamebtn = 0;
     gear = 0;

idacio/config.c

@@ -79,6 +79,14 @@ void idac_di_config_load(struct idac_di_config *cfg, const wchar_t *filename)
         cfg->gear[i] = GetPrivateProfileIntW(L"dinput", key, i + 1, filename);
     }
 
+    // FFB configuration
+
+    cfg->center_spring_strength = GetPrivateProfileIntW(
+                            L"dinput",
+                            L"centerSpringStrength",
+                            30,
+                            filename);
+
 }
 
 void idac_xi_config_load(struct idac_xi_config *cfg, const wchar_t *filename)
@@ -116,9 +124,9 @@ void idac_io_config_load(struct idac_io_config *cfg, const wchar_t *filename)
     assert(cfg != NULL);
     assert(filename != NULL);
 
-    cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename);
-    cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename);
-    cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename);
+    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);
     cfg->restrict_ = GetPrivateProfileIntW(L"io4", L"restrict", 128, filename);
 
     GetPrivateProfileStringW(

idacio/config.h

@@ -23,6 +23,9 @@ struct idac_di_config {
     uint8_t gear[6];
     bool reverse_brake_axis;
     bool reverse_accel_axis;
+
+    // FFB configuration
+    uint16_t center_spring_strength;
 };
 
 struct idac_xi_config {

idacio/di-dev.c

@@ -44,7 +44,8 @@ HRESULT idac_di_dev_start(IDirectInputDevice8W *dev, HWND wnd)
     return hr;
 }
 
-void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
+void idac_di_dev_start_fx(
+    IDirectInputDevice8W *dev, IDirectInputEffect **out, uint16_t strength)
 {
     /* Set up force-feedback on devices that support it. This is just a stub
        for the time being, since we don't yet know how the serial port force
@@ -67,7 +68,7 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
     DWORD axis;
     LONG direction;
     DIEFFECT fx;
-    DICONSTANTFORCE cf;
+    DICONDITION cond;
     HRESULT hr;
 
     assert(dev != NULL);
@@ -77,11 +78,17 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
 
     dprintf("DirectInput: Starting force feedback (may take a sec)\n");
 
+    // Auto-centering effect
     axis = DIJOFS_X;
     direction = 0;
 
-    memset(&cf, 0, sizeof(cf));
-    cf.lMagnitude = 0;
+    memset(&cond, 0, sizeof(cond));
+    cond.lOffset = 0;
+    cond.lPositiveCoefficient = strength;
+    cond.lNegativeCoefficient = strength;
+    cond.dwPositiveSaturation = strength; // For FG920?
+    cond.dwNegativeSaturation = strength; // For FG920?
+    cond.lDeadBand = 0;
 
     memset(&fx, 0, sizeof(fx));
     fx.dwSize = sizeof(fx);
@@ -93,20 +100,19 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
     fx.cAxes = 1;
     fx.rgdwAxes = &axis;
     fx.rglDirection = &direction;
-    fx.cbTypeSpecificParams = sizeof(cf);
-    fx.lpvTypeSpecificParams = &cf;
+    fx.cbTypeSpecificParams = sizeof(cond);
+    fx.lpvTypeSpecificParams = &cond;
 
     hr = IDirectInputDevice8_CreateEffect(
             dev,
-            &GUID_ConstantForce,
+            &GUID_Spring,
             &fx,
             &obj,
             NULL);
 
     if (FAILED(hr)) {
-        dprintf("DirectInput: DirectInput force feedback unavailable: %08x\n",
+        dprintf("DirectInput: Centering spring force feedback unavailable: %08x\n",
                 (int) hr);
-
         return;
     }
 
@@ -114,15 +120,15 @@ void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out)
 
     if (FAILED(hr)) {
         IDirectInputEffect_Release(obj);
-        dprintf("DirectInput: DirectInput force feedback start failed: %08x\n",
+        dprintf("DirectInput: Centering spring force feedback start failed: %08x\n",
                 (int) hr);
-
         return;
     }
 
     *out = obj;
 
-    dprintf("DirectInput: Force feedback initialized and set to zero\n");
+    dprintf("DirectInput: Centering spring effects initialized with strength %d%%\n", 
+            strength / 100);
 }
 
 HRESULT idac_di_dev_poll(

idacio/di-dev.h

@@ -11,7 +11,7 @@ union idac_di_state {
 };
 
 HRESULT idac_di_dev_start(IDirectInputDevice8W *dev, HWND wnd);
-void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out);
+void idac_di_dev_start_fx(IDirectInputDevice8W *dev, IDirectInputEffect **out, uint16_t strength);
 HRESULT idac_di_dev_poll(
         IDirectInputDevice8W *dev,
         HWND wnd,

idacio/di.c

@@ -75,6 +75,7 @@ static uint8_t idac_di_gear[6];
 static bool idac_di_use_pedals;
 static bool idac_di_reverse_brake_axis;
 static bool idac_di_reverse_accel_axis;
+static uint16_t idac_di_center_spring_strength;
 
 HRESULT idac_di_init(
         const struct idac_di_config *cfg,
@@ -173,7 +174,9 @@ HRESULT idac_di_init(
         return hr;
     }
 
-    idac_di_dev_start_fx(idac_di_dev, &idac_di_fx);
+    // Convert the strength from 0-100 to 0-10000 for DirectInput
+    idac_di_dev_start_fx(idac_di_dev, &idac_di_fx, 
+                         idac_di_center_spring_strength * 100);
 
     if (cfg->pedals_name[0] != L'\0') {
         hr = IDirectInput8_EnumDevices(
@@ -364,6 +367,16 @@ static HRESULT idac_di_config_apply(const struct idac_di_config *cfg)
         idac_di_gear[i] = cfg->gear[i];
     }
 
+    // FFB configuration
+
+    if (cfg->center_spring_strength < 0 || cfg->center_spring_strength > 100) {
+        dprintf("Wheel: Invalid center spring strength: %i\n", cfg->center_spring_strength);
+
+        return E_INVALIDARG;
+    }
+
+    idac_di_center_spring_strength = cfg->center_spring_strength;
+
     return S_OK;
 }
 

idacio/idacio.def

@@ -2,7 +2,6 @@ LIBRARY idacio
 
 EXPORTS
     idac_io_init
-    idac_io_poll
     idac_io_get_opbtns
     idac_io_get_gamebtns
     idac_io_get_shifter