minor bug fixes for releasing bluedroid task events and deleting message queue

diff --git a/components/bt/bluedroid/hci/hci_layer.c b/components/bt/bluedroid/hci/hci_layer.c
index 4ee3df2445377d6e3e63174f7004b97c9d18e3f3..17d1022a9b4d10252bc36e2dba78b9b2c4de4aea 100755 (executable)
--- a/components/bt/bluedroid/hci/hci_layer.c
+++ b/components/bt/bluedroid/hci/hci_layer.c
@@ -242,8 +242,8 @@ static void hci_host_thread_handler(void *arg)
                     }
                 }
             }
+            osi_free(e);
         }
-        osi_free(e);
     }
 }
 

diff --git a/components/bt/bluedroid/stack/btu/btu_task.c b/components/bt/bluedroid/stack/btu/btu_task.c
index 802a67eb154565389b62f2609cd90af2522aa461..e7152e3415c11e6b5480d55279f74202c91d305f 100755 (executable)
--- a/components/bt/bluedroid/stack/btu/btu_task.c
+++ b/components/bt/bluedroid/stack/btu/btu_task.c
@@ -324,8 +324,8 @@ static void btu_task_thread_handler(void *arg)
                 fixed_queue_process(btu_oneshot_alarm_queue);
                 fixed_queue_process(btu_l2cap_alarm_queue);
             }
+            osi_free(e);
         }
-        osi_free(e);
     }
 }
 

diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c
index 790764fda5ad98e55f9062cf48ab8ae57bad5665..6a6a018e325625b53e94c019dfd81b98d75bd463 100644 (file)
--- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c
+++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c
@@ -65,12 +65,12 @@ static void bt_app_task_handler(void *arg)
                 fixed_queue_process(bta_app_msg_queue);
                 fixed_queue_process(bt_app_general_alarm_queue);
             }else if(e->sig == BUTTON_PRESS_EVT){
-                       LOG_ERROR("button_press_event come in,button_value=%x\n",e->par);
-                 button_msg[1] = e->par;
-          button_msg_notify(2,button_msg);             
-}
+                LOG_ERROR("button_press_event come in,button_value=%x\n",e->par);
+                button_msg[1] = e->par;
+                button_msg_notify(2,button_msg);               
+            }
+            osi_free(e);
         }
-        osi_free(e);
     }
 }
 
@@ -201,7 +201,7 @@ static void bt_app_task_shut_down(void)
     fixed_queue_unregister_dequeue(bt_app_general_alarm_queue);
 
     vTaskDelete(xBtaApp1TaskHandle);
-    vTaskDelete(xBtaApp1Queue);
+    vQueueDelete(xBtaApp1Queue);
 }