Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bluez: fix type of pcm_value and ibs_value variables 

Those variables are used to hold integer data parsed from bluetooth
config file. The parsing function "get_value_from_config" returns an INT,
so the variables cannot be unsigned.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2022-06-23 11:03:41 +02:00
parent c6b55f492f
commit 91e6b56735
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch
View File

@ -244,7 +244,7 @@ index 26c0d542434d..96ff9e38cfda 100644
const char *bdaddr); const char *bdaddr);
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
new file mode 100644 new file mode 100644
index 000000000000..59bdc16e4e8f index 000000000000..61db275078d3
--- /dev/null --- /dev/null
+++ b/tools/hciattach_rome.c +++ b/tools/hciattach_rome.c
@@ -0,0 +1,1941 @@ @@ -0,0 +1,1941 @@
@ -1172,7 +1172,7 @@ index 000000000000..59bdc16e4e8f
+ unsigned char data_buf[PRINT_BUF_SIZE]={0,}; + unsigned char data_buf[PRINT_BUF_SIZE]={0,};
+ unsigned char *nvm_byte_ptr; + unsigned char *nvm_byte_ptr;
+ unsigned char bdaddr[6]; + unsigned char bdaddr[6];
+ unsigned short pcm_value, ibs_value; + int pcm_value, ibs_value;
+ +
+ fprintf(stderr, "File Open (%s)\n", file_path); + fprintf(stderr, "File Open (%s)\n", file_path);
+ pFile = fopen ( file_path , "r" ); + pFile = fopen ( file_path , "r" );

2
meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch
View File

@ -44,7 +44,7 @@ index 96ff9e38cfda..4370a87ca3af 100644
int bcm43xx_init(int fd, int def_speed, int speed, struct termios *ti, int bcm43xx_init(int fd, int def_speed, int speed, struct termios *ti,
const char *bdaddr); const char *bdaddr);
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
index 59bdc16e4e8f..ee67bb068c09 100644 index 61db275078d3..39f7e77c4bd5 100644
--- a/tools/hciattach_rome.c --- a/tools/hciattach_rome.c
+++ b/tools/hciattach_rome.c +++ b/tools/hciattach_rome.c
@@ -1565,7 +1565,8 @@ static void flow_control(int fd, int opt) @@ -1565,7 +1565,8 @@ static void flow_control(int fd, int opt)

4
meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch
View File

@ -35,7 +35,7 @@ index b94eb5ad1a5b..cdef3e206931 100644
case 2: case 2:
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
index ee67bb068c09..854cfff707aa 100644 index 39f7e77c4bd5..03727d7935da 100644
--- a/tools/hciattach_rome.c --- a/tools/hciattach_rome.c
+++ b/tools/hciattach_rome.c +++ b/tools/hciattach_rome.c
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
@ -60,7 +60,7 @@ index ee67bb068c09..854cfff707aa 100644
unsigned char data_buf[PRINT_BUF_SIZE]={0,}; unsigned char data_buf[PRINT_BUF_SIZE]={0,};
unsigned char *nvm_byte_ptr; unsigned char *nvm_byte_ptr;
- unsigned char bdaddr[6]; - unsigned char bdaddr[6];
unsigned short pcm_value, ibs_value; int pcm_value, ibs_value;
fprintf(stderr, "File Open (%s)\n", file_path); fprintf(stderr, "File Open (%s)\n", file_path);
@@ -1008,12 +1008,15 @@ int rome_get_tlv_file(char *file_path) @@ -1008,12 +1008,15 @@ int rome_get_tlv_file(char *file_path)

4
meta-digi-dey/recipes-connectivity/bluez/bluez5-5.64/0008-hciattach-Add-verbosity-option.patch
View File

@ -86,7 +86,7 @@ index cdef3e206931..f5ee540c58f3 100644
usage(); usage();
exit(1); exit(1);
diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c diff --git a/tools/hciattach_rome.c b/tools/hciattach_rome.c
index 854cfff707aa..40983fc087c0 100644 index 03727d7935da..9f8e946235be 100644
--- a/tools/hciattach_rome.c --- a/tools/hciattach_rome.c
+++ b/tools/hciattach_rome.c +++ b/tools/hciattach_rome.c
@@ -139,7 +139,7 @@ unsigned char userial_to_tcio_baud(unsigned char cfg_baud, unsigned int *baud) @@ -139,7 +139,7 @@ unsigned char userial_to_tcio_baud(unsigned char cfg_baud, unsigned int *baud)
@ -453,7 +453,7 @@ index 854cfff707aa..40983fc087c0 100644
c = fgetc (file); c = fgetc (file);
@@ -924,7 +923,7 @@ int rome_get_tlv_file(char *file_path, unsigned char * bdaddr) @@ -924,7 +923,7 @@ int rome_get_tlv_file(char *file_path, unsigned char * bdaddr)
unsigned char *nvm_byte_ptr; unsigned char *nvm_byte_ptr;
unsigned short pcm_value, ibs_value; int pcm_value, ibs_value;
- fprintf(stderr, "File Open (%s)\n", file_path); - fprintf(stderr, "File Open (%s)\n", file_path);
+ hciprintf(stderr, "File Open (%s)\n", file_path); + hciprintf(stderr, "File Open (%s)\n", file_path);