From 1613de62c460d9866529da331b8fea54f66fa076 Mon Sep 17 00:00:00 2001
From: Robert Quattlebaum <darco@deepdarc.com>
Date: Thu, 4 Aug 2016 13:40:59 -0700
Subject: [PATCH] spi-hdlc-adapter: Fix for HDLC parser state machine. (#335)

We were forgetting to turn off the `unescape_next_byte` flag.

Also changes the default log level from `LOG_WARNING` to
`LOG_NOTICE`.
---
 tools/spi-hdlc-adapter/spi-hdlc-adapter.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/spi-hdlc-adapter/spi-hdlc-adapter.c b/tools/spi-hdlc-adapter/spi-hdlc-adapter.c
index 6559906df..08d0e88f2 100644
--- a/tools/spi-hdlc-adapter/spi-hdlc-adapter.c
+++ b/tools/spi-hdlc-adapter/spi-hdlc-adapter.c
@@ -112,7 +112,7 @@ static const char* sSpiDevPath     = NULL;
 static const char* sIntGpioDevPath = NULL;
 static const char* sResGpioDevPath = NULL;
 
-static int sVerbose             = LOG_WARNING;
+static int sVerbose             = LOG_NOTICE;
 
 static int sSpiDevFd            = -1;
 static int sResGpioValueFd      = -1;
@@ -759,7 +759,7 @@ static int pull_hdlc(void)
                 }
                 else if (fcs != kHdlcCrcCheckValue)
                 {
-                    syslog(LOG_WARNING, "HDLC frame with bad CRC");
+                    syslog(LOG_WARNING, "HDLC frame with bad CRC (LEN:%d, FCS:0x%04X)", sSpiTxPayloadSize, fcs);
                     unescape_next_byte = false;
                     sSpiTxPayloadSize = 0;
                     fcs = kHdlcCrcResetValue;
@@ -793,6 +793,7 @@ static int pull_hdlc(void)
             else if (unescape_next_byte)
             {
                 byte = byte ^ HDLC_ESCAPE_XFORM;
+                unescape_next_byte = false;
             }
 
             fcs = hdlc_crc16(fcs, byte);