| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-06-26 10:04:27 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-06-26 10:04:27 (GMT) |
| commit | 96569f25fb0bde6d2be90ea1e69f081d5eed5fe0 (patch) | |
| tree | 113c2d597276e283965c5bf5beec2735e9e8b111 | |
| parent | c84f84088da26b9d8c7a58ab47982983e80d7f5b (diff) | |
| parent | 149751f768db31d8b18ef762a4c22c7a30a4320f (diff) | |
| download | libbt-96569f25fb0bde6d2be90ea1e69f081d5eed5fe0.zip libbt-96569f25fb0bde6d2be90ea1e69f081d5eed5fe0.tar.gz libbt-96569f25fb0bde6d2be90ea1e69f081d5eed5fe0.tar.bz2 | |
Merge "PD#146292 bt: fix o-amlogic make fail issue" into m-amlogic
| -rw-r--r-- | include/bt_vendor_brcm.h | 4 | ||||
| -rwxr-xr-x | src/hardware.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/bt_vendor_brcm.h b/include/bt_vendor_brcm.h index 9887081..8583279 100644 --- a/include/bt_vendor_brcm.h +++ b/include/bt_vendor_brcm.h @@ -51,8 +51,12 @@ /* Run-time configuration file */ #ifndef VENDOR_LIB_CONF_FILE +#ifdef O_AMLOGIC +#define VENDOR_LIB_CONF_FILE "/vendor/etc/bluetooth/bt_vendor.conf" +#else #define VENDOR_LIB_CONF_FILE "/etc/bluetooth/bt_vendor.conf" #endif +#endif /* Device port name where Bluetooth controller attached */ #ifndef BLUETOOTH_UART_DEVICE_PORT diff --git a/src/hardware.c b/src/hardware.c index 435f1a4..ac4f240 100755 --- a/src/hardware.c +++ b/src/hardware.c @@ -1497,9 +1497,11 @@ int hw_set_audio_state(bt_vendor_op_audio_state_t *p_state) *******************************************************************************/ int hw_set_patch_file_path(char *p_conf_name, char *p_conf_value, int param) { - - strcpy(fw_patchfile_path, p_conf_value); - +#ifdef O_AMLOGIC + strcpy(fw_patchfile_path, "/vendor/etc/bluetooth/"); +#else + strcpy(fw_patchfile_path, "/etc/bluetooth/"); +#endif return 0; } |