Update to spice2x-25-04-25 (pre-apply)

> broken commit

acioemu/acioemu.cpp

@@ -108,6 +108,10 @@ std::optional<uint8_t> ACIOEmu::read() {
     return this->response_buffer->get();
 }
 
+size_t ACIOEmu::bytes_available() {
+    return this->response_buffer->size();
+}
+
 void ACIOEmu::msg_parse() {
 
 #ifdef ACIOEMU_LOG

acioemu/acioemu.h

@@ -28,5 +28,6 @@ namespace acioemu {
 
         void write(uint8_t byte);
         std::optional<uint8_t> read();
+        size_t bytes_available();
     };
 }

acioemu/handle.cpp

@@ -4,8 +4,9 @@
 #include "rawinput/rawinput.h"
 #include "util/utils.h"
 
-acioemu::ACIOHandle::ACIOHandle(LPCWSTR lpCOMPort) {
+acioemu::ACIOHandle::ACIOHandle(LPCWSTR lpCOMPort, uint8_t iccaNodeCount) {
     this->com_port = lpCOMPort;
+    this->icca_node_count = iccaNodeCount;
 }
 
 bool acioemu::ACIOHandle::open(LPCWSTR lpFileName) {
@@ -16,7 +17,7 @@ bool acioemu::ACIOHandle::open(LPCWSTR lpFileName) {
     log_info("acioemu", "Opened {} (ACIO)", ws2s(com_port));
 
     // ACIO device
-    acio_emu.add_device(new acioemu::ICCADevice(false, true, 2));
+    acio_emu.add_device(new acioemu::ICCADevice(false, true, icca_node_count));
 
     return true;
 }
@@ -62,6 +63,10 @@ int acioemu::ACIOHandle::device_io(
     return -1;
 }
 
+size_t acioemu::ACIOHandle::bytes_available() {
+    return acio_emu.bytes_available();
+}
+
 bool acioemu::ACIOHandle::close() {
     log_info("acioemu", "Closed {} (ACIO)", ws2s(com_port));
 

acioemu/handle.h

@@ -9,10 +9,12 @@ namespace acioemu {
     private:
         LPCWSTR com_port;
 
+        uint8_t icca_node_count;
+
         acioemu::ACIOEmu acio_emu;
 
     public:
-        ACIOHandle(LPCWSTR lpCOMPort);
+        ACIOHandle(LPCWSTR lpCOMPort, uint8_t iccaNodeCount = 2);
 
         bool open(LPCWSTR lpFileName) override;
 
@@ -23,6 +25,8 @@ namespace acioemu {
         int device_io(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer,
                       DWORD nOutBufferSize) override;
 
+        size_t bytes_available() override;
+
         bool close() override;
     };
 }

acioemu/icca.cpp

@@ -8,6 +8,10 @@
 
 using namespace acioemu;
 
+namespace acioemu {
+    bool ICCA_DEVICE_HACK = false;
+}
+
 ICCADevice::ICCADevice(bool flip_order, bool keypad_thread, uint8_t node_count) {
 
     // init defaults
@@ -98,11 +102,13 @@ bool ICCADevice::parse_msg(MessageData *msg_in,
             // send version data
             auto msg = this->create_msg(msg_in, MSG_VERSION_SIZE);
             if (
-                avs::game::is_model({"LDJ", "TBS"}) ||
+                avs::game::is_model({"LDJ", "TBS", "UJK"}) ||
                 // SDVX Valkyrie cabinet mode
                 (avs::game::is_model("KFC") && (avs::game::SPEC[0] == 'G' || avs::game::SPEC[0] == 'H'))
             ) {
                 this->set_version(msg, 0x3, 0, 1, 7, 0, "ICCA");
+            } else if (avs::game::is_model({"VFG"})) {
+                this->set_version(msg, 0x3, 0, 1, 7, 0, "ICCB");
             } else {
                 this->set_version(msg, 0x3, 0, 1, 6, 0, "ICCA");
             }
@@ -327,6 +333,9 @@ bool ICCADevice::parse_msg(MessageData *msg_in,
         }
         case ACIO_CMD_STARTUP:
         case ACIO_CMD_CLEAR:
+        case 0x30: // GetBoardProductNumber
+        case 0x31: // GetMicomInfo
+        case 0x3A: // ???
         case 0x0116: // ???
         case 0x0120: // ???
         case 0xFF: // BROADCAST
@@ -385,19 +394,48 @@ void ICCADevice::update_card(int unit) {
 static int KEYPAD_EAMUSE_MAPPING[] = {
         0, 1, 5, 9, 2, 6, 10, 3, 7, 11, 8, 4
 };
+
+// map for KEYPAD_KEY_CODES:
+//  7 8 9  | 800 8000 8
+//  4 5 6  | 400 4000 4
+//  1 2 3  | 200 2000 2
+//  0 00 . | 100 1000 1
 static int KEYPAD_KEY_CODES[]{
-        0x100,
-        0x200,
-        0x2000,
-        2,
-        0x400,
-        0x4000,
-        4,
-        0x800,
-        0x8000,
-        8,
-        1,
-        0x1000
+        0x100,  // 0
+        0x200,  // 1
+        0x2000, // 2
+        2,      // 3
+        0x400,  // 4
+        0x4000, // 5
+        4,      // 6
+        0x800,  // 7
+        0x8000, // 8
+        8,      // 9
+        1,      // .
+        0x1000  // 00
+};
+
+// map for KEYPAD_KEY_CODES_ALT:
+//  7 8 9  | 8 80 800
+//  4 5 6  | 4 40 400
+//  1 2 3  | 2 20 200
+//  0 00 . | 1 10 100
+//
+// note that the only game that needs this (SDVX VM) does not accept decimal,
+// so that key is untested
+static int KEYPAD_KEY_CODES_ALT[]{
+        1,      // 0
+        2,      // 1
+        0x20,   // 2
+        0x200,  // 3
+        4,      // 4
+        0x40,   // 5
+        0x400,  // 6
+        8,      // 7
+        0x80,   // 8
+        0x800,  // 9
+        0x100,  // .
+        0x10    // 00
 };
 static uint8_t KEYPAD_KEY_CODE_NUMS[]{
         0, 1, 5, 9, 2, 6, 10, 3, 7, 11, 8, 4
@@ -421,7 +459,13 @@ void ICCADevice::update_keypad(int unit, bool update_edge) {
 
         // check if pressed
         if (eamu_state & (1 << KEYPAD_EAMUSE_MAPPING[i])) {
-            this->keypad[unit] |= KEYPAD_KEY_CODES[i];
+
+            if (ICCA_DEVICE_HACK) {
+                this->keypad[unit] |= KEYPAD_KEY_CODES_ALT[i];
+            } else {
+                this->keypad[unit] |= KEYPAD_KEY_CODES[i];
+            }
+
             if (!this->keypad_last[unit][i] && update_edge) {
                 this->keydown[unit] = (this->keypad_capture[unit] << 4) | KEYPAD_KEY_CODE_NUMS[n];
                 this->keypad_last[unit][i] = true;

acioemu/icca.h

@@ -11,6 +11,8 @@
 #include "reader/crypt.h"
 
 namespace acioemu {
+    extern bool ICCA_DEVICE_HACK;
+
     class ICCADevice : public ACIODeviceEmu {
     private:
         bool type_new;