From 183430593f085c643f0b168609914c74e45b8a68 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 4 Jul 2020 14:21:11 +0200 Subject: [PATCH] Revert "Fix buffer underrun in FM" This reverts commit 192e8e24356cdd247ca4ca11416a9df37a62603f. --- SerialModem.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SerialModem.cpp b/SerialModem.cpp index 25a4ed5..95f5765 100644 --- a/SerialModem.cpp +++ b/SerialModem.cpp @@ -248,7 +248,7 @@ void CSerialModem::setSerialParams(const std::string& protocol, unsigned int add m_serial = new CI2CController(m_port, address); else #endif - m_serial = new CSerialController(m_port, speed, false); + m_serial = new CSerialController(m_port, speed, true); } void CSerialModem::setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency) @@ -640,7 +640,7 @@ void CSerialModem::clock(unsigned int ms) if (m_trace) CUtils::dump(1U, "RX FM Data", m_buffer, m_length); - unsigned int data1 = m_length - m_offset; + unsigned int data1 = m_length - m_offset + 1U; m_rxFMData.addData((unsigned char*)&data1, sizeof(unsigned int)); unsigned char data2 = TAG_DATA; @@ -654,11 +654,11 @@ void CSerialModem::clock(unsigned int ms) if (m_trace) CUtils::dump(1U, "RX FM Control", m_buffer, m_length); - unsigned int data1 = m_length - m_offset; - m_rxFMData.addData((unsigned char*)&data1, sizeof(unsigned int)); + unsigned char data = m_length - m_offset + 1U; + m_rxFMData.addData(&data, 1U); - unsigned char data2 = TAG_DATA; - m_rxFMData.addData(&data2, 1U); + data = TAG_HEADER; + m_rxFMData.addData(&data, 1U); m_rxFMData.addData(m_buffer + m_offset, m_length - m_offset); } @@ -668,7 +668,7 @@ void CSerialModem::clock(unsigned int ms) if(m_trace) CUtils::dump(1U, "RX FM End of transmission", m_buffer, m_length); - unsigned char data = m_length - m_offset; + unsigned char data = m_length - m_offset + 1U; m_rxFMData.addData(&data, 1U); data = TAG_EOT;