From ffaa44ceb4be73d36b86da9760935ebadfe850dc Mon Sep 17 00:00:00 2001 From: Jaro Date: Sat, 11 Sep 2021 22:49:23 +0200 Subject: [PATCH] Fix read final unsigned to signed retyped --- Ymodem.h | 4 ++-- YmodemFileReceive.cpp | 5 +++-- YmodemFileReceive.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Ymodem.h b/Ymodem.h index 8939537..f40a69a 100644 --- a/Ymodem.h +++ b/Ymodem.h @@ -115,8 +115,8 @@ private: virtual Code callback(Status status, uint8_t *buff, uint32_t *len) = 0; - virtual uint32_t read(uint8_t *buff, uint32_t len) = 0; - virtual uint32_t write(uint8_t *buff, uint32_t len) = 0; + virtual int32_t read(uint8_t *buff, uint32_t len) = 0; + virtual int32_t write(uint8_t *buff, uint32_t len) = 0; uint32_t timeDivide; uint32_t timeMax; diff --git a/YmodemFileReceive.cpp b/YmodemFileReceive.cpp index 855a037..607dd46 100644 --- a/YmodemFileReceive.cpp +++ b/YmodemFileReceive.cpp @@ -253,12 +253,13 @@ Ymodem::Code YmodemFileReceive::callback(Status status, uint8_t *buff, uint32_t } } -uint32_t YmodemFileReceive::read(uint8_t *buff, uint32_t len) +int32_t YmodemFileReceive::read(uint8_t *buff, uint32_t len) { + return serialPort->read((char *)buff, len); } -uint32_t YmodemFileReceive::write(uint8_t *buff, uint32_t len) +int32_t YmodemFileReceive::write(uint8_t *buff, uint32_t len) { return serialPort->write((char *)buff, len); } diff --git a/YmodemFileReceive.h b/YmodemFileReceive.h index 136f885..eefd88b 100644 --- a/YmodemFileReceive.h +++ b/YmodemFileReceive.h @@ -40,8 +40,8 @@ public: private: Code callback(Status status, uint8_t *buff, uint32_t *len); - uint32_t read(uint8_t *buff, uint32_t len); - uint32_t write(uint8_t *buff, uint32_t len); + int32_t read(uint8_t *buff, uint32_t len); + int32_t write(uint8_t *buff, uint32_t len); ofstream file; boost::asio::io_service io; ///< Io service object