refactor: remove EmulatorEventClock - not needed

Author: maximilien-noal

src/Spice86.Core/Emulator/Devices/Input/Keyboard/Intel8042PS2KeyboardMouseController.cs

@@ -6,7 +6,6 @@
 using Spice86.Core.Emulator.Devices.ExternalInput;
 using Spice86.Core.Emulator.IOPorts;
 using Spice86.Core.Emulator.Memory;
-using Spice86.Core.Emulator.VM;
 using Spice86.Shared.Interfaces;
 
 using System;
@@ -16,7 +15,6 @@
 /// C# port of intel8042.cpp - The PS/2 keyboard and mouse controller.
 /// </summary>
 public sealed class Intel8042Controller : DefaultIOPortHandler {
-    private const uint IrqNumKbdPcjr = 6;
     private const uint IrqNumKbdIbmPc = 1;
     private const uint IrqNumMouse = 12;
 
@@ -25,7 +23,7 @@ public sealed class Intel8042Controller : DefaultIOPortHandler {
 
     private const int BufferSize = 64; // in bytes
     // delay appropriate for 20-30 kHz serial clock and 11 bits/byte
-    private const double PortDelayMs = 0.300;
+    private const long PortDelayCycles = 300; // Converted from 0.3ms to cycles
 
     // Controller internal buffer
     private struct BufferEntry {
@@ -42,10 +40,9 @@ private struct BufferEntry {
     private int _waitingBytesFromAux = 0;
     private int _waitingBytesFromKbd = 0;
 
-    // true = delay timer is in progress
-    private bool _delayRunning = false;
-    // true = delay timer expired, event can be sent immediately
-    private bool _delayExpired = true;
+    // CPU cycle-based delay tracking
+    private long _delayExpiryCycles = 0;
+    private bool _delayActive = false;
 
     // Executing command, do not notify devices about readiness for accepting frame
     private bool _shouldSkipDeviceNotify = false;
@@ -67,25 +64,25 @@ private struct BufferEntry {
 
     private readonly A20Gate _a20Gate;
     private readonly DualPic _dualPic;
-    private readonly EmulatorEventClock _eventClock;
+    private readonly State _cpuState;
 
     public PS2Keyboard KeyboardDevice { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Intel8042Controller"/> class.
     /// </summary>
     public Intel8042Controller(State state, IOPortDispatcher ioPortDispatcher, 
-        A20Gate a20Gate, DualPic dualPic, EmulatorEventClock eventClock,
+        A20Gate a20Gate, DualPic dualPic,
         ILoggerService loggerService, bool failOnUnhandledPort,
         IGuiKeyboardEvents? gui = null)
         : base(state, failOnUnhandledPort, loggerService) 
     {
         _a20Gate = a20Gate;
         _dualPic = dualPic;
-        _eventClock = eventClock;
+        _cpuState = state;
 
         // Create the keyboard implementation
-        KeyboardDevice = new PS2Keyboard(this, eventClock, loggerService, gui);
+        KeyboardDevice = new PS2Keyboard(this, state, loggerService, gui);
 
         InitPortHandlers(ioPortDispatcher);
 
@@ -103,19 +100,19 @@ private void InitPortHandlers(IOPortDispatcher ioPortDispatcher) {
     // ***************************************************************************
 
     private void WarnBufferFull() {
-        const uint thresholdMs = 15 * 1000; // 15 seconds
+        const long thresholdCycles = 15000000; // 15 seconds worth of cycles
 
         // Static-like behavior using class fields
-        if (!_bufferFullWarned || (_eventClock.EmulatorUpTimeInMs - _lastBufferFullTimestamp > thresholdMs)) {
+        if (!_bufferFullWarned || (_cpuState.Cycles - _lastBufferFullCycles > thresholdCycles)) {
             if (_loggerService.IsEnabled(LogEventLevel.Warning)) {
                 _loggerService.Warning("I8042: Internal buffer overflow");
             }
-            _lastBufferFullTimestamp = (uint)_eventClock.EmulatorUpTimeInMs;
+            _lastBufferFullCycles = _cpuState.Cycles;
             _bufferFullWarned = true;
         }
     }
     private bool _bufferFullWarned = false;
-    private uint _lastBufferFullTimestamp = 0;
+    private long _lastBufferFullCycles = 0;
 
     private void WarnControllerMode() {
         if (!_controllerModeWarned) {
@@ -238,7 +235,6 @@ private uint GetIrqMouse() {
     }
 
     private uint GetIrqKeyboard() {
-        // Note: We simplified machine detection, always use standard IRQ1
         return IrqNumKbdIbmPc;
     }
 
@@ -288,20 +284,22 @@ private void EnforceBufferSpace(int numBytes = 1) {
         }
     }
 
-    private void DelayHandler() {
-        _delayRunning = false;
-        _delayExpired = true;
-
-        MaybeTransferBuffer();
+    private void StartDelay(long delayCycles = PortDelayCycles) {
+        _delayExpiryCycles = _cpuState.Cycles + delayCycles;
+        _delayActive = true;
     }
 
-    private void RestartDelayTimer(double timeMs = PortDelayMs) {
-        if (_delayRunning) {
-            _eventClock.RemoveEvent("I8042DelayHandler");
+    private bool IsDelayExpired() {
+        if (!_delayActive) {
+            return true;
+        }
+
+        if (_cpuState.Cycles >= _delayExpiryCycles) {
+            _delayActive = false;
+            return true;
         }
-        _eventClock.AddEvent(DelayHandler, timeMs, "I8042DelayHandler");
-        _delayRunning = true;
-        _delayExpired = false;
+
+        return false;
     }
 
     private void MaybeTransferBuffer() {
@@ -313,7 +311,7 @@ private void MaybeTransferBuffer() {
 
         // If not set to skip the delay, do not send byte until timer expires
         int idx = _bufferStartIdx;
-        if (!_delayExpired && !_buffer[idx].SkipDelay) {
+        if (!IsDelayExpired() && !_buffer[idx].SkipDelay) {
             return;
         }
 
@@ -329,7 +327,7 @@ private void MaybeTransferBuffer() {
             _statusByte &= unchecked((byte)~(1 << 5)); // is_data_from_aux = false
         }
         _statusByte |= (1 << 0); // is_data_new = true
-        RestartDelayTimer();
+        StartDelay();
         ActivateIrqsIfNeeded();
     }
 
@@ -598,7 +596,7 @@ private void ExecuteCommand(KeyboardCommand command) {
                 // Read test bits:
                 // bit 0: keyboard clock in
                 // bit 1: (AT) keyboard data in, or (PS/2) mouse clock in
-                // Not fully implemented, follows DOSBox-X behaviour.
+                // Not fully implemented
                 WarnReadTestInputs();
                 FlushBuffer();
                 BufferAdd(0x00);
@@ -629,9 +627,6 @@ private void ExecuteCommand(KeyboardCommand command) {
     }
 
     private void ExecuteCommand(KeyboardCommand command, byte param) {
-        // LOG_INFO("I8042: Command 0x%02x, parameter 0x%02x",
-        //          static_cast<int>(command), param);
-
         switch (command) {
             case KeyboardCommand.WriteByteConfig: // 0x60
                 // Writes the keyboard controller configuration byte
@@ -671,7 +666,7 @@ private void ExecuteCommand(KeyboardCommand command, byte param) {
                 // To prevent excessive inter-module communication,
                 // aux (mouse) part is implemented completely within
                 // the mouse module
-                RestartDelayTimer(PortDelayMs * 2); // 'round trip' delay
+                StartDelay(PortDelayCycles * 2); // 'round trip' delay
                 _statusByte &= unchecked((byte)~(1 << 6)); // clear timeout flag
                 // TODO: Mouse support
                 // _statusByte |= (1 << 6) * (!MOUSEPS2_PortWrite(param));
@@ -775,7 +770,7 @@ public override byte ReadByte(ushort port) {
                 // Enforce the simulated data transfer delay, as some software
                 // (Tyrian 2000 setup) reads the port without waiting for the
                 // interrupt.
-                RestartDelayTimer(PortDelayMs);
+                StartDelay(PortDelayCycles);
 
                 return retVal;
 
@@ -817,7 +812,7 @@ public override void WriteByte(ushort port, byte value) {
                     _configByte &= unchecked((byte)~(1 << 4)); // auto-enable keyboard port
 
                     FlushBuffer();
-                    RestartDelayTimer(PortDelayMs * 2); // 'round trip' delay
+                    StartDelay(PortDelayCycles * 2); // 'round trip' delay
                     KeyboardDevice.PortWrite(value);
                 }
                 break;

src/Spice86.Core/Emulator/Devices/Input/Keyboard/KeyboardScancodeConverter.cs

@@ -88,15 +88,15 @@ public KbdKey ConvertToKbdKey(PhysicalKey key) {
     /// </summary>
     public List<byte> GetScancodes(KbdKey keyType, bool isPressed, byte codeSet) {
         if (keyType == KbdKey.None) {
-            return new List<byte>();
+            return [];
         }
 
-        switch(codeSet) {
-            case 1: return GetScanCode1(keyType, isPressed);
-            case 2: return GetScanCode2(keyType, isPressed);
-            case 3: return GetScanCode3(keyType, isPressed);
-            default: return GetScanCode1(keyType, isPressed); // Default to set 1
-        }
+        return codeSet switch {
+            1 => GetScanCode1(keyType, isPressed),
+            2 => GetScanCode2(keyType, isPressed),
+            3 => GetScanCode3(keyType, isPressed),
+            _ => GetScanCode1(keyType, isPressed),// Default to set 1
+        };
     }
 
     public List<byte> GetScanCode1(KbdKey keyType, bool isPressed) {
@@ -227,26 +227,26 @@ public List<byte> GetScanCode1(KbdKey keyType, bool isPressed) {
             case KbdKey.Pause:
                 if (isPressed) {
                     // Pause key gets released as soon as it is pressed
-                    return new List<byte> { 
+                    return [ 
                         0xE1, 0x1D, 0x45, 0xE1, 
                         (byte)(0x1D | 0x80), (byte)(0x45 | 0x80) 
-                    };
+                    ];
                 }
-                return new List<byte>();
+                return [];
 
             case KbdKey.PrintScreen:
-                return new List<byte> {
+                return [
                     0xE0,
                     (byte)(0x2A | (isPressed ? 0 : 0x80)),
                     0xE0,
                     (byte)(0x37 | (isPressed ? 0 : 0x80))
-                };
+                ];
 
             default:
-                return new List<byte>();
+                return [];
         }
 
-        List<byte> result = new List<byte>();
+        List<byte> result = [];
 
         if (extend) {
             result.Add(0xE0);