Proposal to improve WVariant part number define logic (#326)

* add ethernet interupt dummy handler * fix timer definitions for -N and -P SAMx5x parts
adafruit · Aug 1, 2022 · c2d4153 · c2d4153
1 parent bd2a9cd
commit c2d4153
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
@@ -136,7 +136,7 @@ typedef enum _ETCChannel
   TC7_CH1 =  (12<<8)|(1),
 } ETCChannel ;
 
-#elif defined(__SAMD51P19A__) || defined(__SAMD51P20A__)
+#elif defined(__SAME53N20A__) || defined(__SAME53N19A__) || defined(__SAME54P20A__) || defined(__SAME54P19A__) || defined(__SAME54N20A__) || defined(__SAME54N19A__) || defined(__SAMD51P20A__) || defined(__SAMD51P19A__) || defined(__SAMD51N20A__) || defined(__SAMD51N19A__) || defined(__SAME51N20A__) || defined(__SAME51N19A__)
 
 typedef enum _ETCChannel
 {

diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
@@ -133,6 +133,7 @@ void USB_0_Handler               ( void ) __attribute__ ((weak));
 void USB_1_Handler               ( void ) __attribute__ ((weak));
 void USB_2_Handler               ( void ) __attribute__ ((weak));
 void USB_3_Handler               ( void ) __attribute__ ((weak));
+void GMAC_Handler                ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC0_0_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC0_1_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC0_2_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
@@ -302,7 +303,7 @@ __attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
 	  (void*) USB_1_Handler,                 /* 81 Universal Serial Bus IRQ 1 */
 	  (void*) USB_2_Handler,                 /* 82 Universal Serial Bus IRQ 2 */
 	  (void*) USB_3_Handler,                 /* 83 Universal Serial Bus IRQ 3 */
-	  (void*) (0UL),
+	  (void*) GMAC_Handler,					 /* 84 Ethernet MAC */
 	  (void*) TCC0_0_Handler,                /* 85 Timer Counter Control 0 IRQ 0 */
 	  (void*) TCC0_1_Handler,                /* 86 Timer Counter Control 0 IRQ 1 */
 	  (void*) TCC0_2_Handler,                /* 87 Timer Counter Control 0 IRQ 2 */