projects / platform / adaptation / bluetooth-firmware-bcm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: defd059)
Fix the build warning errors 47/70647/1 submit/tizen/20160520.044630
authorDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 20 May 2016 03:57:31 +0000 (12:57 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 20 May 2016 04:24:03 +0000 (13:24 +0900)
Change-Id: Ia164668240cced624f2cf2ef4b722e48e63595c8
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
CMakeLists.txt patch | blob | history
set-address/setbd.c patch | blob | history
tools/bcmtool_4330b1.c patch | blob | history
tools/bcmtool_4343w.c patch | blob | history
tools/bcmtool_4358a1.c patch | blob | history

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0285fa..919624a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ FOREACH(flag ${package_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 
 ADD_SUBDIRECTORY(set-address)
 ADD_SUBDIRECTORY(tools)
diff --git a/set-address/setbd.c b/set-address/setbd.c
index 013a92f..49f9525 100644 (file)
--- a/set-address/setbd.c
+++ b/set-address/setbd.c
@@ -87,6 +87,7 @@ int addremoveBD(char* path, char* pskey){
        }
 
        ret = fputs(pskey,new);
+       APP_DBG("fputs ret: %d", ret);
 
        while(1){
                result = fgets(cmp, READ_BD_FILE_MAX, fd);
@@ -106,6 +107,7 @@ int addremoveBD(char* path, char* pskey){
                }
 
                ret = fputs(cmp,new);
+               APP_DBG("fputs ret: %d", ret);
        }
 
        return 0;
@@ -202,10 +204,12 @@ int make_bt_address(gboolean overwrite_bt_address)
 #if defined(BT_CHIP_CSR) || defined(BT_CHIP_BROADCOM)
 
        int fd;
-       int i;
        unsigned char txt[BD_ADDR_LEN];
        unsigned char nap[4+1], uap[2+1], lap[6+1];
+#if defined(BT_CHIP_CSR)
+       int i;
        char pskey[PSKEY_LEN+3];
+#endif
        int ret;
 
        fd=open(BD_ADDR_FILE, O_RDONLY | O_SYNC);
diff --git a/tools/bcmtool_4330b1.c b/tools/bcmtool_4330b1.c
index 6350a06..e9947f6 100644 (file)
--- a/tools/bcmtool_4330b1.c
+++ b/tools/bcmtool_4330b1.c
@@ -238,7 +238,9 @@ UINT8 SendCommand(UINT16 opcode, UINT8 param_len, UINT8 *p_param_buf)
 
     dump(pbuf, param_len+4);
 
-    write(fd, pbuf, param_len+4);
+       if (write(fd, pbuf, param_len + 4) < 0)
+               DEBUG0("Fail to write pbuf");
+
     return 0;
 }
 
@@ -346,6 +348,7 @@ UINT8 DownloadPatchram( char *patchram1 )
     UINT32 len;
     char   prm[128] ={0,};
     FILE* pFile = NULL;
+       size_t size;
 
     INT32 FileSize=0;
     INT32 SentSize=0;
@@ -385,9 +388,11 @@ UINT8 DownloadPatchram( char *patchram1 )
 
         len = buffer[3];
 
-        fread(&buffer[4],sizeof(UINT8),len, pFile);
+               size = fread(&buffer[4], sizeof(UINT8), len, pFile);
+               fprintf(stderr, "fread size: %d\n", size);
 
-        write(fd, buffer, len + 4);
+               size = write(fd, buffer, len + 4);
+               fprintf(stderr, "write size: %d\n", size);
 
         /* dispaly progress*/
         SentSize += (len + 3);
@@ -781,13 +786,16 @@ int main(int argc, char *argv[])
             {
                 char text[BTUI_MAX_STRING_LENGTH_PER_LINE];
 
-                fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
                 sscanf(text,"%02x%02x",&bdaddr[0],&bdaddr[1]);
 
-                fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
                 sscanf(text,"%02x",&bdaddr[2]);
 
-                fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
                 sscanf(text,"%02x%02x%02x",&bdaddr[3],&bdaddr[4],&bdaddr[5]);
 
                 fprintf(stderr,"Writing B/D Address = %02X:%02X:%02X:%02X:%02X:%02X\n",bdaddr[0],bdaddr[1],bdaddr[2],bdaddr[3],bdaddr[4],bdaddr[5]);
diff --git a/tools/bcmtool_4343w.c b/tools/bcmtool_4343w.c
index 1335452..4fdbfc4 100644 (file)
--- a/tools/bcmtool_4343w.c
+++ b/tools/bcmtool_4343w.c
@@ -245,7 +245,9 @@ UINT8 SendCommand(UINT16 opcode, UINT8 param_len, UINT8 * p_param_buf)
 
        dump(pbuf, param_len + 4);
 
-       write(fd, pbuf, param_len + 4);
+       if (write(fd, pbuf, param_len + 4) < 0)
+               DEBUG0("Fail to write pbuf");
+
        return 0;
 }
 
@@ -346,8 +348,11 @@ UINT8 DownloadPatchram(char *patchram1)
        UINT32 len;
        char prm[128] = { 0, };
        FILE *pFile = NULL;
+       size_t size;
 
+#if 0
        INT32 FileSize = 0;
+#endif
        INT32 SentSize = 0;
 
        DEBUG1("\n%s\n", patchram1);
@@ -371,7 +376,10 @@ UINT8 DownloadPatchram(char *patchram1)
                        errno);
                exit_err(1);
        }
