From 1be5756f1496dc03d9ef2a65017d6f6f014730f9 Mon Sep 17 00:00:00 2001 From: Henning Holtschneider Date: Thu, 15 May 2025 14:34:36 +0200 Subject: [PATCH 1/2] Added compatibility with OPAL 3.20 --- dle.cxx | 2 +- pmutils.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dle.cxx b/dle.cxx index dc357d6..6125ac5 100644 --- a/dle.cxx +++ b/dle.cxx @@ -177,7 +177,7 @@ int DLEData::GetDleData(void *pBuf, PINDEX count) cGet = sizeof(tmp); switch( cGet = GetData(tmp, cGet) ) { - case -1: + case 1: *p++ = DLE; *p++ = ETX; recvEtx = TRUE; diff --git a/pmutils.cxx b/pmutils.cxx index 8437612..244bb6f 100644 --- a/pmutils.cxx +++ b/pmutils.cxx @@ -121,7 +121,7 @@ void ModemThreadChild::SignalStop() /////////////////////////////////////////////////////////////// int ChunkStream::write(const void *pBuf, PINDEX count) { - int len = sizeof(data) - last; + unsigned int len = sizeof(data) - last; if (!len) return -1; @@ -140,7 +140,7 @@ int ChunkStream::read(void *pBuf, PINDEX count) if (sizeof(data) == first) return -1; - int len = last - first; + unsigned int len = last - first; if (len > count) len = count; From 7a338ca1826ddc3cc675a59d79e0c9398388d8bc Mon Sep 17 00:00:00 2001 From: Henning Holtschneider Date: Mon, 2 Jun 2025 19:55:34 +0200 Subject: [PATCH 2/2] Fixed DLE receive --- dle.cxx | 8 ++++---- pmutils.cxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dle.cxx b/dle.cxx index 6125ac5..18fcc09 100644 --- a/dle.cxx +++ b/dle.cxx @@ -170,14 +170,14 @@ int DLEData::GetDleData(void *pBuf, PINDEX count) int done; for (done = 0 ; (count - done) >= 4 ; done = int(p - (BYTE *)pBuf)) { - PINDEX cGet = (count - done - 2) / 2; + int cGet = (count - done - 2) / 2; BYTE tmp[1024]; - if (cGet > (PINDEX)sizeof(tmp)) + if (cGet > sizeof(tmp)) cGet = sizeof(tmp); switch( cGet = GetData(tmp, cGet) ) { - case 1: + case -1: *p++ = DLE; *p++ = ETX; recvEtx = TRUE; @@ -185,7 +185,7 @@ int DLEData::GetDleData(void *pBuf, PINDEX count) case 0: return int(p - (BYTE *)pBuf); default: - for( PINDEX i = 0 ; i < cGet ; i++ ) { + for( int i = 0 ; i < cGet ; i++ ) { BYTE b = bitRev ? BitRevTable[tmp[i]] : tmp[i]; if( b == DLE ) *p++ = DLE; diff --git a/pmutils.cxx b/pmutils.cxx index 244bb6f..8437612 100644 --- a/pmutils.cxx +++ b/pmutils.cxx @@ -121,7 +121,7 @@ void ModemThreadChild::SignalStop() /////////////////////////////////////////////////////////////// int ChunkStream::write(const void *pBuf, PINDEX count) { - unsigned int len = sizeof(data) - last; + int len = sizeof(data) - last; if (!len) return -1; @@ -140,7 +140,7 @@ int ChunkStream::read(void *pBuf, PINDEX count) if (sizeof(data) == first) return -1; - unsigned int len = last - first; + int len = last - first; if (len > count) len = count;