コミット: 8178d51f809af0dc1c8931098589cb69fdd0a22d - system-bt (git)

system/bt

コミットメタ情報

• リビジョン: 8178d51f809af0dc1c8931098589cb69fdd0a22d (tree)
• 日時: 2016-10-10 20:05:11
• 作者: Jaap Jan Meijer <jjmeijer88@gmai...>
• コミッター: Jaap Jan Meijer

ログメッセージ

[FOR UPSTEAM] Fix Linux libbt-vendor build

Fix enumeration values not explicitly handled in switch;
Fix unused variables;
Fix int64 printf.

変更サマリ

• modified: vendor_libs/linux/bt_vendor_linux.c
• modified: vendor_libs/test_vendor_lib/src/hci_transport.cc

差分

--- a/vendor_libs/linux/bt_vendor_linux.c
+++ b/vendor_libs/linux/bt_vendor_linux.c
@@ -408,6 +408,16 @@ static int bt_vendor_op(bt_vendor_opcode_t opcode, void *param)
 
   case BT_VND_OP_A2DP_OFFLOAD_STOP:
     break;
+
+  case FM_VND_OP_POWER_CTRL:
+    break;
+
+  case BT_VND_OP_FM_USERIAL_OPEN:
+    break;
+
+  case BT_VND_OP_FM_USERIAL_CLOSE:
+    break;
+
   }
 
   LOG_INFO(LOG_TAG, "%s op %d retval %d", __func__, opcode, retval);
@@ -422,9 +432,15 @@ static void bt_vendor_cleanup(void)
   bt_vendor_callbacks = NULL;
 }
 
+static void ssr_cleanup (int reason)
+{
+  LOG_INFO(LOG_TAG, "%s", __func__);
+}
+
 EXPORT_SYMBOL const bt_vendor_interface_t BLUETOOTH_VENDOR_LIB_INTERFACE = {
   sizeof(bt_vendor_interface_t),
   bt_vendor_init,
   bt_vendor_op,
   bt_vendor_cleanup,
+  ssr_cleanup,
 };

--- a/vendor_libs/test_vendor_lib/src/hci_transport.cc
+++ b/vendor_libs/test_vendor_lib/src/hci_transport.cc
@@ -23,8 +23,8 @@
 #include "base/thread_task_runner_handle.h"
 
 extern "C" {
+#include <inttypes.h>
 #include <sys/socket.h>
-
 #include "stack/include/hcidefs.h"
 #include "osi/include/log.h"
 }  // extern "C"
@@ -105,7 +105,6 @@ void HciTransport::OnFileCanWriteWithoutBlocking(int fd) {
   CHECK(fd == GetVendorFd());
   if (!outbound_events_.empty()) {
     base::TimeTicks current_time = base::TimeTicks::Now();
-    auto it = outbound_events_.begin();
     // Check outbound events for events that can be sent, i.e. events with a
     // timestamp before the current time. Stop sending events when
     // |packet_stream_| fails writing.
@@ -148,7 +147,7 @@ void HciTransport::PostDelayedEventResponse(std::unique_ptr<EventPacket> event,
     PostEventResponse(std::move(event));
   }
 
-  LOG_INFO(LOG_TAG, "Posting event response with delay of %lld ms.",
+  LOG_INFO(LOG_TAG, "Posting event response with delay of %" PRId64 " ms.",
            delay.InMilliseconds());
 
   AddEventToOutboundEvents(