From 1ca2aabf2f5f7e2d4c6e1a466e84b3b959585775 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 10 Mar 2025 00:37:20 +0600 Subject: [PATCH] Remove some things that shouldn't be there --- src/device/kbc_at_dev.c | 3 --- src/include/86box/keyboard.h | 11 ++--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/device/kbc_at_dev.c b/src/device/kbc_at_dev.c index 82ce31bfd8..c1041e6e14 100644 --- a/src/device/kbc_at_dev.c +++ b/src/device/kbc_at_dev.c @@ -88,9 +88,6 @@ kbc_at_dev_queue_add(atkbc_dev_t *dev, uint8_t val, uint8_t main) { if (main) { kbc_at_dev_log("%s: dev->queue[%02X] = %02X;\n", dev->name, dev->queue_end, val); - if (!is_cpu_thread && kbc_at_dev_queue_pos(dev, 1) == dev->fifo_mask) { - while (kbc_at_dev_queue_pos(dev, 1) == dev->fifo_mask) {} - } dev->queue[dev->queue_end] = val; dev->queue_end = (dev->queue_end + 1) & dev->fifo_mask; } else { diff --git a/src/include/86box/keyboard.h b/src/include/86box/keyboard.h index b7f301a586..3a7260c72b 100644 --- a/src/include/86box/keyboard.h +++ b/src/include/86box/keyboard.h @@ -22,13 +22,6 @@ #ifndef EMU_KEYBOARD_H #define EMU_KEYBOARD_H -#ifdef __cplusplus -# include -using atomic_uint = std::atomic_uint; -#else -# include -#endif - enum { DEV_KBD = 0, DEV_AUX = 1 @@ -69,8 +62,8 @@ typedef struct atkbc_dev_t { uint8_t rate; uint8_t cmd_queue_start; uint8_t cmd_queue_end; - atomic_uint queue_start; - atomic_uint queue_end; + uint8_t queue_start; + uint8_t queue_end; uint16_t flags;