From debee8aa477fbec7c1c23d5dec565de11241f814 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Thu, 28 Jul 2016 14:36:59 +0200 Subject: Use int instead of CommError Signed-off-by: Szczepan Zalega --- include/device.h | 4 ++-- include/device_proto.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/device.h b/include/device.h index c4e2747..1c95c56 100644 --- a/include/device.h +++ b/include/device.h @@ -31,13 +31,13 @@ class Device { /* * Sends packet of HID_REPORT_SIZE. */ - virtual CommError send(const void *packet); + virtual int send(const void *packet); /* * Gets packet of HID_REPORT_SIZE. * Can sleep. See below. */ - virtual CommError recv(void *packet); + virtual int recv(void *packet); int get_retry_count() const { return m_retry_count; }; std::chrono::milliseconds get_retry_timeout() const { return m_retry_timeout; }; diff --git a/include/device_proto.h b/include/device_proto.h index 2bbb38a..c248b10 100644 --- a/include/device_proto.h +++ b/include/device_proto.h @@ -168,7 +168,7 @@ class Transaction : semantics::non_constructible { Log::instance()(__PRETTY_FUNCTION__, Loglevel::DEBUG_L2); - CommError status; + int status; OutgoingPacket outp; ResponsePacket resp; @@ -185,7 +185,7 @@ class Transaction : semantics::non_constructible { if (!outp.isValid()) throw std::runtime_error("Invalid outgoing packet"); status = dev.send(&outp); - if ((int)(status) < 0 && status != CommError::ERR_NO_ERROR) + if (status <= 0) throw std::runtime_error( std::string("Device error while sending command ") + std::to_string((int)(status))); @@ -204,10 +204,10 @@ class Transaction : semantics::non_constructible { std::this_thread::sleep_for(dev.get_retry_timeout()); continue; } - if ((int)(status) < 0 && status != CommError::ERR_NO_ERROR) + if (status <= 0) throw std::runtime_error( std::string("Device error while executing command ") + - std::to_string((int)(status))); + std::to_string(status)); Log::instance()("Incoming HID packet:", Loglevel::DEBUG); Log::instance()((std::string)(resp), Loglevel::DEBUG); -- cgit v1.2.3