summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-10-18 15:31:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-10-18 15:31:36 -0700
commitad1f49bc28289fd21e507e0f247887330c92656b (patch)
treeb4b6eb15a090ed20191be710deba567ffa9cacce
parent749759c7d04cfcb35c50027c936118880d7e68ad (diff)
parent5a1c73ff4282cee0f5eabf1516cdba30b7153fe1 (diff)
downloadandroid_hardware_qcom_bt-ad1f49bc28289fd21e507e0f247887330c92656b.tar.gz
android_hardware_qcom_bt-ad1f49bc28289fd21e507e0f247887330c92656b.tar.bz2
android_hardware_qcom_bt-ad1f49bc28289fd21e507e0f247887330c92656b.zip
Merge "Bluetooth: Fix SOC version Dump to Correct File"
-rw-r--r--libbt-vendor/src/hw_rome.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/libbt-vendor/src/hw_rome.c b/libbt-vendor/src/hw_rome.c
index ce54fdf..32e47c2 100644
--- a/libbt-vendor/src/hw_rome.c
+++ b/libbt-vendor/src/hw_rome.c
@@ -53,13 +53,7 @@ extern "C" {
#include "hci_uart.h"
#include "hw_rome.h"
-#define QBT_HOST_VERSION_MAJOR 3
-#define QBT_HOST_VERSION_MINOR 0
-#define QBT_HOST_VERSION_PATCH 0
-#define QBT_HOST_VERSION_BUILD 001
-#define QBT_HOST_VERSIONSTR "3.0.0.001"
-
-#define BT_VERSION_FILEPATH "/data/misc/bluedroid/bt_version.info"
+#define BT_VERSION_FILEPATH "/data/misc/bluedroid/bt_fw_version.txt"
#ifdef __cplusplus
}
@@ -128,8 +122,8 @@ int get_vs_hci_event(unsigned char *rsp)
/* Patch Version indicates FW patch version */
ALOGI("\t Current Patch Version\t\t: 0x%04x",
- (unsigned short)(rsp[PATCH_PATCH_VER_OFFSET + 1] << 8 |
- rsp[PATCH_PATCH_VER_OFFSET] ));
+ (patchversion = (unsigned short)(rsp[PATCH_PATCH_VER_OFFSET + 1] << 8 |
+ rsp[PATCH_PATCH_VER_OFFSET] )));
/* ROM Build Version indicates ROM build version like 1.0/1.1/2.0 */
ALOGI("\t Current ROM Build Version\t: 0x%04x", rome_ver =
@@ -151,7 +145,6 @@ int get_vs_hci_event(unsigned char *rsp)
fprintf(btversionfile, "Bluetooth Controller Patch Version : 0x%04x\n", patchversion);
fprintf(btversionfile, "Bluetooth Controller Build Version : 0x%04x\n", rome_ver);
fprintf(btversionfile, "Bluetooth Controller SOC Version : 0x%08x\n", soc_id);
- fprintf(btversionfile, "Bluetooth Host Version : %s\n", QBT_HOST_VERSIONSTR);
fclose(btversionfile);
}else {
ALOGI("Failed to dump SOC version info. Errno:%d", errno);