Merge branch 'fixdetachinterrupt' of https://github.com/vicatcu/Arduino

Lauszus · May 25, 2015 · f495be4 · f495be4
2 parents 777e726 + e9045d8
commit f495be4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
@@ -19,7 +19,8 @@ ARDUINO 1.6.5
 [core]
 * AVR: delayMicroseconds(..) doesn't hang if called with 0. Thanks @cano64
 * AVR: delayMicroseconds(..), added support for 1Mhz, 12Mhz and 24Mhz. Thanks @cano64
-* SAM: added watchdog routing for Due. Thanks @bobc
+* AVR: added missing case in detachInterrupt(). Thanks @vicatcu
+* SAM: added watchdog routine for Due. Thanks @bobc
 
 ARDUINO 1.6.4 - 2015.05.06
 

diff --git a/hardware/arduino/avr/cores/arduino/WInterrupts.c b/hardware/arduino/avr/cores/arduino/WInterrupts.c
@@ -223,6 +223,18 @@ void detachInterrupt(uint8_t interruptNum) {
       #warning detachInterrupt may need some more work for this cpu (case 1)
     #endif
       break;
+
+    case 2:
+    #if defined(EIMSK) && defined(INT2)
+      EIMSK &= ~(1 << INT2);
+    #elif defined(GICR) && defined(INT2)
+      GICR &= ~(1 << INT2); // atmega32
+    #elif defined(GIMSK) && defined(INT2)
+      GIMSK &= ~(1 << INT2);
+    #else
+      #warning detachInterrupt may need some more work for this cpu (case 2)
+    #endif
+      break;       
 #endif
     }