tools: Make hciattach_* firmware path build-time configurable

Make hciattach_qualcomm.c and hciattach_tialt.c behave the same way
as hciattach_bcm43xx.c does, where FIRMWARE_DIR can be overridden
at build time by using -DFIRMWARE_DIR= CFLAGS.

Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/tools/hciattach.h b/tools/hciattach.h
index dda33db..53e29b2 100755 (executable)
--- a/tools/hciattach.h
+++ b/tools/hciattach.h
@@ -40,6 +40,14 @@
 #define HCI_UART_EXT_CONFIG    4
 #define HCI_UART_VND_DETECT    5
 
+#ifndef FIRMWARE_DIR
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+#define FIRMWARE_DIR "/usr/etc/bluetooth"
+#else
+#define FIRMWARE_DIR "/etc/firmware"
+#endif
+#endif
+
 int read_hci_event(int fd, unsigned char *buf, int size);
 int set_speed(int fd, struct termios *ti, int speed);
 int uart_speed(int speed);

diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c
index 2f6467c..7fbeec1 100755 (executable)
--- a/tools/hciattach_bcm43xx.c
+++ b/tools/hciattach_bcm43xx.c
@@ -29,14 +29,6 @@
 
 #include "hciattach.h"
 
-#ifndef FIRMWARE_DIR
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-#define FIRMWARE_DIR "/usr/etc/bluetooth"
-#else
-#define FIRMWARE_DIR "/etc/firmware"
-#endif
-#endif
-
 #define FW_EXT ".hcd"
 
 #define BCM43XX_CLOCK_48 1

diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c
index 231ca72..2fcf54b 100755 (executable)
--- a/tools/hciattach_qualcomm.c
+++ b/tools/hciattach_qualcomm.c
@@ -221,7 +221,8 @@ int qualcomm_init(int fd, int speed, struct termios *ti, const char *bdaddr)
 
        } while (resp[3] != 0 && resp[4] != 2);
 
-       snprintf(fw, sizeof(fw), "/etc/firmware/%c%c%c%c%c%c_%c%c%c%c.bin",
+       snprintf(fw, sizeof(fw), "%s/%c%c%c%c%c%c_%c%c%c%c.bin",
+                               FIRMWARE_DIR,
                                resp[18], resp[19], resp[20], resp[21],
                                resp[22], resp[23],
                                resp[32], resp[33], resp[34], resp[35]);

diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c
index a7e02c7..fa9efb4 100755 (executable)
--- a/tools/hciattach_tialt.c
+++ b/tools/hciattach_tialt.c
@@ -220,7 +220,8 @@ int texasalt_init(int fd, int speed, struct termios *ti)
                                ((brf_chip > 7) ? "unknown" : c_brf_chip[brf_chip]),
                                brf_chip);
 
-               sprintf(fw, "/etc/firmware/%s.bin",
+               sprintf(fw, "%s/%s.bin",
+                       FIRMWARE_DIR,
                        (brf_chip > 7) ? "unknown" : c_brf_chip[brf_chip]);
                texas_load_firmware(fd, fw);