Merge "Revert "Bluetooth: Enable controller logs by default""
diff --git a/libbt-vendor/include/hw_rome.h b/libbt-vendor/include/hw_rome.h
index ceb766a..539e24c 100644
--- a/libbt-vendor/include/hw_rome.h
+++ b/libbt-vendor/include/hw_rome.h
@@ -152,6 +152,8 @@
#define ROME_NVM_TLV_2_0_1_PATH "/system/etc/firmware/nvm_tlv_2.1.bin"
#define ROME_RAMPATCH_TLV_3_0_0_PATH "/system/etc/firmware/rampatch_tlv_3.0.tlv"
#define ROME_NVM_TLV_3_0_0_PATH "/system/etc/firmware/nvm_tlv_3.0.bin"
+#define ROME_RAMPATCH_TLV_3_0_2_PATH "/system/etc/firmware/rampatch_tlv_3.2.tlv"
+#define ROME_NVM_TLV_3_0_2_PATH "/system/etc/firmware/nvm_tlv_3.2.bin"
/******************************************************************************
@@ -233,13 +235,15 @@
ROME_PATCH_VER_0100 = 0x0100,
ROME_PATCH_VER_0101 = 0x0101,
ROME_PATCH_VER_0200 = 0x0200,
- ROME_PATCH_VER_0300 = 0x0300
+ ROME_PATCH_VER_0300 = 0x0300,
+ ROME_PATCH_VER_0302 = 0x0302
};
enum{
ROME_SOC_ID_00 = 0x00000000,
ROME_SOC_ID_11 = 0x00000011,
ROME_SOC_ID_22 = 0x00000022,
+ ROME_SOC_ID_44 = 0x00000044
};
enum{
@@ -248,6 +252,7 @@
ROME_VER_1_1 = ((ROME_PATCH_VER_0101 << 16 ) | ROME_SOC_ID_00 ),
ROME_VER_1_3 = ((ROME_PATCH_VER_0200 << 16 ) | ROME_SOC_ID_00 ),
ROME_VER_2_1 = ((ROME_PATCH_VER_0200 << 16 ) | ROME_SOC_ID_11 ),
- ROME_VER_3_0 = ((ROME_PATCH_VER_0300 << 16 ) | ROME_SOC_ID_22 )
+ ROME_VER_3_0 = ((ROME_PATCH_VER_0300 << 16 ) | ROME_SOC_ID_22 ),
+ ROME_VER_3_2 = ((ROME_PATCH_VER_0302 << 16 ) | ROME_SOC_ID_44 )
};
#endif /* HW_ROME_H */
diff --git a/libbt-vendor/src/hw_rome.c b/libbt-vendor/src/hw_rome.c
index f1f8682..4925c14 100644
--- a/libbt-vendor/src/hw_rome.c
+++ b/libbt-vendor/src/hw_rome.c
@@ -53,13 +53,7 @@
#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 @@
/* 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 @@
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);
@@ -1647,6 +1640,10 @@
case ROME_VER_3_0:
rampatch_file_path = ROME_RAMPATCH_TLV_3_0_0_PATH;
nvm_file_path = ROME_NVM_TLV_3_0_0_PATH;
+ goto download;
+ case ROME_VER_3_2:
+ rampatch_file_path = ROME_RAMPATCH_TLV_3_0_2_PATH;
+ nvm_file_path = ROME_NVM_TLV_3_0_2_PATH;
download:
/* Change baud rate 115.2 kbps to 3Mbps*/