diff --git a/os/hal/dox/uart.dox b/os/hal/dox/uart.dox
index a96199077..771112e3d 100644
--- a/os/hal/dox/uart.dox
+++ b/os/hal/dox/uart.dox
@@ -77,13 +77,11 @@
     tx_idle [label="TX_IDLE", style="bold"];
     tx_active [label="TX_ACTIVE"];
     tx_complete [label="TX_COMPLETE"];
-    tx_fatal [label="Fatal Error", style="bold"];
 
     tx_idle -> tx_active [label="\nuartStartSend()"];
-    tx_idle -> tx_idle [label="\nuartStopSend()\n>uc_txend2<"];
-    tx_active -> tx_complete [label="\nbuffer transmitted\n>uc_txend1<"];
+    tx_idle -> tx_idle [label="\nuartStopSend()\n>txend2_cb<"];
+    tx_active -> tx_complete [label="\nbuffer transmitted\n>txend1_cb<"];
     tx_active -> tx_idle [label="\nuartStopSend()"];
-    tx_active -> tx_fatal [label="\nuartStartSend()"];
     tx_complete -> tx_active [label="\nuartStartSendI()\nthen\ncallback return"];
     tx_complete -> tx_idle [label="\ncallback return"];
   }
@@ -103,16 +101,22 @@
     rx_idle [label="RX_IDLE", style="bold"];
     rx_active [label="RX_ACTIVE"];
     rx_complete [label="RX_COMPLETE"];
-    rx_fatal [label="Fatal Error", style="bold"];
+    rx_error [label="RX_ERROR"];
+    rx_timeout [label="RX_TIMEOUT"];
 
-    rx_idle -> rx_idle [label="\nuartStopReceive()\n>uc_rxchar<\n>uc_rxerr<"];
     rx_idle -> rx_active [label="\nuartStartReceive()"];
 
-    rx_active -> rx_complete [label="\nbuffer filled\n>uc_rxend<"];
+    rx_active -> rx_error [label="\nreceive error\n>rxerr_cb<"];
+    rx_error -> rx_idle [label="\ncallback return"];
+    rx_error -> rx_active [label="\nuartStartReceiveI()"];
+
+    rx_active -> rx_timeout [label="\ntimeout\n>timeout_cb<"];
+    rx_timeout -> rx_idle [label="\ncallback return"];
+    rx_timeout -> rx_active [label="\nuartStartReceiveI()"];
+
+    rx_active -> rx_complete [label="\nbuffer filled\n>rxend_cb<"];
     rx_active -> rx_idle [label="\nuartStopReceive()"];
-    rx_active -> rx_active [label="\nreceive error\n>uc_rxerr<"];
-    rx_active -> rx_fatal [label="\nuartStartReceive()"];
-    rx_complete -> rx_active [label="\nuartStartReceiveI()\nthen\ncallback return"];
+    rx_complete -> rx_active [label="\nuartStartReceiveI()"];
     rx_complete -> rx_idle [label="\ncallback return"];
   }
  * @enddot