From 851f07cdf50e2044b52c2a3791e2666045c67414 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 2 May 2015 15:54:45 +0200
Subject: [PATCH] replease digitalPinToPort, digitalPinToBitMask,
 portOutputRegister, portInputRegister, portModeRegister by macros

---
 cores/esp8266/Arduino.h                     | 11 +++++------
 cores/esp8266/core_esp8266_wiring_digital.c | 20 --------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
index 408e6f0ad..dc2e95100 100644
--- a/cores/esp8266/Arduino.h
+++ b/cores/esp8266/Arduino.h
@@ -180,12 +180,11 @@ void loop(void);
 
 // Get the bit location within the hardware port of the given virtual pin.
 // This comes from the pins_*.c file for the active board configuration.
-
-uint32_t digitalPinToPort(uint32_t pin);
-uint32_t digitalPinToBitMask(uint32_t pin);
-volatile uint32_t* portOutputRegister(uint32_t port);
-volatile uint32_t* portInputRegister(uint32_t port);
-volatile uint32_t* portModeRegister(uint32_t port);
+#define digitalPinToPort(pin)       (0)
+#define digitalPinToBitMask(pin)    (1UL << (pin))
+#define portOutputRegister(port)    ((volatile uint32_t*) GPO)
+#define portInputRegister(port)     ((volatile uint32_t*) GPI)
+#define portModeRegister(port)      ((volatile uint32_t*) GPE)
 
 #define NOT_A_PIN -1
 #define NOT_A_PORT -1
diff --git a/cores/esp8266/core_esp8266_wiring_digital.c b/cores/esp8266/core_esp8266_wiring_digital.c
index e9fe9ce58..c07f1c75f 100644
--- a/cores/esp8266/core_esp8266_wiring_digital.c
+++ b/cores/esp8266/core_esp8266_wiring_digital.c
@@ -25,26 +25,6 @@
 #include "eagle_soc.h"
 #include "ets_sys.h"
 
-uint32_t digitalPinToPort(uint32_t pin) {
-    return 0;
-}
-
-uint32_t digitalPinToBitMask(uint32_t pin) {
-    return 1 << pin;
-}
-
-volatile uint32_t* portOutputRegister(uint32_t port) {
-    return (volatile uint32_t*)GPO;
-}
-
-volatile uint32_t* portInputRegister(uint32_t port) {
-    return (volatile uint32_t*)GPI;
-}
-
-volatile uint32_t* portModeRegister(uint32_t port) {
-    return (volatile uint32_t*)GPE;
-}
-
 extern void __pinMode(uint8_t pin, uint8_t mode) {
   if(pin < 16){
     if(mode == SPECIAL){