korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-24 04:34:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools: Make hciattach_* firmware path build-time configurable

Browse Source 
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.
This commit is contained in:
Marek Vasut 2022-11-01 12:53:33 +01:00 committed by Luiz Augusto von Dentz
parent b3f76b30ec
commit d925324836
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/hciattach.h
View File

@ -40,6 +40,10 @@
#define HCI_UART_EXT_CONFIG 4
#define HCI_UART_VND_DETECT 5
#ifndef FIRMWARE_DIR
#define FIRMWARE_DIR "/etc/firmware"
#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);

4
tools/hciattach_bcm43xx.c
View File

@ -30,10 +30,6 @@
#include "hciattach.h"
#ifndef FIRMWARE_DIR
#define FIRMWARE_DIR "/etc/firmware"
#endif
#define FW_EXT ".hcd"
#define BCM43XX_CLOCK_48 1

3
tools/hciattach_qualcomm.c
View File

@ -222,7 +222,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]);

3
tools/hciattach_tialt.c
View File

@ -221,7 +221,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);