Merge pull request #46 from oscarbailey-xmos/fix_rx_error_disabled

Fix cases where disabled RxError caused the firmware to crash
xmos · Sep 15, 2020 · d892af8 · d892af8
2 parents dbdf9ad + ce2c3f7
commit d892af8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,16 @@
 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/README.rst b/README.rst
@@ -4,8 +4,6 @@ XMOS USB Device (XUD) Library
 Overview
 --------
 
-This library is currently in a pre-release state.
-
 lib_xud merges the existing sc_xud and lib_usb (a fork of sc_xud) and replaces them both. It includes an API that supports both previous libraries providing a unified and maintained library going forward.
 
 The XMOS USB Device (XUD) library provides a low-level interface to USB.  lib_xud is a software defined, industry-standard, USB library

diff --git a/lib_xud/module_build_info b/lib_xud/module_build_info
@@ -1,4 +1,4 @@
-VERSION = 1.0.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
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018, XMOS Ltd, All rights reserved
+// Copyright (c) 2011-2020, XMOS Ltd, All rights reserved
 
 // XUD_LLD_IoLoop.S
 // Main USB interfacing loop
@@ -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,17 +313,17 @@ ConfigSofJump:
 #endif
 ConfigSofJump_Done:
 
-
 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
 
 
 SetupSuspendResetTimer: