Move DoubleBonded handling into variant

If the board does not use double bonding the weak (empty) function is called (no need to redeclare it in the variant)

Author: facchinm

cores/arduino/Arduino.h

@@ -117,7 +117,8 @@ extern const uint8_t PROGMEM digital_pin_to_interrupt[];
 #define TIMERB2 4
 #define TIMERB3 5
 
-void setup_timers() __attribute__((weak));
+void setup_timers();
+bool isDoubleBondedActive(uint8_t pin);
 
 #define digitalPinToPort(pin) ( (pin < NUM_TOTAL_PINS) ? pgm_read_byte(digital_pin_to_port + pin) : NOT_A_PIN )
 #define digitalPinToBitPosition(pin) ( (pin < NUM_TOTAL_PINS) ? pgm_read_byte(digital_pin_to_bit_position + pin) : NOT_A_PIN )

cores/arduino/wiring.c

@@ -378,4 +378,6 @@ void init()
 /*************************** ENABLE GLOBAL INTERRUPTS *************************/
 
 	sei();
-}
+}
+
+void setup_timers(void)  __attribute__((weak));

cores/arduino/wiring_analog.c

@@ -70,10 +70,10 @@ int analogRead(uint8_t pin)
 {
 	if(pin > NUM_ANALOG_INPUTS) return NOT_A_PIN;
 
-	/* Check if TWI is operating on double bonded pin (Master Enable is high 
-		in both Master and Slave mode for bus error detection, so this can 
-		indicate an active state for Wire) */
-	if(((pin == PIN_A4) || (pin == PIN_A5)) && (TWI0.MCTRLA & TWI_ENABLE_bm)) return 0;
+	/* Check if TWI is operating on double bonded pin (Master Enable is high 
+		in both Master and Slave mode for bus error detection, so this can 
+		indicate an active state for Wire) */
+	if(isDoubleBondedActive(pin)) return 0;
 
 	uint8_t low, high;
 
@@ -120,16 +120,7 @@ void analogWrite(uint8_t pin, int val)
 {
 
 	uint8_t bit_pos  = digitalPinToBitPosition(pin);
-	if(bit_pos == NOT_A_PIN) return;
-
-	/* Special check for SPI_SS double bonded pin -- no action if SPI is active 
-		(Using SPI Enable bit as indicator of SPI activity) */
-	if((pin == 10) && (SPI0.CTRLA & SPI_ENABLE_bm)) return;
-	
-	/* Check if TWI is operating on double bonded pin (Master Enable is high 
-	in both Master and Slave mode for bus error detection, so this can 
-	indicate an active state for Wire) */
-	if(((pin == PIN_A4) || (pin == PIN_A5)) && (TWI0.MCTRLA & TWI_ENABLE_bm)) return;
+	if(bit_pos == NOT_A_PIN || isDoubleBondedActive(pin)) return;
 
 	// We need to make sure the PWM output is enabled for those pins
 	// that support it, as we turn it off when digitally reading or

cores/arduino/wiring_digital.c

@@ -26,20 +26,13 @@
 #include "wiring_private.h"
 #include "pins_arduino.h"
 
+bool isDoubleBondedActive(uint8_t pin)  __attribute__((weak));
+
 void pinMode(uint8_t pin, PinMode mode)
 {
 	uint8_t bit_pos = digitalPinToBitPosition(pin);
 
-	if ((bit_pos == NOT_A_PIN)||(mode > INPUT_PULLUP)) return;
-	
-	/* Check if TWI is operating on double bonded pin (Master Enable is high 
-	in both Master and Slave mode for bus error detection, so this can 
-	indicate an active state for Wire) */
-	if(((pin == PIN_A4) || (pin == PIN_A5)) && (TWI0.MCTRLA & TWI_ENABLE_bm)) return;
-	
-	/* Special check for SPI_SS double bonded pin -- no action if SPI is active 
-		(Using SPI Enable bit as indicator of SPI activity) */
-	if((pin == 10) && (SPI0.CTRLA & SPI_ENABLE_bm)) return;
+	if ((bit_pos == NOT_A_PIN) || (mode > INPUT_PULLUP) || isDoubleBondedActive(pin)) return;
 
 	PORT_t* port = digitalPinToPortStruct(pin);
 	if(port == NULL) return;
@@ -145,16 +138,7 @@ void digitalWrite(uint8_t pin, PinStatus val)
 {
 	/* Get bit mask for pin */
 	uint8_t bit_mask = digitalPinToBitMask(pin);
-	if(bit_mask == NOT_A_PIN) return;
-	
-	/* Check if TWI is operating on double bonded pin (Master Enable is high 
-	in both Master and Slave mode for bus error detection, so this can 
-	indicate an active state for Wire) */
-	if(((pin == PIN_A4) || (pin == PIN_A5)) && (TWI0.MCTRLA & TWI_ENABLE_bm)) return;
-	
-	/* Special check for SPI_SS double bonded pin -- no action if SPI is active 
-		(Using SPI Enable bit as indicator of SPI activity) */
-	if((pin == 10) && (SPI0.CTRLA & SPI_ENABLE_bm)) return;
+	if(bit_mask == NOT_A_PIN || isDoubleBondedActive(pin)) return;
 
 	/* Turn off PWM if applicable */
 
@@ -189,7 +173,6 @@ void digitalWrite(uint8_t pin, PinStatus val)
 		/* Restore system status */
 		SREG = status;
 
-
 	/* Input direction */
 	} else {
 		/* Old implementation has side effect when pin set as input -
@@ -218,7 +201,6 @@ void digitalWrite(uint8_t pin, PinStatus val)
 
 		/* Restore system status */
 		SREG = status;
-
 	}
 
 }
@@ -227,16 +209,7 @@ PinStatus digitalRead(uint8_t pin)
 {
 	/* Get bit mask and check valid pin */
 	uint8_t bit_mask = digitalPinToBitMask(pin);
-	if(bit_mask == NOT_A_PIN) return LOW;
-	
-	/* Check if TWI is operating on double bonded pin (Master Enable is high 
-	in both Master and Slave mode for bus error detection, so this can 
-	indicate an active state for Wire) */
-	if(((pin == PIN_A4) || (pin == PIN_A5)) && (TWI0.MCTRLA & TWI_ENABLE_bm)) return LOW;
-	
-	/* Special check for SPI_SS double bonded pin -- no action if SPI is active 
-		(Using SPI Enable bit as indicator of SPI activity) */
-	if((pin == 10) && (SPI0.CTRLA & SPI_ENABLE_bm)) return;
+	if(bit_mask == NOT_A_PIN || isDoubleBondedActive(pin)) return LOW;
 
 	// If the pin that support PWM output, we need to turn it off
 	// before getting a digital reading.

variants/uno2018/variant.c

@@ -1,4 +1,7 @@
 #include "pins_arduino.h"
+#include <stdbool.h>
+
+#define FORCE_INLINE __attribute__((always_inline)) inline
 
 void setup_timers() {
 
@@ -73,4 +76,17 @@ void setup_timers() {
 // 		timer_B++;
 //
 // 	}
-}
+}
+
+FORCE_INLINE bool isDoubleBondedActive(uint8_t pin) {
+	/* Check if TWI is operating on double bonded pin (Master Enable is high 
+	in both Master and Slave mode for bus error detection, so this can 
+	indicate an active state for Wire) */
+	if(((pin == PIN_A4) || (pin == PIN_A5)) && (TWI0.MCTRLA & TWI_ENABLE_bm)) return true;
+
+	/* Special check for SPI_SS double bonded pin -- no action if SPI is active 
+		(Using SPI Enable bit as indicator of SPI activity) */
+	if((pin == 10) && (SPI0.CTRLA & SPI_ENABLE_bm)) return true;
+
+	return false;
+}