+
+#if 0
        FileSize = filesize(prm);
+#endif
 
        SendCommand(HCI_BRCM_DOWNLOAD_MINI_DRV, 0, NULL);
        read_event(fd, buffer);
@@ -383,9 +391,11 @@ UINT8 DownloadPatchram(char *patchram1)
 
                len = buffer[3];
 
-               fread(&buffer[4], sizeof(UINT8), len, pFile);
+               size = fread(&buffer[4], sizeof(UINT8), len, pFile);
+               fprintf(stderr, "fread size: %d\n", size);
 
-               write(fd, buffer, len + 4);
+               size = write(fd, buffer, len + 4);
+               fprintf(stderr, "write size: %d\n", size);
 
                /* dispaly progress */
                SentSize += (len + 3);
@@ -893,19 +903,24 @@ int main(int argc, char *argv[])
                        }
 
                        if (pFile) {
+//                             char *ptr;
+
                                char text[BTUI_MAX_STRING_LENGTH_PER_LINE];
 
-                               fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE,
-                                     pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
+
                                sscanf(text, "%02x%02x", &bdaddr[0],
                                       &bdaddr[1]);
 
-                               fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE,
-                                     pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
+
                                sscanf(text, "%02x", &bdaddr[2]);
 
-                               fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE,
-                                     pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
+
                                sscanf(text, "%02x%02x%02x", &bdaddr[3],
                                       &bdaddr[4], &bdaddr[5]);
 
diff --git a/tools/bcmtool_4358a1.c b/tools/bcmtool_4358a1.c
index b35da8e..8f6d95e 100644 (file)
--- a/tools/bcmtool_4358a1.c
+++ b/tools/bcmtool_4358a1.c
@@ -238,7 +238,9 @@ UINT8 SendCommand(UINT16 opcode, UINT8 param_len, UINT8 *p_param_buf)
 
     dump(pbuf, param_len+4);
 
-    write(fd, pbuf, param_len+4);
+    if (write(fd, pbuf, param_len+4) < 0)
+               DEBUG0("Fail to write pbuf");
+
     return 0;
 }
 
@@ -346,6 +348,7 @@ UINT8 DownloadPatchram( char *patchram1 )
     UINT32 len;
     char   prm[128] ={0,};
     FILE* pFile = NULL;
+       size_t size;
 
     INT32 FileSize=0;
     INT32 SentSize=0;
@@ -385,9 +388,11 @@ UINT8 DownloadPatchram( char *patchram1 )
 
         len = buffer[3];
 
-        fread(&buffer[4],sizeof(UINT8),len, pFile);
+               size = fread(&buffer[4], sizeof(UINT8), len, pFile);
+               fprintf(stderr, "fread size: %d\n", size);
 
-        write(fd, buffer, len + 4);
+               size = write(fd, buffer, len + 4);
+               fprintf(stderr, "write size: %d\n", size);
 
         /* dispaly progress*/
         SentSize += (len + 3);
@@ -781,13 +786,16 @@ int main(int argc, char *argv[])
             {
                 char text[BTUI_MAX_STRING_LENGTH_PER_LINE];
 
-                fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
                 sscanf(text,"%02x%02x",&bdaddr[0],&bdaddr[1]);
 
-                fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
                 sscanf(text,"%02x",&bdaddr[2]);
 
-                fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile);
+                               if (!fgets(text, BTUI_MAX_STRING_LENGTH_PER_LINE, pFile))
+                                       fprintf(stderr, "fail to fgets");
                 sscanf(text,"%02x%02x%02x",&bdaddr[3],&bdaddr[4],&bdaddr[5]);
 
                 fprintf(stderr,"Writing B/D Address = %02X:%02X:%02X:%02X:%02X:%02X\n",bdaddr[0],bdaddr[1],bdaddr[2],bdaddr[3],bdaddr[4],bdaddr[5]);
Domain: Network & Connectivity / Bluetooth;