From 41f5815172e8544d27f89c6b43a966d76da34241 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 22 Feb 2017 11:50:09 +0100 Subject: [PATCH 1/3] rc_input: we have d_printf, so let's use it Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1eec78ccfd7d672ef2cc814ee8ff245696fe3a78 Author: vanhofen Date: 2017-02-22 (Wed, 22 Feb 2017) Origin message was: ------------------ - rc_input: we have d_printf, so let's use it ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/rcinput.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 9facaaf59..ff2907ef5 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1382,9 +1382,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 } uint32_t trkey = translate(ev.code); -#ifdef _DEBUG - printf("key: %04x value %d, translate: %04x -%s-\n", ev.code, ev.value, trkey, getKeyName(trkey).c_str()); -#endif + d_printf("key: %04x value %d, translate: %04x -%s-\n", ev.code, ev.value, trkey, getKeyName(trkey).c_str()); if (trkey == RC_nokey) continue; @@ -1418,9 +1416,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 } if (ev.value) { -#ifdef RCDEBUG - printf("rc_last_key %04x rc_last_repeat_key %04x\n\n", rc_last_key, rc_last_repeat_key); -#endif + d_printf("rc_last_key %04x rc_last_repeat_key %04x\n\n", rc_last_key, rc_last_repeat_key); bool keyok = true; #if 0 uint64_t now_pressed; From 420efbcc4e370b7e67bce99261d606e55d149f36 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Wed, 22 Feb 2017 11:36:04 +0100 Subject: [PATCH 2/3] CRCInput::setKeyRepeatDelay: Change hardware dependency, HD2 driver is not so very ugly. ;) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/383af04cb786296a3325d186c73fca05ebdaea3e Author: Michael Liebmann Date: 2017-02-22 (Wed, 22 Feb 2017) Origin message was: ------------------ CRCInput::setKeyRepeatDelay: Change hardware dependency, HD2 driver is not so very ugly. ;) ------------------ This commit was generated by Migit --- src/driver/rcinput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index ff2907ef5..1678addeb 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1775,7 +1775,7 @@ void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms) std::string path = (*it).path; if (path == "/tmp/neutrino.input") continue; /* setting repeat rate does not work here */ -#ifdef HAVE_COOL_HARDWARE +#ifdef BOXMODEL_CS_HD1 /* this is ugly, but the driver does not support anything advanced... */ if (path == "/dev/input/nevis_ir") { d_printf("[rcinput:%s] %s(fd %d) using proprietary ioctl\n", __func__, path.c_str(), fd); From fee0dfb99aaa36cb9c70881b6179a0c384bf80da Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 22 Feb 2017 13:41:43 +0100 Subject: [PATCH 3/3] autogen.sh: add 'autoreconf -fi' call Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/05ed724bfd4bc19535441ec689d40ac3dfe6ca5d Author: vanhofen Date: 2017-02-22 (Wed, 22 Feb 2017) Origin message was: ------------------ - autogen.sh: add 'autoreconf -fi' call ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- autogen.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autogen.sh b/autogen.sh index 29edb6cb6..8d063bf69 100755 --- a/autogen.sh +++ b/autogen.sh @@ -13,3 +13,5 @@ libtoolize --force autoconf --force autoheader --force automake --add-missing --force-missing --foreign + +autoreconf -fi