Fix compile errors

Author: leg0

cores/arduino/UART.h

@@ -113,7 +113,7 @@ typedef uint8_t rx_buffer_index_t;
 #define SERIAL_7O2 0x3C
 #define SERIAL_8O2 0x3E
 
-class UartClass : public HardwareSerial
+class UartClass : public arduino::HardwareSerial
 {
   protected:
     volatile uint8_t * const _ubrrh;

cores/arduino/main.cpp

@@ -44,7 +44,7 @@ int main(void)
 
 	for (;;) {
 		loop();
-		if (serialEventRun) serialEventRun();
+		if (arduino::serialEventRun) arduino::serialEventRun();
 	}
 
 	return 0;

libraries/Wire/src/Wire.cpp

@@ -119,25 +119,15 @@ uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddres
   return read;
 }
 
-uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool sendStop) {
+size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool sendStop) {
 	return requestFrom((uint8_t)address, (uint8_t)quantity, (uint32_t)0, (uint8_t)0, (uint8_t)sendStop);
 }
 
-uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity)
+size_t TwoWire::requestFrom(uint8_t address, size_t quantity)
 {
   return requestFrom(address, quantity, true);
 }
 
-uint8_t TwoWire::requestFrom(int address, int quantity)
-{
-  return requestFrom((uint8_t)address, (size_t)quantity, true);
-}
-
-uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop)
-{
-  return requestFrom((uint8_t)address, (size_t)quantity, (bool)sendStop);
-}
-
 void TwoWire::beginTransmission(uint8_t address)
 {
   // indicate that we are transmitting

libraries/Wire/src/Wire.h

@@ -23,13 +23,14 @@
 #define TwoWire_h
 
 #include <Arduino.h>
+#include <api/HardwareI2C.h>
 
 #define BUFFER_LENGTH 32
 
 // WIRE_HAS_END means Wire has end()
 #define WIRE_HAS_END 1
 
-class TwoWire : public HardwareI2C
+class TwoWire : public arduino::HardwareI2C
 {
   private:
     static uint8_t rxBuffer[];
@@ -57,11 +58,9 @@ class TwoWire : public HardwareI2C
     void beginTransmission(int);
     uint8_t endTransmission(void);
     uint8_t endTransmission(bool);
-    uint8_t requestFrom(uint8_t, size_t);
-    uint8_t requestFrom(uint8_t, size_t, bool);
+    size_t requestFrom(uint8_t, size_t);
+    size_t requestFrom(uint8_t, size_t, bool);
     uint8_t requestFrom(uint8_t, uint8_t, uint32_t, uint8_t, uint8_t);
-    uint8_t requestFrom(int, int);
-    uint8_t requestFrom(int, int, int);
     virtual size_t write(uint8_t);
     virtual size_t write(const uint8_t *, size_t);
     virtual int available(void);
@@ -75,7 +74,7 @@ class TwoWire : public HardwareI2C
     inline size_t write(long n) { return write((uint8_t)n); }
     inline size_t write(unsigned int n) { return write((uint8_t)n); }
     inline size_t write(int n) { return write((uint8_t)n); }
-    using Print::write;
+    using arduino::Print::write;
 };
 
 extern TwoWire Wire;