From 181e4b3ed78bda9a55173b9349561a69aa5c6911 Mon Sep 17 00:00:00 2001
From: stdvar <stdvar@xyz.com>
Date: Sat, 11 Sep 2021 01:56:48 -0400
Subject: [PATCH] [240] Clear USB interrupt status after it is fully handled

---
 .../ports/SN32/LLD/SN32F24x/USB/hal_usb_lld.c | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/os/hal/ports/SN32/LLD/SN32F24x/USB/hal_usb_lld.c b/os/hal/ports/SN32/LLD/SN32F24x/USB/hal_usb_lld.c
index 8c0f150b..45871911 100644
--- a/os/hal/ports/SN32/LLD/SN32F24x/USB/hal_usb_lld.c
+++ b/os/hal/ports/SN32/LLD/SN32F24x/USB/hal_usb_lld.c
@@ -141,6 +141,8 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
 
 	//** Get Interrupt Status and clear immediately.
 	iwIntFlag = SN_USB->INSTS;
+    //Clear flags right away for interrupts that we dont handle, keep other untill fully handled
+    SN_USB->INSTSC = 0x0007C0C0;
 
 	if(iwIntFlag == 0)
 	{
@@ -189,7 +191,6 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
 		if (iwIntFlag & mskEP0_SETUP)
 		{
 			/* SETUP */
-            __USB_CLRINSTS((mskEP0_SETUP|mskEP0_PRESETUP|mskEP0_OUT_STALL|mskEP0_IN_STALL));
             //** keep EP0 NAK
             //USB_EPnNak(USB_EP0); //useless
 
@@ -203,13 +204,13 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
             epcp->out_state->rxpkts = 0;
 
             _usb_isr_invoke_setup_cb(usbp, 0);
+            __USB_CLRINSTS((mskEP0_SETUP|mskEP0_PRESETUP|mskEP0_OUT_STALL|mskEP0_IN_STALL));
 		}
 		else if (iwIntFlag & mskEP0_IN)
 		{
             USBInEndpointState *isp = epcp->in_state;
 
 			/* IN */
-            __USB_CLRINSTS(mskEP0_IN);
 
             // The address
             if (address) {
@@ -241,14 +242,14 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
 
                 _usb_isr_invoke_in_cb(usbp, 0);
             }
+            __USB_CLRINSTS(mskEP0_IN);
 
         }
         else if (iwIntFlag & mskEP0_OUT)
         {
             USBOutEndpointState *osp = epcp->out_state;
             /* OUT */
-            __USB_CLRINSTS(mskEP0_OUT);
-            
+
 			n = SN_USB->EP0CTL & mskEPn_CNT;
             if (n > epcp->out_maxsize)
                 n = epcp->out_maxsize;
@@ -288,6 +289,7 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
                 //more to receive
                 USB_EPnAck(USB_EP0, 0);
             }
+            __USB_CLRINSTS(mskEP0_OUT);
 
         }
         else if (iwIntFlag & (mskEP0_IN_STALL|mskEP0_OUT_STALL))
@@ -305,33 +307,33 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
         // Determine the interrupting endpoint, direction, and clear the interrupt flag
         if(iwIntFlag & mskEP1_ACK)
         {
-            __USB_CLRINSTS(mskEP1_ACK);
             handleACK(usbp, USB_EP1);
+            __USB_CLRINSTS(mskEP1_ACK);
         }
         if(iwIntFlag & mskEP2_ACK)
         {
-            __USB_CLRINSTS(mskEP2_ACK);
             handleACK(usbp, USB_EP2);
+            __USB_CLRINSTS(mskEP2_ACK);
         }
         if(iwIntFlag & mskEP3_ACK)
         {
-            __USB_CLRINSTS(mskEP3_ACK);
             handleACK(usbp, USB_EP3);
+            __USB_CLRINSTS(mskEP3_ACK);
         }
         if(iwIntFlag & mskEP4_ACK)
         {
-            __USB_CLRINSTS(mskEP4_ACK);
             handleACK(usbp, USB_EP4);
+            __USB_CLRINSTS(mskEP4_ACK);
         }
         if(iwIntFlag & mskEP5_ACK)
         {
-            __USB_CLRINSTS(mskEP5_ACK);
             handleACK(usbp, USB_EP5);
+            __USB_CLRINSTS(mskEP5_ACK);
         }
         if(iwIntFlag & mskEP6_ACK)
         {
-            __USB_CLRINSTS(mskEP6_ACK);
             handleACK(usbp, USB_EP6);
+            __USB_CLRINSTS(mskEP6_ACK);
         }
     }
 	else if (iwIntFlag & (mskEP6_NAK|mskEP5_NAK|mskEP4_NAK|mskEP3_NAK|mskEP2_NAK|mskEP1_NAK))
@@ -339,33 +341,33 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
         // Determine the interrupting endpoint, direction, and clear the interrupt flag
 		if (iwIntFlag & mskEP1_NAK)
 		{
-            __USB_CLRINSTS(mskEP1_NAK);
             handleNAK(usbp, USB_EP1);
+            __USB_CLRINSTS(mskEP1_NAK);
 		}
 		if (iwIntFlag & mskEP2_NAK)
 		{
-            __USB_CLRINSTS(mskEP2_NAK);
             handleNAK(usbp, USB_EP2);
+            __USB_CLRINSTS(mskEP2_NAK);
 		}
 		if (iwIntFlag & mskEP3_NAK)
 		{
-            __USB_CLRINSTS(mskEP3_NAK);
             handleNAK(usbp, USB_EP3);
+            __USB_CLRINSTS(mskEP3_NAK);
 		}
 		if (iwIntFlag & mskEP4_NAK)
 		{
-            __USB_CLRINSTS(mskEP4_NAK);
             handleNAK(usbp, USB_EP4);
+            __USB_CLRINSTS(mskEP4_NAK);
 		}
 		if (iwIntFlag & mskEP5_NAK)
 		{
-            __USB_CLRINSTS(mskEP5_NAK);
             handleNAK(usbp, USB_EP5);
+            __USB_CLRINSTS(mskEP5_NAK);
 		}
 		if (iwIntFlag & mskEP6_NAK)
 		{
-            __USB_CLRINSTS(mskEP6_NAK);
             handleNAK(usbp, USB_EP6);
+            __USB_CLRINSTS(mskEP6_NAK);
 		}
     }
 
@@ -375,8 +377,8 @@ static void usb_lld_serve_interrupt(USBDriver *usbp)
     if ((iwIntFlag & mskUSB_SOF) && (SN_USB->INTEN & mskUSB_SOF_IE))
     {
         /* SOF */
-        __USB_CLRINSTS(mskUSB_SOF);
         _usb_isr_invoke_sof_cb(usbp);
+        __USB_CLRINSTS(mskUSB_SOF);
     }
 }