summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/ChangeLog.txt6
-rwxr-xr-xnuttx/ChangeLog3
2 files changed, 9 insertions, 0 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 53be3923a..147369e02 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -1118,3 +1118,9 @@
* apps/nshlib/, apps/netutils, and apps/include/netutils: Misc
changes to support multiple networks with different link layers. For
example, ETHERNET + SLIP (2014-11-15).
+ * apps/nshlib/nsh_usbconsole.c: Add logic to restart the console wait
+ if an error occurs while reading from the console.In USB console
+ startup, the logic must be able to open the USB serial and receive 3
+ newlines. However, it the USB driver is disconnected or otherwise
+ fails before the 3 newlines are received, the receive loop becomes a
+ killer, infinite loop, CPU hog. Noted by spasbyspas (2014-11-16).
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index ce187881e..b627f8f15 100755
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -8989,3 +8989,6 @@
variable length link layer protocol headers within incoming packets.
This permits use of multiple network interfaces with differing data
links. For example, ETHERNET + SLIP (2014-11-15).
+ * arch/arm/src/sam34/sam4s_periphclks.h: Add missing SPI0 clock
+ configuration macro for the SAM4S" sam4s_periphclks.h. From
+ spasbyspas (2014-11-16).