Skip to content
Commit 77738937 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Merge bluetooth branch into master



Main changes:

 - Fix handling of LL_UNKNOWN_RSP PDU in controller
 - Add basic support for an internal persistent storage handler
 - Convert initial pieces of code to unified kernel APIs
 - Fix regression with L2CAP CoC credits
 - Update documentation to match latest implementation

----------------------------------------------------------------
Arun Jagadish (1):
      Bluetooth: AVDTP: Set Profile Security Level to Medium

Carles Cufi (1):
      Bluetooth: Controller: Handle LL_UNKNOWN_RSP PDU for remote features

Johan Hedberg (9):
      Bluetooth: doc: Update subsystem description
      Bluetooth: doc: Move PICS documentation to right place
      Bluetooth: storage: Add basic support for internal storage
      Bluetooth: Implement bt_storage_clear()
      Bluetooth: tests/shell: Implement "clear" command
      Bluetooth: samples: Use consistent naming for HCI apps
      Bluetooth: Fix usage of C++ reserved word
      Bluetooth: Use depends on SERIAL instead of selects
      Bluetooth: tests/shell: Add Arduino 101-specific configuration

Luiz Augusto von Dentz (3):
      Bluetooth: L2CAP: Fix regression causing credits not to be restored
      Bluetooth: L2CAP: Limit segments to TX MPS
      Bluetooth: L2CAP: Add helper function to create LE signalling PDUs

Sathish Narasimman (3):
      Bluetooth: AT handling error condition
      Bluetooth: HFP HF: SLC connection-Send/Parse BRSF
      Bluetooth: Sample: handsfree sample application

