Merge branch 'digitalPinToPort' into ethernet

Author: James Foster

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Added
 - Add `__AVR__` to defines when compiling
+- Add support for `diditalPinToPort()`, `digitalPinToBitMask()`, and `portOutputRegister()`
 
 ### Changed
 - Move repository from https://github.com/ianfixes/arduino_ci to https://github.com/Arduino-CI/arduino_ci

SampleProjects/TestSomething/test/outputRegister.cpp

@@ -0,0 +1,23 @@
+#include <ArduinoUnitTests.h>
+#include <Arduino.h>
+
+// https://github.com/arduino-libraries/Ethernet/blob/master/src/utility/w5100.h#L337
+
+unittest(test)
+{
+  uint8_t ss_pin = 12;
+  uint8_t ss_port = digitalPinToPort(ss_pin);
+  assertEqual(12, ss_port);
+  uint8_t *ss_pin_reg = portOutputRegister(ss_port);
+  assertEqual(GODMODE()->pMmapPort(ss_port), ss_pin_reg);
+  uint8_t ss_pin_mask = digitalPinToBitMask(ss_pin);
+  assertEqual(1, ss_pin_mask);
+
+  assertEqual((int) 1, (int) *ss_pin_reg);    // verify initial value
+  *(ss_pin_reg) &= ~ss_pin_mask;              // set SS
+  assertEqual((int) 0, (int) *ss_pin_reg);    // verify value
+  *(ss_pin_reg) |= ss_pin_mask;               // clear SS
+  assertEqual((int) 1, (int) *ss_pin_reg);    // verify value
+}
+
+unittest_main()

cpp/arduino/Client.h

@@ -2,12 +2,6 @@
 
 #include <Stream.h>
 
-// https://github.com/arduino-libraries/Ethernet/blob/master/src/utility/w5100.h:341
-extern volatile uint8_t mmapPorts[MOCK_PINS_COUNT];
-#define portOutputRegister(port)  (uint8_t *) (&mmapPorts[port])
-#define digitalPinToPort(pin)     (pin)
-#define digitalPinToBitMask(pin)  (1)
-
 class Client : public Stream {
 protected:
   uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };

cpp/arduino/Godmode.cpp

@@ -113,6 +113,3 @@ SPIClass SPI = SPIClass(&GODMODE()->spi.dataIn, &GODMODE()->spi.dataOut);
 
 // defined in Wire.h
 TwoWire Wire = TwoWire();
-
-// Memory-mapped ports defined in Client.h
-uint8_t volatile mmapPorts[MOCK_PINS_COUNT];

cpp/arduino/Godmode.h

@@ -30,6 +30,14 @@ unsigned long micros();
   #define NUM_SERIAL_PORTS 0
 #endif
 
+// These definitions allow the following to compile (see issue #193):
+// https://github.com/arduino-libraries/Ethernet/blob/master/src/utility/w5100.h:341
+// add padding because some boards (__MK20DX128__) offset from the given address
+#define MMAP_PORTS_SIZE (MOCK_PINS_COUNT + 256)
+#define digitalPinToBitMask(pin)  (1)
+#define digitalPinToPort(pin)     (pin)
+#define portOutputRegister(port)  (GODMODE()->pMmapPort(port))
+
 class GodmodeState {
   private:
     struct PortDef {
@@ -43,6 +51,8 @@ class GodmodeState {
       uint8_t mode;
     };
 
+    uint8_t mmapPorts[MMAP_PORTS_SIZE];
+
     static GodmodeState* instance;
 
   public:
@@ -87,12 +97,19 @@ class GodmodeState {
       spi.readDelayMicros = 0;
     }
 
+    void resetMmapPorts() {
+      for (int i = 0; i < MMAP_PORTS_SIZE; ++i) {
+        mmapPorts[i] = 1;
+      }
+    }
+
     void reset() {
       resetClock();
       resetPins();
       resetInterrupts();
       resetPorts();
       resetSPI();
+      resetMmapPorts();
       seed = 1;
     }
 
@@ -112,6 +129,9 @@ class GodmodeState {
       return instance->micros;
     }
 
+    uint8_t* pMmapPort(uint8_t port) { return &mmapPorts[port]; }
+    uint8_t mmapPortValue(uint8_t port) { return mmapPorts[port]; }
+
     // C++ 11, declare as public for better compiler error messages
     GodmodeState(GodmodeState const&) = delete;
     void operator=(GodmodeState const&) = delete;