Disable uart interrupt in uart_debug_write

benwaffle · fpistm · commit 5e1c51dca61c · 2019-04-18T14:26:00.000+02:00
diff --git a/cores/arduino/stm32/uart.c b/cores/arduino/stm32/uart.c
@@ -607,15 +607,25 @@ size_t uart_debug_write(uint8_t *data, uint32_t size)
       if (serial_debug.index >= UART_NUM) {
         return 0;
       }
+    } else {
+      serial_t *obj = rx_callback_obj[serial_debug.index];
+      if (obj) {
+        serial_debug.irq = obj->irq;
+      }
     }
   }
 
+  HAL_NVIC_DisableIRQ(serial_debug.irq);
+
   while (HAL_UART_Transmit(uart_handlers[serial_debug.index], data, size, TX_TIMEOUT) != HAL_OK) {
     if ((HAL_GetTick() - tickstart) >=  TX_TIMEOUT) {
-      return 0;
+      size = 0;
+      break;
     }
   }
 
+  HAL_NVIC_EnableIRQ(serial_debug.irq);
+
   return size;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -607,15 +607,25 @@ size_t uart_debug_write(uint8_t *data, uint32_t size)`
`607`	`607`	`if (serial_debug.index >= UART_NUM) {`
`608`	`608`	`return 0;`
`609`	`609`	`}`
	`610`	`+ } else {`
	`611`	`+ serial_t *obj = rx_callback_obj[serial_debug.index];`
	`612`	`+ if (obj) {`
	`613`	`+ serial_debug.irq = obj->irq;`
	`614`	`+ }`
`610`	`615`	`}`
`611`	`616`	`}`
`612`	`617`
	`618`	`+ HAL_NVIC_DisableIRQ(serial_debug.irq);`
	`619`	`+`
`613`	`620`	`while (HAL_UART_Transmit(uart_handlers[serial_debug.index], data, size, TX_TIMEOUT) != HAL_OK) {`
`614`	`621`	`if ((HAL_GetTick() - tickstart) >= TX_TIMEOUT) {`
`615`		`- return 0;`
	`622`	`+ size = 0;`
	`623`	`+ break;`
`616`	`624`	`}`
`617`	`625`	`}`
`618`	`626`
	`627`	`+ HAL_NVIC_EnableIRQ(serial_debug.irq);`
	`628`	`+`
`619`	`629`	`return size;`
`620`	`630`	`}`
`621`	`631`