idzio: Break out Initial D Zero IO DLL

idzhook/jvs.c

@@ -1,11 +1,7 @@
 #include <windows.h>
-#include <xinput.h>
 
-#include <math.h>
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 
 #include "amex/jvs.h"
 
@@ -13,6 +9,8 @@
 
 #include "idzhook/jvs.h"
 
+#include "idzio/idzio.h"
+
 #include "jvs/jvs-bus.h"
 
 #include "util/dprintf.h"
@@ -30,12 +28,6 @@ static const struct io3_ops idz_jvs_io3_ops = {
     .read_coin_counter  = idz_jvs_read_coin_counter,
 };
 
-static struct io3 idz_jvs_io3;
-static bool idz_jvs_coin;
-static uint16_t idz_jvs_coins;
-static bool idz_jvs_shifting;
-static uint8_t idz_jvs_gear;
-
 static const uint16_t idz_jvs_gear_signals[] = {
     /* Neutral */
     0x0000,
@@ -53,79 +45,82 @@ static const uint16_t idz_jvs_gear_signals[] = {
     0x1400,
 };
 
-void idz_jvs_init(void)
+static struct io3 idz_jvs_io3;
+
+HRESULT idz_jvs_init(void)
 {
+    HRESULT hr;
+
+    hr = idz_io_init();
+
+    if (FAILED(hr)) {
+        return hr;
+    }
+
     io3_init(&idz_jvs_io3, NULL, &idz_jvs_io3_ops, NULL);
     jvs_attach(&idz_jvs_io3.jvs);
+
+    return S_OK;
 }
 
 static void idz_jvs_read_switches(void *ctx, struct io3_switch_state *out)
 {
-    bool shift_inc;
-    bool shift_dec;
-    XINPUT_STATE xi;
-    WORD xb;
+    uint8_t opbtn;
+    uint8_t gamebtn;
+    uint8_t gear;
 
     assert(out != NULL);
 
-    memset(&xi, 0, sizeof(xi));
-    XInputGetState(0, &xi);
-    xb = xi.Gamepad.wButtons;
+    opbtn = 0;
+    gamebtn = 0;
+    gear = 0;
+
+    idz_io_jvs_read_buttons(&opbtn, &gamebtn);
+    idz_io_jvs_read_shifter(&gear);
 
     /* Update gameplay buttons */
 
-    if (xb & XINPUT_GAMEPAD_START) {
-        out->p1 |= 1 << 15;
-        idz_jvs_gear = 0; /* Reset to Neutral when start is pressed */
-    }
-
-    if (xb & XINPUT_GAMEPAD_DPAD_UP) {
+    if (gamebtn & IDZ_IO_GAMEBTN_UP) {
         out->p1 |= 1 << 13;
     }
 
-    if (xb & XINPUT_GAMEPAD_DPAD_DOWN) {
+    if (gamebtn & IDZ_IO_GAMEBTN_DOWN) {
         out->p1 |= 1 << 12;
     }
 
-    if (xb & XINPUT_GAMEPAD_DPAD_LEFT) {
+    if (gamebtn & IDZ_IO_GAMEBTN_LEFT) {
         out->p1 |= 1 << 11;
     }
 
-    if (xb & XINPUT_GAMEPAD_DPAD_RIGHT) {
+    if (gamebtn & IDZ_IO_GAMEBTN_RIGHT) {
         out->p1 |= 1 << 10;
     }
 
-    if (xb & XINPUT_GAMEPAD_BACK) {
+    if (gamebtn & IDZ_IO_GAMEBTN_START) {
+        out->p1 |= 1 << 15;
+    }
+
+    if (gamebtn & IDZ_IO_GAMEBTN_VIEW_CHANGE) {
         out->p1 |= 1 << 9;
     }
 
     /* Update simulated six-speed shifter */
 
-    shift_inc = xb & (XINPUT_GAMEPAD_X | XINPUT_GAMEPAD_RIGHT_SHOULDER);
-    shift_dec = xb & (XINPUT_GAMEPAD_Y | XINPUT_GAMEPAD_LEFT_SHOULDER);
-
-    if (!idz_jvs_shifting) {
-        if (shift_inc && idz_jvs_gear < 6) {
-            idz_jvs_gear++;
-        }
-
-        if (shift_dec && idz_jvs_gear > 0) {
-            idz_jvs_gear--;
-        }
+    if (gear > 6) {
+        gear = 6;
     }
 
-    idz_jvs_shifting = shift_inc || shift_dec;
-    out->p2 = idz_jvs_gear_signals[idz_jvs_gear];
+    out->p2 = idz_jvs_gear_signals[gear];
 
     /* Update test/service buttons */
 
-    if (GetAsyncKeyState('1')) {
+    if (opbtn & IDZ_IO_OPBTN_TEST) {
         out->system = 0x80;
     } else {
         out->system = 0;
     }
 
-    if (GetAsyncKeyState('2')) {
+    if (opbtn & IDZ_IO_OPBTN_SERVICE) {
         out->p1 |= 1 << 14;
     }
 }
@@ -135,51 +130,23 @@ static void idz_jvs_read_analogs(
         uint16_t *analogs,
         uint8_t nanalogs)
 {
-    XINPUT_STATE xi;
-    int left;
-    int right;
+    struct idz_io_analog_state state;
 
     assert(analogs != NULL);
 
-    memset(&xi, 0, sizeof(xi));
-    XInputGetState(0, &xi);
-
-    /* Wheel */
+    memset(&state, 0, sizeof(state));
+    idz_io_jvs_read_analogs(&state);
 
     if (nanalogs > 0) {
-        left = xi.Gamepad.sThumbLX;
-
-        if (left < -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE) {
-            left += XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE;
-        } else if (left > XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE) {
-            left -= XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE;
-        } else {
-            left = 0;
-        }
-
-        right = xi.Gamepad.sThumbRX;
-
-        if (right < -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE) {
-            right += XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE;
-        } else if (right > XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE) {
-            right -= XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE;
-        } else {
-            right = 0;
-        }
-
-        analogs[0] = 0x8000 + (left + right) / 2;
+        analogs[0] = 0x8000 + state.wheel;
     }
 
-    /* Accel */
-
     if (nanalogs > 1) {
-        analogs[1] = xi.Gamepad.bRightTrigger << 8;
+        analogs[1] = state.accel;
     }
 
-    /* Brake */
-
     if (nanalogs > 2) {
-        analogs[2] = xi.Gamepad.bLeftTrigger << 8;
+        analogs[2] = state.brake;
     }
 }
 
@@ -189,15 +156,5 @@ static uint16_t idz_jvs_read_coin_counter(void *ctx, uint8_t slot_no)
         return 0;
     }
 
-    if (GetAsyncKeyState('3')) {
-        if (!idz_jvs_coin) {
-            dprintf("IDZero JVS: Coin drop\n");
-            idz_jvs_coin = true;
-            idz_jvs_coins++;
-        }
-    } else {
-        idz_jvs_coin = false;
-    }
-
-    return idz_jvs_coins;
+    return idz_io_jvs_read_coin_counter();
 }

idzhook/jvs.h

@@ -1,3 +1,5 @@
 #pragma once
 
-void idz_jvs_init(void);
+#include <windows.h>
+
+HRESULT idz_jvs_init(void);

idzhook/meson.build

@@ -14,6 +14,7 @@ shared_library(
         aimeio_dll,
         amex_lib,
         board_lib,
+        idzio_dll,
         jvs_lib,
         platform_lib,
         util_lib,