diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/0021-hcitool-do-not-show-unsupported-refresh-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0001-hcitool-do-not-show-unsupported-refresh-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/0021-hcitool-do-not-show-unsupported-refresh-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0001-hcitool-do-not-show-unsupported-refresh-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/0022-hcitool-increase-the-shown-connection-limit-to-20.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0002-hcitool-increase-the-shown-connection-limit-to-20.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/0022-hcitool-increase-the-shown-connection-limit-to-20.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0002-hcitool-increase-the-shown-connection-limit-to-20.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/bluez-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluez-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/bluez-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/bluez-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch similarity index 98% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch index 4a446da5d..1537e2bbb 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch @@ -14,18 +14,18 @@ Signed-off-by: Rupesh Tatiya --- Makefile.tools | 3 +- tools/hciattach.c | 25 +- - tools/hciattach.h | 6 +- + tools/hciattach.h | 8 +- tools/hciattach_rome.c | 1578 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/hciattach_rome.h | 317 ++++++++++ - 5 files changed, 1925 insertions(+), 4 deletions(-) + 5 files changed, 1926 insertions(+), 5 deletions(-) create mode 100644 tools/hciattach_rome.c create mode 100644 tools/hciattach_rome.h diff --git a/Makefile.tools b/Makefile.tools -index e193be9f33aa..52c8581b5b58 100644 +index 0d5f1431e013..8f087c597490 100644 --- a/Makefile.tools +++ b/Makefile.tools -@@ -159,7 +159,8 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \ +@@ -164,7 +164,8 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \ tools/hciattach_ath3k.c \ tools/hciattach_qualcomm.c \ tools/hciattach_intel.c \ @@ -36,10 +36,10 @@ index e193be9f33aa..52c8581b5b58 100644 tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c diff --git a/tools/hciattach.c b/tools/hciattach.c -index 4dc5be5635c7..d3917a0d503e 100644 +index fad176c9b804..73811d4c4c2a 100644 --- a/tools/hciattach.c +++ b/tools/hciattach.c -@@ -67,6 +67,8 @@ struct uart_t { +@@ -69,6 +69,8 @@ struct uart_t { #define ENABLE_PM 1 #define DISABLE_PM 0 @@ -48,7 +48,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 static volatile sig_atomic_t __io_canceled = 0; static void sig_hup(int sig) -@@ -317,6 +319,12 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti) +@@ -263,6 +265,12 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti) return ath3k_post(fd, u->pm); } @@ -61,7 +61,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 static int qualcomm(int fd, struct uart_t *u, struct termios *ti) { return qualcomm_init(fd, u->speed, ti, u->bdaddr); -@@ -1147,6 +1155,10 @@ struct uart_t uart[] = { +@@ -1093,6 +1101,10 @@ struct uart_t uart[] = { { "ath3k", 0x0000, 0x0000, HCI_UART_ATH3K, 115200, 115200, FLOW_CTL, DISABLE_PM, NULL, ath3k_ps, ath3k_pm }, @@ -72,7 +72,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 /* QUALCOMM BTS */ { "qualcomm", 0x0000, 0x0000, HCI_UART_H4, 115200, 115200, FLOW_CTL, DISABLE_PM, NULL, qualcomm, NULL }, -@@ -1249,6 +1261,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) +@@ -1195,6 +1207,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) goto fail; } @@ -80,7 +80,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 /* Set TTY to N_HCI line discipline */ i = N_HCI; if (ioctl(fd, TIOCSETD, &i) < 0) { -@@ -1265,6 +1278,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) +@@ -1211,6 +1224,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) perror("Can't set device"); goto fail; } @@ -88,7 +88,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 if (u->post && u->post(fd, u, &ti) < 0) goto fail; -@@ -1303,7 +1317,7 @@ int main(int argc, char *argv[]) +@@ -1249,7 +1263,7 @@ int main(int argc, char *argv[]) printpid = 0; raw = 0; @@ -97,7 +97,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 switch(opt) { case 'b': send_break = 1; -@@ -1336,6 +1350,11 @@ int main(int argc, char *argv[]) +@@ -1282,6 +1296,11 @@ int main(int argc, char *argv[]) raw = 1; break; @@ -109,7 +109,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 default: usage(); exit(1); -@@ -1398,6 +1417,7 @@ int main(int argc, char *argv[]) +@@ -1350,6 +1369,7 @@ int main(int argc, char *argv[]) case 5: u->bdaddr = argv[optind]; break; @@ -117,7 +117,7 @@ index 4dc5be5635c7..d3917a0d503e 100644 } } -@@ -1474,12 +1494,15 @@ int main(int argc, char *argv[]) +@@ -1426,12 +1446,15 @@ int main(int argc, char *argv[]) break; } @@ -134,22 +134,24 @@ index 4dc5be5635c7..d3917a0d503e 100644 return 0; } diff --git a/tools/hciattach.h b/tools/hciattach.h -index 909ada871df2..2021c33a9824 100644 +index 4279a3361749..0656a845223c 100644 --- a/tools/hciattach.h +++ b/tools/hciattach.h -@@ -39,8 +39,9 @@ +@@ -39,9 +39,10 @@ #define HCI_UART_H4DS 3 #define HCI_UART_LL 4 #define HCI_UART_ATH3K 5 -#define HCI_UART_INTEL 6 -#define HCI_UART_BCM 7 -+#define HCI_UART_IBS 6 +-#define HCI_UART_QCA 8 ++#define HCI_UART_IBS 6 +#define HCI_UART_INTEL 7 +#define HCI_UART_BCM 8 ++#define HCI_UART_QCA 9 #define HCI_UART_RAW_DEVICE 0 #define HCI_UART_RESET_ON_INIT 1 -@@ -62,6 +63,7 @@ int ath3k_init(int fd, int speed, int init_speed, char *bdaddr, +@@ -63,6 +64,7 @@ int ath3k_init(int fd, int speed, int init_speed, char *bdaddr, struct termios *ti); int ath3k_post(int fd, int pm); int qualcomm_init(int fd, int speed, struct termios *ti, const char *bdaddr); diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0002-bluetooth-Enable-bluetooth-low-power-mode-functional.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch similarity index 91% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0002-bluetooth-Enable-bluetooth-low-power-mode-functional.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch index b0368d0e8..8ba83ae56 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0002-bluetooth-Enable-bluetooth-low-power-mode-functional.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch @@ -14,10 +14,10 @@ Signed-off-by: Rupesh Tatiya 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/hciattach.c b/tools/hciattach.c -index d3917a0d503e..3041e28ff82a 100644 +index 73811d4c4c2a..e3a915061440 100644 --- a/tools/hciattach.c +++ b/tools/hciattach.c -@@ -1156,7 +1156,7 @@ struct uart_t uart[] = { +@@ -1102,7 +1102,7 @@ struct uart_t uart[] = { FLOW_CTL, DISABLE_PM, NULL, ath3k_ps, ath3k_pm }, /* QCA ROME */ diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0003-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0003-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0004-bluetooth-Configure-BD-Address.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0006-bluetooth-Configure-BD-Address.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0004-bluetooth-Configure-BD-Address.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0006-bluetooth-Configure-BD-Address.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0005-bluetooth-Remove-unused-functions-in-the-firmware-do.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0007-bluetooth-Remove-unused-functions-in-the-firmware-do.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0005-bluetooth-Remove-unused-functions-in-the-firmware-do.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0007-bluetooth-Remove-unused-functions-in-the-firmware-do.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0006-bluetooth-Enable-3Mbps-baud-rate-support.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0008-bluetooth-Enable-3Mbps-baud-rate-support.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0006-bluetooth-Enable-3Mbps-baud-rate-support.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0008-bluetooth-Enable-3Mbps-baud-rate-support.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0007-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch similarity index 98% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0007-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch index d92dbfcce..6e276d517 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0007-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch @@ -26,10 +26,10 @@ Signed-off-by: Rupesh Tatiya 3 files changed, 83 insertions(+), 17 deletions(-) diff --git a/tools/hciattach.c b/tools/hciattach.c -index 3041e28ff82a..13f073325c43 100644 +index e3a915061440..c3cf10843303 100644 --- a/tools/hciattach.c +++ b/tools/hciattach.c -@@ -163,16 +163,34 @@ int read_hci_event(int fd, unsigned char* buf, int size) +@@ -109,16 +109,34 @@ int read_hci_event(int fd, unsigned char* buf, int size) { int remain, r; int count = 0; diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0008-bluetooth-Add-support-for-TUFEELO-firmware-download.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0010-bluetooth-Add-support-for-TUFEELO-firmware-download.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0008-bluetooth-Add-support-for-TUFEELO-firmware-download.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0010-bluetooth-Add-support-for-TUFEELO-firmware-download.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0009-bluetooth-Add-support-for-ROME-3.2-SOC.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0011-bluetooth-Add-support-for-ROME-3.2-SOC.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0009-bluetooth-Add-support-for-ROME-3.2-SOC.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0011-bluetooth-Add-support-for-ROME-3.2-SOC.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0010-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0012-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0010-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0012-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0011-bluetooth-Add-support-for-multi-baud-rate.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0013-bluetooth-Add-support-for-multi-baud-rate.patch similarity index 97% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0011-bluetooth-Add-support-for-multi-baud-rate.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0013-bluetooth-Add-support-for-multi-baud-rate.patch index 05a06061e..8b19376ba 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0011-bluetooth-Add-support-for-multi-baud-rate.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0013-bluetooth-Add-support-for-multi-baud-rate.patch @@ -15,10 +15,10 @@ Change-Id: I4bbaf7db01ffb983c38dca7c4a4a56f579c678a8 4 files changed, 119 insertions(+), 17 deletions(-) diff --git a/tools/hciattach.c b/tools/hciattach.c -index 13f073325c43..6de4129dfd8f 100644 +index c3cf10843303..dda639cabca3 100644 --- a/tools/hciattach.c +++ b/tools/hciattach.c -@@ -340,7 +340,7 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti) +@@ -286,7 +286,7 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti) static int qca(int fd, struct uart_t *u, struct termios *ti) { fprintf(stderr,"qca\n"); @@ -28,10 +28,10 @@ index 13f073325c43..6de4129dfd8f 100644 static int qualcomm(int fd, struct uart_t *u, struct termios *ti) diff --git a/tools/hciattach.h b/tools/hciattach.h -index 2021c33a9824..c5aa495ac3ee 100644 +index 0656a845223c..49e59321fcac 100644 --- a/tools/hciattach.h +++ b/tools/hciattach.h -@@ -63,7 +63,7 @@ int ath3k_init(int fd, int speed, int init_speed, char *bdaddr, +@@ -64,7 +64,7 @@ int ath3k_init(int fd, int speed, int init_speed, char *bdaddr, struct termios *ti); int ath3k_post(int fd, int pm); int qualcomm_init(int fd, int speed, struct termios *ti, const char *bdaddr); diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0012-Override-PCM-Settings-by-reading-configuration-file.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0014-Override-PCM-Settings-by-reading-configuration-file.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0012-Override-PCM-Settings-by-reading-configuration-file.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0014-Override-PCM-Settings-by-reading-configuration-file.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0013-Add-support-for-Tufello-1.1-SOC.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0015-Add-support-for-Tufello-1.1-SOC.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0013-Add-support-for-Tufello-1.1-SOC.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0015-Add-support-for-Tufello-1.1-SOC.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0014-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0016-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0014-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0016-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0015-Override-IBS-settings-by-reading-configuration-file.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0017-Override-IBS-settings-by-reading-configuration-file.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0015-Override-IBS-settings-by-reading-configuration-file.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0017-Override-IBS-settings-by-reading-configuration-file.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0016-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch similarity index 88% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0016-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch index 19bd40406..003364c2c 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0016-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch @@ -14,10 +14,10 @@ Signed-off-by: Kamal Negi 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c -index d66f67032624..9fa939d9548b 100644 +index c100149acf42..d8cb0ed96a1f 100644 --- a/profiles/audio/avrcp.c +++ b/profiles/audio/avrcp.c -@@ -1808,13 +1808,19 @@ static gboolean avrcp_get_play_status_rsp(struct avctp *conn, +@@ -2082,13 +2082,19 @@ static gboolean avrcp_get_play_status_rsp(struct avctp *conn, uint8_t code, void *user_data) { struct avrcp *session = user_data; @@ -39,7 +39,7 @@ index d66f67032624..9fa939d9548b 100644 if (pdu == NULL || code == AVC_CTYPE_REJECTED || ntohs(pdu->params_len) != 9) return FALSE; -@@ -1872,12 +1878,18 @@ static gboolean avrcp_player_value_rsp(struct avctp *conn, +@@ -2146,12 +2152,18 @@ static gboolean avrcp_player_value_rsp(struct avctp *conn, uint8_t code, void *user_data) { struct avrcp *session = user_data; @@ -60,7 +60,7 @@ index d66f67032624..9fa939d9548b 100644 if (pdu == NULL) { media_player_set_setting(mp, "Error", "Timeout"); return FALSE; -@@ -2028,10 +2040,15 @@ static gboolean avrcp_get_element_attributes_rsp(struct avctp *conn, +@@ -2303,10 +2315,15 @@ static gboolean avrcp_get_element_attributes_rsp(struct avctp *conn, void *user_data) { struct avrcp *session = user_data; diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0017-bluetooth-Fix-flow-control-operation.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0019-bluetooth-Fix-flow-control-operation.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0017-bluetooth-Fix-flow-control-operation.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0019-bluetooth-Fix-flow-control-operation.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0018-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0020-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0018-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0020-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0019-Bluetooth-Fix-static-analysis-issues.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0021-Bluetooth-Fix-static-analysis-issues.patch similarity index 66% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0019-Bluetooth-Fix-static-analysis-issues.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0021-Bluetooth-Fix-static-analysis-issues.patch index 2b382a68e..97a865291 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0019-Bluetooth-Fix-static-analysis-issues.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0021-Bluetooth-Fix-static-analysis-issues.patch @@ -4,30 +4,9 @@ Subject: [PATCH] Bluetooth: Fix static analysis issues Change-Id: Ida91f012544c39a8aaa6e7db23f1d5b68d3bec08 --- - tools/hciattach.c | 9 ++++++++- tools/hciattach_rome.c | 10 ++++++++-- - 2 files changed, 16 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 2 deletions(-) -diff --git a/tools/hciattach.c b/tools/hciattach.c -index 6de4129dfd8f..c9a5feffca2b 100644 ---- a/tools/hciattach.c -+++ b/tools/hciattach.c -@@ -1395,7 +1395,14 @@ int main(int argc, char *argv[]) - dev[0] = 0; - if (!strchr(opt, '/')) - strcpy(dev, "/dev/"); -- strcat(dev, opt); -+ -+ if (strlen(opt) + 1 > sizeof(dev) - strlen(dev)) { -+ fprintf(stderr, "error: string truncated\n"); -+ exit(1); -+ } -+ -+ strncat(dev, opt, sizeof(dev) - strlen(dev) - 1); -+ - break; - - case 1: diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c index 1891de24e21a..59bdc16e4e8f 100644 --- a/tools/hciattach_rome.c diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0023-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0022-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch similarity index 99% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0023-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0022-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch index 87424fb5b..9420aacfb 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.33/ccimx6ul/0023-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0022-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch @@ -19,7 +19,7 @@ index 59bdc16e4e8f..4f0f8c82fa8d 100644 @@ -1903,15 +1903,8 @@ download: } fprintf(stderr, "%s: Download TLV file successfully \n", __FUNCTION__); - + - /* - * Overriding the baud rate value in NVM file with the user - * requested baud rate, since default baud rate in NVM file is 3M. @@ -31,6 +31,6 @@ index 59bdc16e4e8f..4f0f8c82fa8d 100644 - } + /* Do not override the baudrate in the TLV file */ + fprintf(stderr, "%s: Skipping Override of baud rate!\n", __FUNCTION__); - + /* Perform HCI reset here*/ err = rome_hci_reset_req(fd, local_baud_rate); diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.33.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.33.bbappend deleted file mode 100644 index 06497331d..000000000 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.33.bbappend +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2015 Digi International. - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" - -SRC_URI += " \ - file://bluez-init \ - file://0021-hcitool-do-not-show-unsupported-refresh-option.patch \ - file://0022-hcitool-increase-the-shown-connection-limit-to-20.patch \ -" - -SRC_URI_append_ccimx6ul = " \ - file://0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch \ - file://0002-bluetooth-Enable-bluetooth-low-power-mode-functional.patch \ - file://0003-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch \ - file://0004-bluetooth-Configure-BD-Address.patch \ - file://0005-bluetooth-Remove-unused-functions-in-the-firmware-do.patch \ - file://0006-bluetooth-Enable-3Mbps-baud-rate-support.patch \ - file://0007-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch \ - file://0008-bluetooth-Add-support-for-TUFEELO-firmware-download.patch \ - file://0009-bluetooth-Add-support-for-ROME-3.2-SOC.patch \ - file://0010-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch \ - file://0011-bluetooth-Add-support-for-multi-baud-rate.patch \ - file://0012-Override-PCM-Settings-by-reading-configuration-file.patch \ - file://0013-Add-support-for-Tufello-1.1-SOC.patch \ - file://0014-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch \ - file://0015-Override-IBS-settings-by-reading-configuration-file.patch \ - file://0016-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch \ - file://0017-bluetooth-Fix-flow-control-operation.patch \ - file://0018-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch \ - file://0019-Bluetooth-Fix-static-analysis-issues.patch \ - file://0023-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch \ -" - -inherit update-rc.d - -PACKAGECONFIG_append = " experimental" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/bluez-init ${D}${sysconfdir}/init.d/bluez -} - -INITSCRIPT_NAME = "bluez" -INITSCRIPT_PARAMS = "start 10 5 ." - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend new file mode 100644 index 000000000..289cb66b7 --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend @@ -0,0 +1,46 @@ +# Copyright (C) 2015 Digi International. + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" + +SRC_URI += " \ + file://bluez-init \ + file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \ + file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \ +" + +SRC_URI_append_ccimx6ul = " \ + file://0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch \ + file://0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch \ + file://0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch \ + file://0006-bluetooth-Configure-BD-Address.patch \ + file://0007-bluetooth-Remove-unused-functions-in-the-firmware-do.patch \ + file://0008-bluetooth-Enable-3Mbps-baud-rate-support.patch \ + file://0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch \ + file://0010-bluetooth-Add-support-for-TUFEELO-firmware-download.patch \ + file://0011-bluetooth-Add-support-for-ROME-3.2-SOC.patch \ + file://0012-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch \ + file://0013-bluetooth-Add-support-for-multi-baud-rate.patch \ + file://0014-Override-PCM-Settings-by-reading-configuration-file.patch \ + file://0015-Add-support-for-Tufello-1.1-SOC.patch \ + file://0016-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch \ + file://0017-Override-IBS-settings-by-reading-configuration-file.patch \ + file://0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch \ + file://0019-bluetooth-Fix-flow-control-operation.patch \ + file://0020-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch \ + file://0021-Bluetooth-Fix-static-analysis-issues.patch \ + file://0022-hciattach_rome-do-not-override-the-baudrate-in-the-N.patch \ +" + +inherit update-rc.d + +PACKAGECONFIG_append = " experimental" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/bluez-init ${D}${sysconfdir}/init.d/bluez +} + +INITSCRIPT_NAME = "bluez" +INITSCRIPT_PARAMS = "start 10 5 ." + +PACKAGE_ARCH = "${MACHINE_ARCH}"