Szymon Janc (5):
      Bluetooth: Remove workaround for Mynewt firmware bug
      Bluetooth: Controller: Include zephyr.h instead of nanokernel.h
      Bluetooth: Use unified k_sem API for semaphores
      Bluetooth: nble: Use unified k_sem API for semaphores
      Bluetooth: Controller: Use unified k_sem API for semaphore

 doc/bluetooth/gap-pics.txt                              | 624 --------------------
 doc/bluetooth/sm-pics.txt                               |  78 ---
 doc/subsystems/bluetooth/bluetooth.rst                  |  23 +-
 doc/subsystems/bluetooth/gap-pics.rst                   | 731 ++++++++++++++++++++++++
 .../bluetooth/gatt-pics.rst}                            | 170 +++---
 .../bluetooth/l2cap-pics.rst}                           |  75 +--
 doc/subsystems/bluetooth/qualification.rst              |  16 +
 doc/subsystems/bluetooth/sm-pics.rst                    |  95 +++
 drivers/bluetooth/hci/Kconfig                           |   4 +-
 drivers/bluetooth/nble/Kconfig                          |   2 +-
 drivers/bluetooth/nble/conn_internal.h                  |   2 +-
 drivers/bluetooth/nble/gatt.c                           |   8 +-
 include/bluetooth/bluetooth.h                           |   2 +-
 include/bluetooth/l2cap.h                               |   2 +-
 include/bluetooth/rfcomm.h                              |   2 +-
 samples/bluetooth/README                                |   4 +-
 samples/bluetooth/handsfree/Makefile                    |  25 +
 samples/bluetooth/handsfree/prj.conf                    |   9 +
 samples/bluetooth/handsfree/src/Makefile                |   3 +
 samples/bluetooth/handsfree/src/main.c                  |  93 +++
 samples/bluetooth/handsfree/testcase.ini                |   4 +
 samples/bluetooth/{hci-uart => hci_uart}/Makefile       |   0
 samples/bluetooth/{hci-uart => hci_uart}/generic.conf   |   0
 samples/bluetooth/{hci-uart => hci_uart}/nrf5.conf      |   0
 samples/bluetooth/{hci-uart => hci_uart}/src/Makefile   |   0
 samples/bluetooth/{hci-uart => hci_uart}/src/main.c     |   0
 samples/bluetooth/{hci-uart => hci_uart}/testcase.ini   |   0
 samples/bluetooth/{hci-usb => hci_usb}/Makefile         |   0
 samples/bluetooth/{hci-usb => hci_usb}/prj.conf         |   0
 samples/bluetooth/{hci-usb => hci_usb}/src/Makefile     |   0
 samples/bluetooth/{hci-usb => hci_usb}/src/main.c       |   0
 samples/bluetooth/{hci-usb => hci_usb}/testcase.ini     |   0
 subsys/bluetooth/controller/hci/hci.c                   |  38 +-
 subsys/bluetooth/controller/hci/hci_driver.c            |  10 +-
 subsys/bluetooth/controller/ll/ctrl.c                   |   5 +-
 subsys/bluetooth/host/Kconfig                           |   8 +
 subsys/bluetooth/host/Makefile                          |   2 +
 subsys/bluetooth/host/at.c                              |  17 +-
 subsys/bluetooth/host/avdtp.c                           |   2 +
 subsys/bluetooth/host/conn.c                            |  24 +-
 subsys/bluetooth/host/conn_internal.h                   |   4 +-
 subsys/bluetooth/host/hci_core.c                        | 131 +++--
 subsys/bluetooth/host/hci_core.h                        |   6 +-
 subsys/bluetooth/host/hfp_hf.c                          | 127 +++-
 subsys/bluetooth/host/hfp_internal.h                    |  25 +-
 subsys/bluetooth/host/keys.c                            |   5 +
 subsys/bluetooth/host/keys.h                            |   2 +
 subsys/bluetooth/host/keys_br.c                         |  15 +
 subsys/bluetooth/host/l2cap.c                           | 130 ++---
 subsys/bluetooth/host/rfcomm.c                          |  11 +-
 subsys/bluetooth/host/storage.c                         | 237 ++++++++
 tests/bluetooth/shell/Makefile                          |   7 +-
 tests/bluetooth/shell/arduino_101.conf                  |  27 +
 tests/bluetooth/shell/src/main.c                        |  49 ++
 tests/bluetooth/shell/testcase.ini                      |   2 +-
 55 files changed, 1860 insertions(+), 996 deletions(-)
 delete mode 100644 doc/bluetooth/gap-pics.txt
 delete mode 100644 doc/bluetooth/sm-pics.txt
 create mode 100644 doc/subsystems/bluetooth/gap-pics.rst
 rename doc/{bluetooth/gatt-pics.txt => subsystems/bluetooth/gatt-pics.rst} (73%)
 rename doc/{bluetooth/l2cap-pics.txt => subsystems/bluetooth/l2cap-pics.rst} (73%)
 create mode 100644 doc/subsystems/bluetooth/qualification.rst
 create mode 100644 doc/subsystems/bluetooth/sm-pics.rst
 create mode 100644 samples/bluetooth/handsfree/Makefile
 create mode 100644 samples/bluetooth/handsfree/prj.conf
 create mode 100644 samples/bluetooth/handsfree/src/Makefile
 create mode 100644 samples/bluetooth/handsfree/src/main.c
 create mode 100644 samples/bluetooth/handsfree/testcase.ini
 rename samples/bluetooth/{hci-uart => hci_uart}/Makefile (100%)
 rename samples/bluetooth/{hci-uart => hci_uart}/generic.conf (100%)
 rename samples/bluetooth/{hci-uart => hci_uart}/nrf5.conf (100%)
 rename samples/bluetooth/{hci-uart => hci_uart}/src/Makefile (100%)
 rename samples/bluetooth/{hci-uart => hci_uart}/src/main.c (100%)
 rename samples/bluetooth/{hci-uart => hci_uart}/testcase.ini (100%)
 rename samples/bluetooth/{hci-usb => hci_usb}/Makefile (100%)
 rename samples/bluetooth/{hci-usb => hci_usb}/prj.conf (100%)
 rename samples/bluetooth/{hci-usb => hci_usb}/src/Makefile (100%)
 rename samples/bluetooth/{hci-usb => hci_usb}/src/main.c (100%)
 rename samples/bluetooth/{hci-usb => hci_usb}/testcase.ini (100%)
 create mode 100644 subsys/bluetooth/host/storage.c
 create mode 100644 tests/bluetooth/shell/arduino_101.conf

Change-Id: I4da9302f266ba293d27c152d68bb76de76f04ce9
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parents 621c1d6d 77dcd715
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment