From 159dd9cdb9646b0f5068510e4bcf8a8c16120866 Mon Sep 17 00:00:00 2001 From: klu339 Date: Wed, 22 Apr 2026 14:57:17 -0400 Subject: [PATCH 1/2] Revert "RDKEMW-16763 : rf4ce init failure causes deadlock (#198)" This reverts commit d1afc0746699dcd42519f341d50676b4fe52dfe3. --- src/rf4ce/ctrlm_rf4ce_network.cpp | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/rf4ce/ctrlm_rf4ce_network.cpp b/src/rf4ce/ctrlm_rf4ce_network.cpp index 0e2fbac8..5fea2cd3 100644 --- a/src/rf4ce/ctrlm_rf4ce_network.cpp +++ b/src/rf4ce/ctrlm_rf4ce_network.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include "ctrlm.h" #include "ctrlm_log.h" @@ -412,31 +411,8 @@ ctrlm_hal_result_t ctrlm_obj_network_rf4ce_t::hal_init_request(GThread *ctrlm_ma // Block until initialization is complete or a timeout occurs XLOGD_INFO("Waiting for %s initialization...", name_get()); - struct timespec timeout; - clock_gettime(CLOCK_REALTIME, &timeout); - timeout.tv_sec += 2; // this operation should complete in under 100 ms under normal circumstances - - int sem_result = -1; - do { - errno = 0; - sem_result = sem_timedwait(&semaphore_, &timeout); - if(sem_result == -1 && errno == EINTR) { - XLOGD_INFO("interrupted"); - } else { - break; - } - } while(1); - - if(sem_result == -1) { - if(errno == ETIMEDOUT) { - XLOGD_ERROR("Timeout waiting for %s initialization", name_get()); - } else { - XLOGD_ERROR("Error waiting for %s initialization: %s", name_get(), strerror(errno)); - } - init_result_ = CTRLM_HAL_RESULT_ERROR; - } else { - sem_destroy(&semaphore_); - } + sem_wait(&semaphore_); + sem_destroy(&semaphore_); ready_ = (CTRLM_HAL_RESULT_SUCCESS == init_result_); From 77acda66f2190f297650fae32ef6a44581a594ff Mon Sep 17 00:00:00 2001 From: klu339 Date: Wed, 22 Apr 2026 15:21:53 -0400 Subject: [PATCH 2/2] RDKEMW-17376: hotfix ctrlm release 1.1.8.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96c3e1d7..38523b18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.1.8.2](https://github.com/rdkcentral/control/compare/1.1.8.1...1.1.8.2) + +> 22 April 2026 + +- Revert "RDKEMW-16763 : rf4ce init failure causes deadlock (#198)" [`159dd9c`](https://github.com/rdkcentral/control/commit/159dd9cdb9646b0f5068510e4bcf8a8c16120866) + #### [1.1.8.1](https://github.com/rdkcentral/control/compare/1.1.8...1.1.8.1) > 20 April 2026