armv7m_timer fixes

Author: GrumpyOldPizza

system/STM32L4xx/Lib/libstm32l432.a

@@ -63,25 +63,17 @@ static void armv7m_timer_insert(void *context, uint32_t data)
     {
 	if (remaining < element->remaining)
 	{
+	    element->remaining -= remaining;
 	    break;
 	}
 
 	remaining -= element->remaining;
 	element = element->next;
     }
 
-    if (element != (armv7m_timer_t*)&armv7m_timer_control)
-    {
-	timer->previous = element->previous;
-	timer->next = element;
-	
-    }
-    else
-    {
-	timer->previous = element;
-	timer->next = element->next;
-    }
-    
+    timer->previous = element->previous;
+    timer->next = element;
+
     timer->previous->next = timer;
     timer->next->previous = timer;
 
@@ -177,25 +169,28 @@ static void armv7m_timer_callback(void *context, uint32_t data)
     {
 	timer = armv7m_timer_control.next;
 
-	while (timer != (armv7m_timer_t*)&armv7m_timer_control)
+	if (timer != (armv7m_timer_t*)&armv7m_timer_control)
 	{
 	    timer->remaining--;
 
-	    if (timer->remaining != 0)
-	    {
-		break;
-	    }
-
-	    callback = timer->callback;
-
-	    armv7m_timer_remove(timer, 0);
-
-	    if ((uint32_t)callback & 1)
+	    while (timer != (armv7m_timer_t*)&armv7m_timer_control)
 	    {
-		(*callback)(timer);
+		if (timer->remaining)
+		{
+		    break;
+		}
+		
+		callback = timer->callback;
+		
+		armv7m_timer_remove(timer, 0);
+		
+		if ((uint32_t)callback & 1)
+		{
+		    (*callback)(timer);
+		}
+		
+		timer = armv7m_timer_control.next;
 	    }
-	    
-	    timer = armv7m_timer_control.next;
 	}
 
 	armv7m_timer_control.millis++;