diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-10-17 03:14:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-10-17 03:14:15 -0700 |
| commit | 749759c7d04cfcb35c50027c936118880d7e68ad (patch) | |
| tree | b7ddfbf70680e9a95f2174e2e40b47848832e369 | |
| parent | e783cf5eda4c99ef5b66a5f21e4c3c658fb82251 (diff) | |
| parent | 9897f69f963b6c572ae15a4f37049e0d4a145f37 (diff) | |
| download | android_hardware_qcom_bt-749759c7d04cfcb35c50027c936118880d7e68ad.tar.gz android_hardware_qcom_bt-749759c7d04cfcb35c50027c936118880d7e68ad.tar.bz2 android_hardware_qcom_bt-749759c7d04cfcb35c50027c936118880d7e68ad.zip | |
Merge "Bluetooth: Add support for Rome 3.2"
| -rw-r--r-- | libbt-vendor/include/hw_rome.h | 9 | ||||
| -rw-r--r-- | libbt-vendor/src/hw_rome.c | 4 |
2 files changed, 11 insertions, 2 deletions
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 @@ enum{ 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 @@ enum{ 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 1ea6dd1..ce54fdf 100644 --- a/libbt-vendor/src/hw_rome.c +++ b/libbt-vendor/src/hw_rome.c @@ -1648,6 +1648,10 @@ int rome_soc_init(int fd, char *bdaddr) 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*/ |