summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2017-01-18 19:05:03 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2017-01-18 19:09:51 +0200
commiteccf03265f209363c00b3767fbf1eec9907a3d70 (patch)
treefad71a6ebd55d3400684ebb12aa328bf4d403be5 /tests
parent033b5e9a7de8fa17abcd1f2fc4bd09f421383a34 (diff)
parent1f35d4720478a272c6e684eaadbc9c3285bbc7dd (diff)
Merge bluetooth branch into master
- New SPI HCI driver for ST BlueNRG modules - More memory optimizations through TX buffer pool consolidation - Refactoring to take advantage of new IS_ENABLED() macro - Fixes to LE L2CAP Credit-based Flow Control - Various smaller fixes & enhancements here and there ---------------------------------------------------------------- Arkadiusz Lichwa (2): Bluetooth: UUID: Fix format specifier in 128-UUID Bluetooth: ATT: Fix redundant sys_slist call Arun Jagadish (1): Bluetooth: AVDTP: Added params to AVDTP Request structure Carles Cufi (1): bluetooth: hci_core: Fix conn params validity check Jaganath Kanakkassery (1): Bluetooth: RFCOMM: Implement Aggregate Flow Control Johan Hedberg (21): Bluetooth: Consolidate most outgoing ACL TX buffers into a single pool Bluetooth: Use the controller bt_rand() whenever possible Bluetooth: Controller: Rename hci_le_rand to bt_rand Bluetooth: hci_uart: Remove redundant idle & ISR stack size values Bluetooth: Remove unused bt_hci_driver_unregister() API Bluetooth: Add missing documentation to HCI driver APIs Bluetooth: GATT: Fix missing connection address comparison Bluetooth: ATT: Add new error code from CSSv7 Bluetooth: Prefer struct bt_le_conn_param over individual values Bluetooth: Add documentation for connection callbacks Bluetooth: Remove ACL details from BT_BUF_RX_SIZE Bluetooth: L2CAP: Remove RECV_RESERVE from BT_L2CAP_RX_MTU Bluetooth: Introduce a new connection parameter request callback Bluetooth: Take advantage of IS_ENABLED macro for BT_DBG Bluetooth: Add __printf_like annotation for bt_log Bluetooth: drivers/nble: Remove bogus BT_DBG manipulation Bluetooth: hci_core: Take advantage of IS_ENABLED whenever possible Bluetooth: conn: Take advantage of IS_ENABLED whenever possible Bluetooth: L2CAP: Take advantage of IS_ENABLED whenever possible Bluetooth: SMP: Take advantage of IS_ENABLED whenever possible Bluetooth: Don't select TinyCrypt RNG for combined builds Lee Jones (5): pinmux/stm32l4: Add support for STM32L SPI1 and SPI3 pinmux/nucleo_l476rg: Define pinmuxing for SPI1 and SPI3 Bluetooth: Add HCI SPI driver Bluetooth: samples/beacon: Print message at start of sample Bluetooth: Kconfig: Specify stack size for Bluetooth SPI Luiz Augusto von Dentz (4): Bluetooth: L2CAP: Fix using CONFIG_BLUETOOTH_RX_BUF_LEN as MTU Bluetooth: IPSP: Reuse buffer fragments instead of copying Bluetooth: L2CAP: Make sure state is correctly updated Bluetooth: L2CAP: Fix always using RX_BUF_COUNT as initial credits Sathish Narasimman (1): Bluetooth: AT: Rename enum at_cmd_type elements drivers/bluetooth/hci/Kconfig | 81 +++ drivers/bluetooth/hci/Makefile | 1 + drivers/bluetooth/hci/h4.c | 8 +- drivers/bluetooth/hci/h5.c | 8 +- drivers/bluetooth/hci/spi.c | 351 ++++++++++++ drivers/bluetooth/nble/conn.c | 8 +- drivers/bluetooth/nble/gap.c | 13 +- drivers/bluetooth/nble/gatt.c | 8 +- drivers/bluetooth/nble/rpc_deserialize.c | 27 +- drivers/bluetooth/nble/rpc_serialize.c | 5 - drivers/bluetooth/nble/smp.c | 3 +- drivers/bluetooth/nble/uart.c | 6 +- drivers/bluetooth/nrf51_pm.c | 1 + .../pinmux/stm32/pinmux_board_nucleo_l476rg.c | 12 + drivers/pinmux/stm32/pinmux_stm32l4x.h | 10 + include/bluetooth/att.h | 1 + include/bluetooth/buf.h | 1 - include/bluetooth/conn.h | 81 ++- include/bluetooth/l2cap.h | 2 + include/bluetooth/log.h | 40 +- include/drivers/bluetooth/hci_driver.h | 106 +++- samples/bluetooth/beacon/src/main.c | 2 + samples/bluetooth/hci_uart/nrf5.conf | 2 - samples/bluetooth/ipsp/src/main.c | 35 +- subsys/bluetooth/controller/hal/nrf5/rand.c | 2 +- subsys/bluetooth/controller/hal/rand.h | 2 +- subsys/bluetooth/controller/hci/hci.c | 4 +- subsys/bluetooth/controller/hci/hci_driver.c | 18 +- subsys/bluetooth/controller/hci/hci_internal.h | 1 - subsys/bluetooth/controller/ll/ctrl.c | 1 + subsys/bluetooth/host/Kconfig | 63 ++- subsys/bluetooth/host/a2dp.c | 7 +- subsys/bluetooth/host/at.c | 38 +- subsys/bluetooth/host/at.h | 10 +- subsys/bluetooth/host/att.c | 65 +-- subsys/bluetooth/host/att_internal.h | 6 + subsys/bluetooth/host/avdtp.c | 24 +- subsys/bluetooth/host/avdtp_internal.h | 10 +- subsys/bluetooth/host/conn.c | 157 +++--- subsys/bluetooth/host/conn_internal.h | 4 +- subsys/bluetooth/host/gatt.c | 12 +- subsys/bluetooth/host/hci_core.c | 504 +++++++++--------- subsys/bluetooth/host/hci_core.h | 5 +- subsys/bluetooth/host/hci_ecc.c | 11 +- subsys/bluetooth/host/hci_raw.c | 8 +- subsys/bluetooth/host/hfp_hf.c | 6 +- subsys/bluetooth/host/keys.c | 6 +- subsys/bluetooth/host/keys.h | 4 - subsys/bluetooth/host/keys_br.c | 6 +- subsys/bluetooth/host/l2cap.c | 108 ++-- subsys/bluetooth/host/l2cap_br.c | 32 +- subsys/bluetooth/host/l2cap_internal.h | 8 +- subsys/bluetooth/host/log.c | 2 - subsys/bluetooth/host/monitor.c | 1 - subsys/bluetooth/host/rfcomm.c | 148 ++++- subsys/bluetooth/host/rfcomm_internal.h | 15 + subsys/bluetooth/host/sdp.c | 6 +- subsys/bluetooth/host/smp.c | 211 ++++---- subsys/bluetooth/host/smp_null.c | 7 +- subsys/bluetooth/host/storage.c | 1 + subsys/bluetooth/host/uuid.c | 2 +- tests/bluetooth/shell/arduino_101.conf | 2 +- tests/bluetooth/shell/prj.conf | 2 +- 63 files changed, 1479 insertions(+), 852 deletions(-) create mode 100644 drivers/bluetooth/hci/spi.c Change-Id: Ic11028e1f02636a48d95cbe03735af37cea94e25 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/bluetooth/shell/arduino_101.conf2
-rw-r--r--tests/bluetooth/shell/prj.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/bluetooth/shell/arduino_101.conf b/tests/bluetooth/shell/arduino_101.conf
index 9efb0361b..3480c43b1 100644
--- a/tests/bluetooth/shell/arduino_101.conf
+++ b/tests/bluetooth/shell/arduino_101.conf
@@ -12,7 +12,7 @@ CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y
CONFIG_CONSOLE_SHELL=y
CONFIG_BLUETOOTH_BREDR_NAME="test shell"
-CONFIG_BLUETOOTH_ATT_REQ_COUNT=5
+CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=6
CONFIG_BLUETOOTH_INTERNAL_STORAGE=y
CONFIG_FLASH=y
CONFIG_SPI=y
diff --git a/tests/bluetooth/shell/prj.conf b/tests/bluetooth/shell/prj.conf
index 878793e7c..0cdd29ce5 100644
--- a/tests/bluetooth/shell/prj.conf
+++ b/tests/bluetooth/shell/prj.conf
@@ -12,5 +12,5 @@ CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BLUETOOTH_TINYCRYPT_ECC=y
CONFIG_CONSOLE_SHELL=y
CONFIG_BLUETOOTH_BREDR_NAME="test shell"
-CONFIG_BLUETOOTH_ATT_REQ_COUNT=5
+CONFIG_BLUETOOTH_L2CAP_TX_BUF_COUNT=6