From f87d9897c4a32d1ee2a03fb84830d79987d8cbe4 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Thu, 16 Aug 2018 18:00:58 -0700
Subject: [PATCH] Sync changes from the -Hardware-Virtual build

---
 x86/cores/virtual/HardwareSerial.cpp | 25 +++++++++++++++++++++----
 x86/cores/virtual/virtual_io.h       |  4 ++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/x86/cores/virtual/HardwareSerial.cpp b/x86/cores/virtual/HardwareSerial.cpp
index 049c9b6..3a55e7a 100644
--- a/x86/cores/virtual/HardwareSerial.cpp
+++ b/x86/cores/virtual/HardwareSerial.cpp
@@ -11,11 +11,28 @@ bool Serial1_available() __attribute__((weak));
 bool Serial2_available() __attribute__((weak));
 bool Serial3_available() __attribute__((weak));
 
+void serialEvent() {}
+void serialEvent1() {}
+void serialEvent2() {}
+void serialEvent3() {}
+bool Serial0_available() {
+  return true;
+}
+bool Serial1_available() {
+  return true;
+}
+bool Serial2_available() {
+  return true;
+}
+bool Serial3_available() {
+  return true;
+}
+
 void serialEventRun(void) {
-  if (Serial0_available && serialEvent && Serial0_available()) serialEvent();
-  if (Serial1_available && serialEvent && Serial1_available()) serialEvent1();
-  if (Serial2_available && serialEvent && Serial2_available()) serialEvent2();
-  if (Serial3_available && serialEvent && Serial3_available()) serialEvent3();
+  if (Serial0_available()) serialEvent();
+  if (Serial1_available()) serialEvent1();
+  if (Serial2_available()) serialEvent2();
+  if (Serial3_available()) serialEvent3();
 }
 
 unsigned HardwareSerial::serialNumber = 0;
diff --git a/x86/cores/virtual/virtual_io.h b/x86/cores/virtual/virtual_io.h
index c7b1c77..848cbb1 100644
--- a/x86/cores/virtual/virtual_io.h
+++ b/x86/cores/virtual/virtual_io.h
@@ -1,4 +1,8 @@
 #include <stdbool.h>
+
+#undef min
+#undef max
+
 #include <string>
 
 // Returns TRUE if successful, FALSE if not