Merge branch 'develop'

xmos · Sep 15, 2020 · 0c6071c · 0c6071c
2 parents e143724 + d892af8
commit 0c6071c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,9 +1,14 @@
 lib_xud Change Log
 ==================
 
+1.1.1
+-----
+
+  * RESOLVED:   Cases where disabling RxError caused firmware to crash
+
 1.1.0
 -----
-  
+
   * RESOLVED:   Disabled erroneous handling of Rx Error line
 
 1.0.0

diff --git a/lib_xud/module_build_info b/lib_xud/module_build_info
@@ -1,4 +1,4 @@
-VERSION = 1.1.0
+VERSION = 1.1.1
 
 DEPENDENT_MODULES =
 

diff --git a/lib_xud/src/core/XUD_IoLoop.S b/lib_xud/src/core/XUD_IoLoop.S
@@ -157,8 +157,10 @@ ResetIntHandler:
     ldw     r10, dp[SavedSp]                    // Restore stack pointer
     set     sp, r10
 
+#if 0 // RxError Interrupts Disabled
     ldw     r11, sp[15]                         // Put RxE back to events..
     setc    res[r11], XS1_SETC_IE_MODE_EVENT    // Set IE mode back to events
+#endif
 
 
 ResetDetect:
@@ -311,15 +313,15 @@ ConfigSofJump:
 #endif
 ConfigSofJump_Done:
 
-#if 0
 ConfigRxErrEventVector:
+    stw        r3, sp[15]                   // Store flag port to stack
+#if 0 // RxError Interrupts Disabled
     setc       res[r3], XS1_SETC_COND_EQ
     setc       res[r3], XS1_SETC_IE_MODE_INTERRUPT
     ldap       r11, Err_RxErr
     setv       res[r3], r11
     ldc        r11, 1
     setd       res[r3], r11                 // Set event cond data to 1
-    stw        r3, sp[15]                   // Store flag port to stack
     eeu        res[r3]
 #endif