Commit: c260f5f130b3443b91a4f737f76af681edd0b825 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: c260f5f130b3443b91a4f737f76af681edd0b825 (tree)
• Zeit: 2016-10-02 03:37:02
• Autor: Ivan Ivanich <iivanich@gmai...>
• Commiter: Ivan Ivanich

Log Message

Revert "Fix the command timeout issue with TX idle timer"

This reverts commit 5a234ca06c185f336a6398efe09f78c4d0dacf0b.

Change-Id: I2cec99e8cc119a9f8142f7370db1d4e1ff880e97

Ändern Zusammenfassung

• modified: hci/include/low_power_manager.h
• modified: hci/src/hci_layer.c
• modified: hci/src/low_power_manager.c

Diff

--- a/hci/include/low_power_manager.h
+++ b/hci/include/low_power_manager.h
@@ -41,9 +41,6 @@ typedef struct low_power_manager_t {
   // Tell the low power manager that you're done transmitting data. Must be
   // called on the thread provided at initialization time.
   void (*transmit_done)(void);
-
-  void (*start_idle_timer)(bool check_LPM);
-  void (*stop_idle_timer)();
 } low_power_manager_t;
 
 const low_power_manager_t *low_power_manager_get_interface();

--- a/hci/src/hci_layer.c
+++ b/hci/src/hci_layer.c
@@ -534,9 +534,9 @@ static void event_command_ready(fixed_queue_t *queue, UNUSED_ATTR void *context)
     pthread_mutex_unlock(&commands_pending_response_lock);
 
     // Send it off
-    low_power_manager->stop_idle_timer();
+    low_power_manager->wake_assert();
     packet_fragmenter->fragment_and_dispatch(wait_entry->command);
-    low_power_manager->start_idle_timer(false);
+    low_power_manager->transmit_done();
 
     update_command_response_timer();
   }

--- a/hci/src/low_power_manager.c
+++ b/hci/src/low_power_manager.c
@@ -61,8 +61,8 @@ static void event_allow_device_sleep(void *context);
 static void event_idle_timeout(void *context);
 
 static void reset_state();
-void start_idle_timer(bool check_LPM);
-void stop_idle_timer();
+static void start_idle_timer();
+static void stop_idle_timer();
 
 static thread_fn event_functions[] = {
   event_disable,
@@ -129,7 +129,7 @@ static void transmit_done() {
   transmit_is_done = true;
   if (wake_state == LPM_WAKE_W4_TX_DONE) {
     wake_state = LPM_WAKE_W4_TIMEOUT;
-    start_idle_timer(true);
+    start_idle_timer();
   }
 }
 
@@ -163,7 +163,7 @@ static void allow_device_sleep() {
   if (state == LPM_ENABLED && wake_state == LPM_WAKE_ASSERTED) {
     if (transmit_is_done) {
       wake_state = LPM_WAKE_W4_TIMEOUT;
-      start_idle_timer(true);
+      start_idle_timer();
     } else {
       wake_state = LPM_WAKE_W4_TX_DONE;
     }
@@ -190,8 +190,8 @@ static void idle_timer_expired(UNUSED_ATTR void *context) {
     thread_post(thread, event_idle_timeout, NULL);
 }
 
-void start_idle_timer(bool check_LPM) {
-  if (state == LPM_ENABLED || !check_LPM) {
+static void start_idle_timer() {
+  if (state == LPM_ENABLED) {
     if (idle_timeout_ms == 0) {
        wake_deassert();
     } else {
@@ -200,9 +200,8 @@ void start_idle_timer(bool check_LPM) {
   }
 }
 
-void stop_idle_timer() {
+static void stop_idle_timer() {
   alarm_cancel(idle_alarm);
-  LOG_DEBUG("%s", __func__);
 }
 
 static void event_disable(UNUSED_ATTR void *context) {
@@ -241,9 +240,7 @@ static const low_power_manager_t interface = {
   cleanup,
   post_command,
   wake_assert,
-  transmit_done,
-  start_idle_timer,
-  stop_idle_timer
+  transmit_done
 };
 
 const low_power_manager_t *low_power_manager_get_interface() {