jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluez: add QCA9377 sdio module support

Browse Source
This commit is contained in:
chewitt 2018-03-03 17:36:05 +00:00
parent a067e2144d
commit bf546c542d
5 changed files with 2918 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2396
packages/network/bluez/patches/bluez-21-hciattach-add-QCA9377-Tuffello-support.patch Normal file
View File

File diff suppressed because it is too large Load Diff

209
packages/network/bluez/patches/bluez-22-hciattach_rome-simplify-baudrate-setting.patch Normal file
View File

@ -0,0 +1,209 @@
From c98577de4fcf3bfb410c10a05b6633fb6581afdc Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Wed, 27 Dec 2017 10:55:52 +0100
Subject: [PATCH] hciattach_rome: simplify baudrate setting
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
tools/hciattach_rome.c | 70 +++++++++++++++++++-------------------------------
tools/hciattach_rome.h | 21 ---------------
2 files changed, 26 insertions(+), 65 deletions(-)
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
index 2586dbc77..34e7edfb5 100644
--- a/tools/hciattach_rome.c
+++ b/tools/hciattach_rome.c
@@ -908,60 +908,49 @@ int read_bd_address(unsigned char *bdaddr)
return 0;
}
-int isSpeedValid(int speed, int *local_baud_rate, int *controller_baud_rate)
+int isSpeedValid(int speed, unsigned char *baud_rate)
{
switch(speed) {
case 9600:
- *local_baud_rate = USERIAL_BAUD_9600;
- *controller_baud_rate = BAUDRATE_9600;
+ *baud_rate = BAUDRATE_9600;
break;
case 19200:
- *local_baud_rate = USERIAL_BAUD_19200;
- *controller_baud_rate = BAUDRATE_19200;
+ *baud_rate = BAUDRATE_19200;
break;
case 57600:
- *local_baud_rate = USERIAL_BAUD_57600;
- *controller_baud_rate = BAUDRATE_57600;
+ *baud_rate = BAUDRATE_57600;
break;
case 115200:
- *local_baud_rate = USERIAL_BAUD_115200;
- *controller_baud_rate = BAUDRATE_115200;
+ *baud_rate = BAUDRATE_115200;
break;
case 230400:
- *local_baud_rate = USERIAL_BAUD_230400;
- *controller_baud_rate = BAUDRATE_230400;
+ *baud_rate = BAUDRATE_230400;
break;
case 460800:
- *local_baud_rate = USERIAL_BAUD_460800;
- *controller_baud_rate = BAUDRATE_460800;
+ *baud_rate = BAUDRATE_460800;
break;
case 921600:
- *local_baud_rate = USERIAL_BAUD_921600;
- *controller_baud_rate = BAUDRATE_921600;
+ *baud_rate = BAUDRATE_921600;
break;
case 1000000:
- *local_baud_rate = USERIAL_BAUD_1M;
- *controller_baud_rate = BAUDRATE_1000000;
+ *baud_rate = BAUDRATE_1000000;
break;
case 2000000:
- *local_baud_rate = USERIAL_BAUD_2M;
- *controller_baud_rate = BAUDRATE_2000000;
+ *baud_rate = BAUDRATE_2000000;
break;
case 3000000:
- *local_baud_rate = USERIAL_BAUD_3M;
- *controller_baud_rate = BAUDRATE_3000000;
+ *baud_rate = BAUDRATE_3000000;
break;
case 4000000:
- *local_baud_rate = USERIAL_BAUD_4M;
- *controller_baud_rate = BAUDRATE_4000000;
+ *baud_rate = BAUDRATE_4000000;
break;
case 300:
case 600:
case 1200:
case 2400:
default:
- fprintf(stderr, "Invalid baud rate passed!\n");
- *local_baud_rate = *controller_baud_rate = -1;
+ fprintf(stderr, "Invalid baudrate, default to 115200!\n");
+ *baud_rate = BAUDRATE_115200;
break;
}
return -1;
@@ -1633,7 +1622,7 @@ static void flow_control(int fd, int opt)
}
-int rome_set_baudrate_req(int fd, int local_baud_rate, int controller_baud_rate)
+int rome_set_baudrate_req(int fd, unsigned char baud_rate)
{
int size, err = 0;
unsigned char cmd[HCI_MAX_CMD_SIZE];
@@ -1647,7 +1636,7 @@ int rome_set_baudrate_req(int fd, int local_baud_rate, int controller_baud_rate)
cmd[0] = HCI_COMMAND_PKT;
cmd_hdr->opcode = cmd_opcode_pack(HCI_VENDOR_CMD_OGF, EDL_SET_BAUDRATE_CMD_OCF);
cmd_hdr->plen = VSC_SET_BAUDRATE_REQ_LEN;
- cmd[4] = controller_baud_rate;
+ cmd[4] = baud_rate;
/* Total length of the packet to be sent to the Controller */
size = (HCI_CMD_IND + HCI_COMMAND_HDR_SIZE + VSC_SET_BAUDRATE_REQ_LEN);
@@ -1662,7 +1651,7 @@ int rome_set_baudrate_req(int fd, int local_baud_rate, int controller_baud_rate)
goto error;
}
/* Change Local UART baudrate to high speed UART */
- userial_vendor_set_baud(local_baud_rate);
+ userial_vendor_set_baud(baud_rate);
/* Flow on after changing local uart baudrate */
flow_control(fd, MSM_ENABLE_FLOW_CTRL);
@@ -1735,7 +1724,8 @@ int qca_soc_init(int fd, int speed, char *bdaddr)
{
int err = -1;
int ret = 0;
- int size, local_baud_rate = 0, controller_baud_rate = 0;
+ int size;
+ unsigned char baud_rate = 0;
vnd_userial.fd = fd;
@@ -1787,7 +1777,7 @@ int qca_soc_init(int fd, int speed, char *bdaddr)
}
/* Change baud rate 115.2 kbps to 3Mbps*/
- err = rome_hci_reset_req(fd, local_baud_rate);
+ err = rome_hci_reset_req(fd, baud_rate);
if (err < 0) {
fprintf(stderr, "HCI Reset Failed !!\n");
ret = -1;
@@ -1822,18 +1812,10 @@ int qca_soc_init(int fd, int speed, char *bdaddr)
rampatch_file_path = TF_RAMPATCH_TLV_1_0_1_PATH;
nvm_file_path = TF_NVM_TLV_1_0_1_PATH;
download:
- /* Check if user requested for 115200 kbps */
- if (speed == 115200) {
- local_baud_rate = USERIAL_BAUD_115200;
- controller_baud_rate = BAUDRATE_115200;
- }
- else {
- /* Change only if baud rate requested is valid or not */
- isSpeedValid(speed, &local_baud_rate, &controller_baud_rate);
- if (local_baud_rate < 0 || controller_baud_rate < 0) {
- ret = -1;
- goto error;
- }
+ isSpeedValid(speed, &baud_rate);
+ if (baud_rate < 0) {
+ ret = -1;
+ goto error;
}
/* Donwload TLV files (rampatch, NVM) */
@@ -1851,7 +1833,7 @@ int qca_soc_init(int fd, int speed, char *bdaddr)
* Overriding the baud rate value in NVM file with the user
* requested baud rate, since default baud rate in NVM file is 3M.
*/
- err = rome_set_baudrate_req(fd, local_baud_rate, controller_baud_rate);
+ err = rome_set_baudrate_req(fd, baud_rate);
if (err < 0) {
fprintf(stderr, "%s: Baud rate change failed!\n", __FUNCTION__);
ret = -1;
@@ -1859,7 +1841,7 @@ int qca_soc_init(int fd, int speed, char *bdaddr)
}
/* Perform HCI reset here*/
- err = rome_hci_reset_req(fd, local_baud_rate);
+ err = rome_hci_reset_req(fd, baud_rate);
if (err < 0) {
fprintf(stderr, "HCI Reset Failed !!!\n");
ret = -1;
diff --git a/tools/hciattach_rome.h b/tools/hciattach_rome.h
index a356cc24f..2f5930c99 100644
--- a/tools/hciattach_rome.h
+++ b/tools/hciattach_rome.h
@@ -89,27 +89,6 @@ typedef struct
#define USERIAL_BAUD_4M 15
#define USERIAL_BAUD_AUTO 16
-/* Vendor specific baud rate values */
-#define UART_Baud_Rate_Baud_9600 4
-#define UART_Baud_Rate_Baud_19200 3
-#define UART_Baud_Rate_Baud_57600 1
-#define UART_Baud_Rate_Baud_115200 0
-#define UART_Baud_Rate_Baud_230400 5
-#define UART_Baud_Rate_Baud_460800 7
-#define UART_Baud_Rate_Baud_921600 10
-#define UART_Baud_Rate_Baud_1000000 11
-#define UART_Baud_Rate_Baud_2000000 13
-#define UART_Baud_Rate_Baud_3000000 14
-#define UART_Baud_Rate_Baud_4000000 15
-
-#define UART_Baud_Rate_Baud_250000 6
-#define UART_Baud_Rate_Baud_500000 8
-#define UART_Baud_Rate_Baud_720000 9
-#define UART_Baud_Rate_Baud_125000 12
-#define UART_Baud_Rate_Baud_1600000 16
-#define UART_Baud_Rate_Baud_3200000 17
-#define UART_Baud_Rate_Baud_3500000 18
-
#ifndef FALSE
#define FALSE 0
#endif

52
packages/network/bluez/patches/bluez-23-hciattach_rome-do-not-override-module-MAC.patch Normal file
View File

@ -0,0 +1,52 @@
From 9041596bf7a975dec043ecafb242092cfeece631 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Wed, 27 Dec 2017 11:47:01 +0100
Subject: [PATCH] hciattach_rome: do not override module internal MAC address
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
tools/hciattach_rome.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
index 34e7edfb5..6336bdc6b 100644
--- a/tools/hciattach_rome.c
+++ b/tools/hciattach_rome.c
@@ -29,6 +29,7 @@
*
******************************************************************************/
+#define MODULE_HAS_MAC_ADDR
#define LOG_TAG "bt_vendor"
#include <stdio.h>
#include <unistd.h>
@@ -1057,6 +1058,7 @@ int rome_get_tlv_file(char *file_path)
nvm_index+=sizeof(tlv_nvm_hdr);
nvm_byte_ptr+=sizeof(tlv_nvm_hdr);
+#ifndef MODULE_HAS_MAC_ADDR
/* Write BD Address */
if (nvm_ptr->tag_id == TAG_NUM_2 && read_bd_address(bdaddr) == 0) {
memcpy(nvm_byte_ptr, bdaddr, 6);
@@ -1065,6 +1067,21 @@ int rome_get_tlv_file(char *file_path)
*nvm_byte_ptr, *(nvm_byte_ptr+1), *(nvm_byte_ptr+2),
*(nvm_byte_ptr+3), *(nvm_byte_ptr+4), *(nvm_byte_ptr+5));
}
+#else
+ /* Remove it from NVM data */
+ if (nvm_ptr->tag_id == TAG_NUM_2) {
+ int nvm_size = nvm_ptr->tag_len + sizeof(tlv_nvm_hdr);
+ PR_DBG("Skip BD Address from NVM\n");
+ nvm_index += nvm_ptr->tag_len;
+ nvm_byte_ptr += nvm_ptr->tag_len;
+ memmove(nvm_ptr, nvm_byte_ptr, nvm_length - nvm_index);
+ nvm_length -= nvm_size;
+ nvm_byte_ptr -= nvm_size;
+ readSize -= nvm_size;
+ nvm_index -= nvm_size;
+ continue;
+ }
+#endif
if (nvm_ptr->tag_id == TAG_NUM_17) {
if ((ibs_value =

102
packages/network/bluez/patches/bluez-24-hciattach_rome-force-IBS-to-disabled-in-NVM.patch Normal file
View File

@ -0,0 +1,102 @@
From 6656fc810789b929ef1ce0a510b8a2cae93e84c2 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Wed, 27 Dec 2017 11:51:23 +0100
Subject: [PATCH] hciattach_rome: force IBS to disabled in NVM
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
tools/hciattach_rome.c | 28 ++++++++++++----------------
tools/hciattach_rome.h | 3 ++-
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
index 6336bdc6b..b78155b22 100644
--- a/tools/hciattach_rome.c
+++ b/tools/hciattach_rome.c
@@ -957,7 +957,7 @@ int isSpeedValid(int speed, unsigned char *baud_rate)
return -1;
}
-int rome_get_tlv_file(char *file_path)
+int rome_get_tlv_file(char *file_path, unsigned char baud_rate)
{
FILE * pFile;
long fileSize;
@@ -1084,17 +1084,13 @@ int rome_get_tlv_file(char *file_path)
#endif
if (nvm_ptr->tag_id == TAG_NUM_17) {
- if ((ibs_value =
- get_value_from_config(FW_CONFIG_FILE_PATH, "IBS")) >= 0) {
- if (ibs_value == FWCONF_IBS_DISABLE) {
- nvm_byte_ptr[FWCONF_IBS_VAL_OFFSET] &=
- (~(FWCONF_IBS_ENABLE <<
- FWCONF_IBS_VAL_BIT));
- } else if (ibs_value == FWCONF_IBS_ENABLE) {
- nvm_byte_ptr[FWCONF_IBS_VAL_OFFSET] |=
- (FWCONF_IBS_ENABLE <<
- FWCONF_IBS_VAL_BIT);
- }
+ PR_DBG("Forcing IBS to be disabled\n");
+ nvm_byte_ptr[FWCONF_IBS_VAL_OFFSET] &=
+ (~(FWCONF_IBS_ENABLE << FWCONF_IBS_VAL_BIT));
+ if (baud_rate != nvm_byte_ptr[FWCONF_BAUD_VAL_OFFSET]) {
+ PR_DBG("Change Vendor Baud from 0x%02x to 0x%02x\n",
+ nvm_byte_ptr[FWCONF_BAUD_VAL_OFFSET], baud_rate);
+ nvm_byte_ptr[FWCONF_BAUD_VAL_OFFSET] = baud_rate;
}
}
@@ -1286,14 +1282,14 @@ int rome_tlv_dnld_req(int fd, int tlv_size)
return err;
}
-int rome_download_tlv_file(int fd)
+int rome_download_tlv_file(int fd, unsigned char baud_rate)
{
int tlv_size, err = -1;
/* Rampatch TLV file Downloading */
pdata_buffer = NULL;
- if ((tlv_size = rome_get_tlv_file(rampatch_file_path)) < 0)
+ if ((tlv_size = rome_get_tlv_file(rampatch_file_path, baud_rate)) < 0)
goto error;
if ((err = rome_tlv_dnld_req(fd, tlv_size)) < 0)
@@ -1305,7 +1301,7 @@ int rome_download_tlv_file(int fd)
}
/* NVM TLV file Downloading */
- if ((tlv_size = rome_get_tlv_file(nvm_file_path)) < 0)
+ if ((tlv_size = rome_get_tlv_file(nvm_file_path, baud_rate)) < 0)
goto error;
if ((err = rome_tlv_dnld_req(fd, tlv_size)) < 0)
@@ -1836,7 +1832,7 @@ int qca_soc_init(int fd, int speed, char *bdaddr)
}
/* Donwload TLV files (rampatch, NVM) */
- err = rome_download_tlv_file(fd);
+ err = rome_download_tlv_file(fd, baud_rate);
if (err < 0) {
fprintf(stderr, "%s: Download TLV file failed!\n", __FUNCTION__);
ret = -1;
diff --git a/tools/hciattach_rome.h b/tools/hciattach_rome.h
index 2f5930c99..1ea9d865b 100644
--- a/tools/hciattach_rome.h
+++ b/tools/hciattach_rome.h
@@ -201,11 +201,12 @@ typedef struct
#define FWCONF_PCM_MASTER 0
#define FWCONF_PCM_ROLE_BIT_OFFSET 4
-/* FW IBS Configuration */
+/* FW HCI Transport Layer Configuration */
#define FWCONF_IBS_DISABLE (0)
#define FWCONF_IBS_ENABLE (1)
#define FWCONF_IBS_VAL_BIT (7)
#define FWCONF_IBS_VAL_OFFSET (0)
+#define FWCONF_BAUD_VAL_OFFSET (2)
/* FW DEEP SLEEP Configuration */
#define FWCONF_DEEP_SLEEP_DISABLE 0

159
packages/network/bluez/patches/bluez-25-hciattach_rome-display-ROM-and-TLV-info.patch Normal file
View File

@ -0,0 +1,159 @@
From e6baaf14d9f6c2d96bcc720cb1c2e492c658e3a9 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Thu, 28 Dec 2017 12:54:05 +0100
Subject: [PATCH] hciattach_rome: display ROM and TLV info by default
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
tools/hciattach_rome.c | 60 ++++++++++++++++++++++++--------------------------
tools/hciattach_rome.h | 1 +
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
index b78155b22..9a7f222c4 100644
--- a/tools/hciattach_rome.c
+++ b/tools/hciattach_rome.c
@@ -232,21 +232,21 @@ int get_vs_hci_event(unsigned char *rsp)
switch(rsp[RSP_TYPE_OFFSET]) {
case EDL_PATCH_VER_RES_EVT:
case EDL_APP_VER_RES_EVT:
- PR_DBG("\t Current Product ID\t\t: 0x%08x\n",
+ PR_INFO("Current Product ID\t\t: 0x%08x\n",
(unsigned int)(rsp[PATCH_PROD_ID_OFFSET +3] << 24 |
rsp[PATCH_PROD_ID_OFFSET+2] << 16 |
rsp[PATCH_PROD_ID_OFFSET+1] << 8 |
rsp[PATCH_PROD_ID_OFFSET] ));
/* Patch Version indicates FW patch version */
- PR_DBG("\t Current Patch Version\t\t: 0x%04x\n",
+ PR_INFO("Current Patch Version\t\t: 0x%04x\n",
(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 */
rome_ver = (int)(rsp[PATCH_ROM_BUILD_VER_OFFSET + 1] << 8 |
rsp[PATCH_ROM_BUILD_VER_OFFSET]);
- PR_DBG("\t Current ROM Build Version\t: 0x%04x\n", rome_ver);
+ PR_INFO("Current ROM Build Version\t: 0x%04x\n", rome_ver);
/* In case rome 1.0/1.1, there is no SOC ID version available */
if (paramlen - 10) {
@@ -254,7 +254,7 @@ int get_vs_hci_event(unsigned char *rsp)
rsp[PATCH_SOC_VER_OFFSET+2] << 16 |
rsp[PATCH_SOC_VER_OFFSET+1] << 8 |
rsp[PATCH_SOC_VER_OFFSET]);
- PR_DBG("\t Current SOC Version\t\t: 0x%08x\n", soc_id);
+ PR_INFO("Current SOC Version\t\t: 0x%08x\n", soc_id);
}
/* Rome Chipset Version can be decided by Patch version and SOC version,
@@ -1019,30 +1019,31 @@ int rome_get_tlv_file(char *file_path, unsigned char baud_rate)
gtlv_dwndcfg = ptlv_header->tlv.patch.dwnd_cfg;
if (ptlv_header->tlv_type == TLV_TYPE_PATCH) {
- PR_DBG("====================================================\n");
- PR_DBG("TLV Type\t\t\t : 0x%x\n", ptlv_header->tlv_type);
- PR_DBG("Length\t\t\t : %d bytes\n", (ptlv_header->tlv_length1) |
+ PR_INFO("====================================================\n");
+ PR_INFO("TLV Type : 0x%x\n", ptlv_header->tlv_type);
+ PR_INFO("Length : %d bytes\n", (ptlv_header->tlv_length1) |
(ptlv_header->tlv_length2 << 8) |
(ptlv_header->tlv_length3 << 16));
- PR_DBG("Total Length\t\t\t : %d bytes\n", ptlv_header->tlv.patch.tlv_data_len);
- PR_DBG("Patch Data Length\t\t\t : %d bytes\n",ptlv_header->tlv.patch.tlv_patch_data_len);
- PR_DBG("Signing Format Version\t : 0x%x\n", ptlv_header->tlv.patch.sign_ver);
- PR_DBG("Signature Algorithm\t\t : 0x%x\n", ptlv_header->tlv.patch.sign_algorithm);
- PR_DBG("Event Handling\t\t\t : 0x%x", ptlv_header->tlv.patch.dwnd_cfg);
- PR_DBG("Reserved\t\t\t : 0x%x\n", ptlv_header->tlv.patch.reserved1);
- PR_DBG("Product ID\t\t\t : 0x%04x\n", ptlv_header->tlv.patch.prod_id);
- PR_DBG("Rom Build Version\t\t : 0x%04x\n", ptlv_header->tlv.patch.build_ver);
- PR_DBG("Patch Version\t\t : 0x%04x\n", ptlv_header->tlv.patch.patch_ver);
- PR_DBG("Reserved\t\t\t : 0x%x\n", ptlv_header->tlv.patch.reserved2);
- PR_DBG("Patch Entry Address\t\t : 0x%x\n", (ptlv_header->tlv.patch.patch_entry_addr));
- PR_DBG("====================================================\n");
+ PR_INFO("Total Length : %d bytes\n", ptlv_header->tlv.patch.tlv_data_len);
+ PR_INFO("Patch Data Length : %d bytes\n",ptlv_header->tlv.patch.tlv_patch_data_len);
+ PR_INFO("Signing Format Version : 0x%x\n", ptlv_header->tlv.patch.sign_ver);
+ PR_INFO("Signature Algorithm : 0x%x\n", ptlv_header->tlv.patch.sign_algorithm);
+ PR_INFO("Event Handling : 0x%x\n", ptlv_header->tlv.patch.dwnd_cfg);
+ PR_INFO("Reserved : 0x%x\n", ptlv_header->tlv.patch.reserved1);
+ PR_INFO("Product ID : 0x%04x\n", ptlv_header->tlv.patch.prod_id);
+ PR_INFO("Rom Build Version : 0x%04x\n", ptlv_header->tlv.patch.build_ver);
+ PR_INFO("Patch Version : 0x%04x\n", ptlv_header->tlv.patch.patch_ver);
+ PR_INFO("Reserved : 0x%x\n", ptlv_header->tlv.patch.reserved2);
+ PR_INFO("Patch Entry Address : 0x%x\n", (ptlv_header->tlv.patch.patch_entry_addr));
+ PR_INFO("====================================================\n");
} else if (ptlv_header->tlv_type == TLV_TYPE_NVM) {
- PR_DBG("====================================================\n");
- PR_DBG("TLV Type\t\t\t : 0x%x\n", ptlv_header->tlv_type);
- PR_DBG("Length\t\t\t : %d bytes\n", nvm_length = (ptlv_header->tlv_length1) |
- (ptlv_header->tlv_length2 << 8) |
- (ptlv_header->tlv_length3 << 16));
+ PR_INFO("====================================================\n");
+ PR_INFO("TLV Type : 0x%x\n", ptlv_header->tlv_type);
+ PR_INFO("Length : %d bytes\n", nvm_length =
+ (ptlv_header->tlv_length1) |
+ (ptlv_header->tlv_length2 << 8) |
+ (ptlv_header->tlv_length3 << 16));
if (nvm_length <= 0)
return readSize;
@@ -1062,7 +1063,7 @@ int rome_get_tlv_file(char *file_path, unsigned char baud_rate)
/* Write BD Address */
if (nvm_ptr->tag_id == TAG_NUM_2 && read_bd_address(bdaddr) == 0) {
memcpy(nvm_byte_ptr, bdaddr, 6);
- PR_DBG("Overriding default BD ADDR with user"
+ PR_INFO("Overriding default BD ADDR with user"
" programmed BD Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
*nvm_byte_ptr, *(nvm_byte_ptr+1), *(nvm_byte_ptr+2),
*(nvm_byte_ptr+3), *(nvm_byte_ptr+4), *(nvm_byte_ptr+5));
@@ -1071,7 +1072,7 @@ int rome_get_tlv_file(char *file_path, unsigned char baud_rate)
/* Remove it from NVM data */
if (nvm_ptr->tag_id == TAG_NUM_2) {
int nvm_size = nvm_ptr->tag_len + sizeof(tlv_nvm_hdr);
- PR_DBG("Skip BD Address from NVM\n");
+ PR_INFO("Skip BD Address from NVM\n");
nvm_index += nvm_ptr->tag_len;
nvm_byte_ptr += nvm_ptr->tag_len;
memmove(nvm_ptr, nvm_byte_ptr, nvm_length - nvm_index);
@@ -1088,7 +1089,7 @@ int rome_get_tlv_file(char *file_path, unsigned char baud_rate)
nvm_byte_ptr[FWCONF_IBS_VAL_OFFSET] &=
(~(FWCONF_IBS_ENABLE << FWCONF_IBS_VAL_BIT));
if (baud_rate != nvm_byte_ptr[FWCONF_BAUD_VAL_OFFSET]) {
- PR_DBG("Change Vendor Baud from 0x%02x to 0x%02x\n",
+ PR_INFO("Change Vendor Baud from 0x%02x to 0x%02x\n",
nvm_byte_ptr[FWCONF_BAUD_VAL_OFFSET], baud_rate);
nvm_byte_ptr[FWCONF_BAUD_VAL_OFFSET] = baud_rate;
}
@@ -1144,7 +1145,7 @@ int rome_get_tlv_file(char *file_path, unsigned char baud_rate)
nvm_byte_ptr +=nvm_ptr->tag_len;
}
- PR_DBG("====================================================\n");
+ PR_INFO("====================================================\n");
} else {
fprintf(stderr, "TLV Header type is unknown (%d) \n", ptlv_header->tlv_type);
@@ -1839,9 +1840,6 @@ int qca_soc_init(int fd, int speed, char *bdaddr)
goto error;
}
- /* FW download complete, add some delay before updating baudrate */
- usleep(20000);
-
/*
* Overriding the baud rate value in NVM file with the user
* requested baud rate, since default baud rate in NVM file is 3M.
diff --git a/tools/hciattach_rome.h b/tools/hciattach_rome.h
index 1ea9d865b..597743e0b 100644
--- a/tools/hciattach_rome.h
+++ b/tools/hciattach_rome.h
@@ -48,6 +48,7 @@
#define USERIAL_OP_CLK_OFF 0x5442
#endif
+#define PR_INFO(fmt, arg...) printf(fmt, ## arg)
#ifdef DEBUG
#define PR_DBG(fmt, arg...) printf(fmt, ## arg)
#else