From bf454d85fc4e84ab1cabcfe949e772d3f2eb2480 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Thu, 21 Jan 2016 14:25:56 -0500
Subject: [PATCH] Clean up port, pin, and pin mask duplication in digitalWrite
---
cores/arduino/wiring_digital.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
index 769bcaf7..16d79e55 100644
--- a/cores/arduino/wiring_digital.c
+++ b/cores/arduino/wiring_digital.c
@@ -82,19 +82,23 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
return ;
}
- if ( (PORT->Group[g_APinDescription[ulPin].ulPort].DIRSET.reg & (1ul << g_APinDescription[ulPin].ulPin)) == 0 ) {
+ EPortType port = g_APinDescription[ulPin].ulPort;
+ uint32_t pin = g_APinDescription[ulPin].ulPin;
+ uint32_t pinMask = (1ul << pin);
+
+ if ( (PORT->Group[port].DIRSET.reg & pinMask) == 0 ) {
// the pin is not an output, disable pull-up if val is LOW, otherwise enable pull-up
- PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].bit.PULLEN = (ulVal != LOW) ;
+ PORT->Group[port].PINCFG[pin].bit.PULLEN = (ulVal != LOW) ;
}
switch ( ulVal )
{
case LOW:
- PORT->Group[g_APinDescription[ulPin].ulPort].OUTCLR.reg = (1ul << g_APinDescription[ulPin].ulPin) ;
+ PORT->Group[port].OUTCLR.reg = pinMask;
break ;
default:
- PORT->Group[g_APinDescription[ulPin].ulPort].OUTSET.reg = (1ul << g_APinDescription[ulPin].ulPin) ;
+ PORT->Group[port].OUTSET.reg = pinMask;
break ;
}
--
GitLab