system/bt
| Revision | eeb0c5f7368b2d21a3ab0ee2205177830710f610 (tree) |
|---|---|
| Time | 2016-10-03 22:02:00 |
| Author | Zhao Wei Liew <zhaoweiliew@gmai...> |
| Commiter | Gerrit Code Review |
bt: Select H4 HCI driver when QC bluetooth prop is unset
This restores the default AOSP behaviour, which also happens
to be the behaviour we had in CM 13.
Change-Id: I5a23575467fa0f823f0d778b7cf127ad1565916e
hci/src/hci_hal.c (diff) hci/src/hci_layer.c (diff)
utils/include/bt_utils.h (diff)| @@ -31,7 +31,8 @@ bt_soc_type soc_type; | ||
| 31 | 31 | const hci_hal_t *hci_hal_get_interface() { |
| 32 | 32 | soc_type = get_soc_type(); |
| 33 | 33 | |
| 34 | - if (soc_type == BT_SOC_ROME || soc_type == BT_SOC_CHEROKEE) { | |
| 34 | + if (soc_type == BT_SOC_ROME || soc_type == BT_SOC_CHEROKEE | |
| 35 | + || soc_type == BT_SOC_DEFAULT) { | |
| 35 | 36 | return hci_hal_h4_get_interface(); |
| 36 | 37 | } else { |
| 37 | 38 | return hci_hal_mct_get_interface(); |
| @@ -103,7 +103,7 @@ typedef struct { | ||
| 103 | 103 | |
| 104 | 104 | typedef enum { |
| 105 | 105 | BT_SOC_DEFAULT = 0, |
| 106 | - BT_SOC_SMD = BT_SOC_DEFAULT, | |
| 106 | + BT_SOC_SMD, | |
| 107 | 107 | BT_SOC_AR3K, |
| 108 | 108 | BT_SOC_ROME, |
| 109 | 109 | BT_SOC_CHEROKEE, |
| @@ -53,7 +53,7 @@ typedef enum { | ||
| 53 | 53 | |
| 54 | 54 | typedef enum { |
| 55 | 55 | BT_SOC_DEFAULT = 0, |
| 56 | - BT_SOC_SMD = BT_SOC_DEFAULT, | |
| 56 | + BT_SOC_SMD, | |
| 57 | 57 | BT_SOC_AR3K, |
| 58 | 58 | BT_SOC_ROME, |
| 59 | 59 | BT_SOC_CHEROKEE, |
Fork