commit 80dab51f4de51853b837989c020a72507681e1be
author himta ram <hram@codeaurora.org> Wed Mar 28 19:55:45 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 16 14:07:49 2018 -0700
tree 83a424bc126ed18a92c85e876bc9a0b353b27d12
parent a1bafe4e09fa5100cbb5a7e4da8b04156002e35e

FM: fix rx thread syncronization

Change-Id: I6bab3de67c5bcb15d7661b5d63a53e6ef72de850

fm_hci/fm_hci.cpp

diff --git a/fm_hci/fm_hci.cpp b/fm_hci/fm_hci.cpp
index 4c4d285..0b442f1 100644
--- a/fm_hci/fm_hci.cpp
+++ b/fm_hci/fm_hci.cpp
@@ -97,12 +97,10 @@
 static int enqueue_fm_rx_event(struct fm_event_header_t *hdr)
 {
 
-    hci.rx_queue_mtx.lock();
-    hci.rx_event_queue.push(hdr);
-    hci.rx_queue_mtx.unlock();
-
-    ALOGI("%s: putting lock before notify", __func__);
+    ALOGI("%s: putting lock before enqueue ", __func__);
     hci.rx_cond_mtx.lock();
+    ALOGI("%s: pushing event to que before notify", __func__);
+    hci.rx_event_queue.push(hdr);
     ALOGI("%s:before notify to waiting thred", __func__);
     hci.rx_cond.notify_all();
     ALOGI("%s:after notify to waiting thred", __func__);
@@ -131,17 +129,14 @@
 
     ALOGI("%s", __func__);
     while (1) {
-        hci.rx_queue_mtx.lock();
         if (hci.rx_event_queue.empty()) {
             ALOGI("No more FM Events are available in the RX Queue");
-            hci.rx_queue_mtx.unlock();
             return;
         } else {
         }
 
         evt_buf = hci.rx_event_queue.front();
         hci.rx_event_queue.pop();
-        hci.rx_queue_mtx.unlock();
 
         hci.credit_mtx.lock();
         if (evt_buf->evt_code == FM_CMD_COMPLETE) {

fm_hci/fm_hci.h

diff --git a/fm_hci/fm_hci.h b/fm_hci/fm_hci.h
index 5c48827..73e1290 100644
--- a/fm_hci/fm_hci.h
+++ b/fm_hci/fm_hci.h
@@ -55,7 +55,6 @@
         std::mutex rx_cond_mtx;
 
         std::mutex tx_queue_mtx;
-        std::mutex rx_queue_mtx;
 
         std::mutex credit_mtx;
         std::condition_variable cmd_credits_cond;