From e496e2451120884a01d34dfee0dcaf6bd1f5c191 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 22 Feb 2017 20:05:54 +0100 Subject: [PATCH] Revert "- rc_input: just cosmetics to satisfy syntax-highlighters" This reverts commit 96eed0a6fafef562dd55347c0d884e9c02dc546f. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3d7f6f13c4646bddd536b6d119c217396c7ce488 Author: Stefan Seyfried Date: 2017-02-22 (Wed, 22 Feb 2017) --- src/driver/rcinput.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 54fac46d7..931e23ca7 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -575,6 +575,8 @@ int CRCInput::checkTimers() return _id; } + + int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds) { return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000); @@ -1427,13 +1429,13 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 if (trkey == rc_last_key) { /* only allow selected keys to be repeated */ if (mayRepeat(trkey, bAllowRepeatLR) || - (g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && + (g_settings.shutdown_real_rcdelay && + ((trkey == RC_standby) && #if HAVE_COOL_HARDWARE - (cs_get_revision() > 7) + (cs_get_revision() > 7)))) #else - (g_info.hw_caps->can_shutdown) + (g_info.hw_caps->can_shutdown)))) #endif - ))) { #ifdef ENABLE_REPEAT_CHECK if (rc_last_repeat_key != trkey) {