fix compilation

Author: facchinm

cores/arduino/Arduino.h

@@ -90,9 +90,9 @@ extern const uint8_t PROGMEM digital_pin_to_interrupt[];
 #define analogPinToBitMask(pin) ( (pin < NUM_ANALOG_INPUTS) ? (1 << analogPinToBitPosition(pin)) : NOT_A_PIN )
 #define digitalPinToTimer(pin) ( (pin < NUM_TOTAL_PINS) ? pgm_read_byte(digital_pin_to_timer + pin) : NOT_ON_TIMER )
 
-#define portToPortStruct(port) ( (port > NOT_A_PORT) ? ((PORT_t *)&PORTA + port) : NULL)
+#define portToPortStruct(port) ((PORT_t *)&PORTA + port)
 #define digitalPinToPortStruct(pin) ( (pin < NUM_TOTAL_PINS) ? ((PORT_t *)&PORTA + digitalPinToPort(pin)) : NULL)
-#define getPINnCTRLregister(port, bit_pos) ( ((port != NULL) && (bit_pos > NOT_A_PIN)) ? ((uint8_t *)&(port->PIN0CTRL) + bit_pos) : NULL )
+#define getPINnCTRLregister(port, bit_pos) ( (port != NULL) ? ((uint8_t *)&(port->PIN0CTRL) + bit_pos) : NULL )
 #define digitalPinToInterrupt(p) ( pgm_read_byte(digital_pin_to_interrupt + p) )
 #define portPinToInterrupt(port, bit_pos) ( pgm_read_byte(port_interrupt_offset + port) + bit_pos )
 

cores/arduino/UART_private.h

@@ -33,7 +33,7 @@ UartClass::UartClass(
   volatile USART_t *hwserial_module,
   volatile uint8_t hwserial_rx_pin,
   volatile uint8_t hwserial_tx_pin) :
-    hwserial_module(hwserial_module),
+    _hwserial_module(hwserial_module),
     _hwserial_rx_pin(hwserial_rx_pin),
     _hwserial_tx_pin(hwserial_tx_pin),
     _rx_buffer_head(0), _rx_buffer_tail(0),

cores/arduino/WInterrupts.c

@@ -34,14 +34,7 @@
 
 static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
 
-//#define DISABLE   PORT_ISC_INTDISABLE_gc
-//#define CHANGE    PORT_ISC_BOTHEDGES_gc
-//#define RISING    PORT_ISC_RISING_gc
-//#define FALLING   PORT_ISC_FALLING_gc
-//#define LOW_LEVEL PORT_ISC_LEVEL_gc
-
-
-void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), PinStatus mode) {
+void attachInterrupt(uint8_t pin, void (*userFunc)(void), PinStatus mode) {
 
   /* Get bit position and check pin validity */
   uint8_t bit_pos = digitalPinToBitPosition(pin);
@@ -51,7 +44,7 @@ void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), PinStatus mod
   uint8_t interruptNum = digitalPinToInterrupt(pin);
 
   /* Check interrupt number and apply function pointer to correct array index */
-  if((interruptNum < EXTERNAL_NUM_INTERRUPTS) && (interruptNum > NOT_AN_INTERRUPT)) {
+  if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
     intFunc[interruptNum] = userFunc;
 
     // Configure the interrupt mode (trigger on low input, any change, rising
@@ -91,7 +84,7 @@ void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), PinStatus mod
   }
 }
 
-void detachInterrupt(uint8_t interruptNum) {
+void detachInterrupt(uint8_t pin) {
   /* Get bit position and check pin validity */
   uint8_t bit_pos = digitalPinToBitPosition(pin);
   if(bit_pos == NOT_A_PIN) return;

cores/arduino/wiring_analog.c

@@ -137,12 +137,15 @@ void analogWrite(uint8_t pin, int val)
 		/* Get timer */
 		uint8_t digital_pin_timer =  digitalPinToTimer(pin);
 
+		uint16_t* timer_cmp_out;
+		TCB_t *timer_B;
+
 		/* Find out Port and Pin to correctly handle port mux, and timer. */
-		switch (digital_pin_timer)
-		{
+		switch (digital_pin_timer) {
+
 			case TIMERA0:
 				/* Calculate correct compare buffer register */
-				uint16_t* timer_cmp_out = ((uint16_t*) (&TCA0.SINGLE.CMP0BUF)) + bit_pos;
+				timer_cmp_out = ((uint16_t*) (&TCA0.SINGLE.CMP0BUF)) + bit_pos;
 
 				/* Configure duty cycle for correct compare channel */
 				(*timer_cmp_out) = (val);
@@ -151,14 +154,15 @@ void analogWrite(uint8_t pin, int val)
 				TCA0.SINGLE.CTRLB |= (1 << (TCA_SINGLE_CMP0EN_bp + bit_pos));
 
 				break;
+
 			case TIMERB0:
 			case TIMERB1:
 			case TIMERB2:
 			case TIMERB3:
 
 				/* Get pointer to timer, TIMERB0 order definition in Arduino.h*/
 				//assert (((TIMERB0 - TIMERB3) == 2));
-				TCB_t *timer_B = ((TCB_t *)&TCB0 + (digital_pin_timer - TIMERB0));
+				timer_B = ((TCB_t *)&TCB0 + (digital_pin_timer - TIMERB0));
 
 				/* set duty cycle */
 				timer_B->CCMPH = val;

cores/arduino/wiring_digital.c

@@ -90,38 +90,43 @@ void pinMode(uint8_t pin, PinMode mode)
 //
 //static inline void turnOffPWM(uint8_t timer) __attribute__ ((always_inline));
 //static inline void turnOffPWM(uint8_t timer)
-static void turnOffPWM(uint8_t timer)
+static void turnOffPWM(uint8_t pin)
 {
 	/* Actually turn off compare channel, not the timer */
 
 	/* Get pin's timer */
 	uint8_t timer = digitalPinToTimer(pin);
 	if(timer == NOT_ON_TIMER) return;
 
+	uint8_t bit_pos;
+	TCB_t *timerB;
+
 	switch (timer) {
 
 	/* TCA0 */
 	case TIMERA0:
 		/* Bit position will give output channel */
-		uint8_t bit_pos = digitalPinToBitPosition(pin);
+		bit_pos = digitalPinToBitPosition(pin);
 
 		/* Disable corresponding channel */
 		TCA0.SINGLE.CTRLB &= ~(1 << (TCA_SINGLE_CMP0EN_bp + bit_pos));
 
 		break;
+
 	/* TCB - only one output */
 	case TIMERB0:
 	case TIMERB1:
 	case TIMERB2:
 	case TIMERB3:
 
-		TCB_t *timerB = (TCB_t *)&TCB0 + (timer - TIMERB0);
+		timerB = (TCB_t *)&TCB0 + (timer - TIMERB0);
 
 		/* Disable TCB compare channel */
 		timerB->CTRLB &= ~(TCB_CCMPEN_bm);
 
 		break;
 	default:
+		break;
 	}
 }