From 0af9d0c9723b53027d431e676f58269f3f76f7c4 Mon Sep 17 00:00:00 2001
From: joevt <joevt@shaw.ca>
Date: Thu, 7 Mar 2024 21:44:44 -0800
Subject: [PATCH] chario: Cleanup.

---
 devices/serial/chario.cpp | 20 +++++++++++++++-----
 devices/serial/chario.h   |  6 ++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/devices/serial/chario.cpp b/devices/serial/chario.cpp
index 3622e43..e6e23fb 100644
--- a/devices/serial/chario.cpp
+++ b/devices/serial/chario.cpp
@@ -1,6 +1,6 @@
 /*
 DingusPPC - The Experimental PowerPC Macintosh emulator
-Copyright (C) 2018-22 divingkatae and maximum
+Copyright (C) 2018-24 divingkatae and maximum
                       (theweirdo)     spatium
 
 (Contact divingkatae#1017 or powermax#2286 on Discord for more info)
@@ -33,6 +33,11 @@ bool CharIoNull::rcv_char_available()
     return false;
 }
 
+bool CharIoNull::rcv_char_available_now()
+{
+    return false;
+}
+
 int CharIoNull::xmit_char(uint8_t c)
 {
     return 0;
@@ -108,7 +113,12 @@ void CharIoStdin::rcv_disable() {
     LOG_F(INFO, "Winterm: receiver disabled");
 }
 
-bool CharIoStdin::rcv_char_available() {
+bool CharIoStdin::rcv_char_available()
+{
+    return this->rcv_char_available_now();
+}
+
+bool CharIoStdin::rcv_char_available_now() {
     DWORD events;
     INPUT_RECORD buffer;
 
@@ -344,7 +354,7 @@ bool CharIoSocket::rcv_char_available()
             consecutivechars = 0;
         return 0;
     }
-    return rcv_char_available_now();
+    return this->rcv_char_available_now();
 }
 
 bool CharIoSocket::rcv_char_available_now()
@@ -444,7 +454,7 @@ bool CharIoSocket::rcv_char_available_now()
 int CharIoSocket::xmit_char(uint8_t c)
 {
     if (acceptfd == -1)
-        CharIoSocket::rcv_char_available_now();
+        this->rcv_char_available_now();
 
     if (acceptfd != -1) {
         int sent = (int)send(acceptfd, &c, 1, 0);
@@ -470,7 +480,7 @@ int CharIoSocket::xmit_char(uint8_t c)
 int CharIoSocket::rcv_char(uint8_t *c)
 {
     if (acceptfd == -1)
-        CharIoSocket::rcv_char_available_now();
+        this->rcv_char_available_now();
 
     if (acceptfd != -1) {
         int received = (int)recv(acceptfd, c, 1, 0);
diff --git a/devices/serial/chario.h b/devices/serial/chario.h
index af2a63d..ad2debb 100644
--- a/devices/serial/chario.h
+++ b/devices/serial/chario.h
@@ -47,10 +47,7 @@ public:
     virtual int rcv_enable() { return 0; };
     virtual void rcv_disable() {};
     virtual bool rcv_char_available() = 0;
-    //virtual bool rcv_char_available_now ()
-    bool rcv_char_available_now() {
-        return rcv_char_available();
-    }
+    virtual bool rcv_char_available_now() = 0;
     virtual int xmit_char(uint8_t c) = 0;
     virtual int rcv_char(uint8_t *c) = 0;
 };
@@ -62,6 +59,7 @@ public:
     ~CharIoNull() = default;
 
     bool rcv_char_available();
+    bool rcv_char_available_now();
     int xmit_char(uint8_t c);
     int rcv_char(uint8_t *c);
 };