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

Merge bluetooth branch into master



 - Fixes to SPI HCI driver
 - Minor improvements, to AVDTP, A2DP, RFCOMM & HFP
 - New Kconfig variable for managing the device name

----------------------------------------------------------------
Arun Jagadish (1):
      Bluetooth: AVDTP: Add AVDTP Discover API Prototype

Jaganath Kanakkassery (3):
      Bluetooth: RFCOMM: Fix v24_signal in MSC response
      Bluetooth: RFCOMM: Implement MSC Flow Control
      Bluetooth: Doc: RFCOMM PICS file

Johan Hedberg (2):
      Bluetooth: Kconfig: Make device name variable generic
      Bluetooth: samples: Use Kconfig DEVICE_NAME variable when possible

Kumar Gala (1):
      Bluetooth: hci_raw: Make bt_buf_get_rx args consistent

Luiz Augusto von Dentz (1):
      Bluetooth: L2CAP: Only set state for dynamic channels

Piyush Itankar (2):
      Bluetooth: A2DP: Adds accept state callback handlers
      Bluetooth: A2DP: Stream End Point Structure

Ricardo Salveti (7):
      Bluetooth: SPI: fix buf handling for HCI ACL packets
      Bluetooth: SPI: fix Kconfig SPI IRQ PIN description
      Bluetooth: SPI: introduce CONFIG_BLUETOOTH_SPI_BLUENRG
      Bluetooth: SPI: fix max SPI buffer length
      Bluetooth: SPI: switch to a single SPI transfer when receiving
      Bluetooth: SPI: retry spi_transceive calls if invalid
      Bluetooth: SPI: Disable IRQ pin callback to avoid spurious IRQs

Roger Lendenmann (1):
      Bluetooth: add storage flag for secure connection pairing LTK

Sathish Narasimman (2):
      Bluetooth: AT: HFP HF: Handle unsolicited reponse
      Bluetooth: HFP HF: Handle +CIEV reponse

 doc/subsystems/bluetooth/qualification.rst      |  1 +
 doc/subsystems/bluetooth/rfcomm-pics.rst        | 51 +++++++++++++++
 drivers/bluetooth/hci/Kconfig                   | 27 ++++----
 drivers/bluetooth/hci/spi.c                     | 83 +++++++++++++++-----
 drivers/bluetooth/nble/Kconfig                  |  7 +++
 include/bluetooth/a2dp.h                        | 13 ++++
 include/bluetooth/rfcomm.h                      |  2 +-
 include/bluetooth/storage.h                     |  3 +
 samples/bluetooth/beacon/prj.conf               |  1 +
 samples/bluetooth/beacon/prj_nble.conf          |  1 +
 samples/bluetooth/beacon/src/main.c             |  2 +-
 samples/bluetooth/eddystone/prj.conf            |  1 +
 samples/bluetooth/eddystone/prj_nble.conf       |  1 +
 samples/bluetooth/eddystone/src/main.c          |  2 +-
 samples/bluetooth/gatt/ipss.c                   |  2 +-
 samples/bluetooth/handsfree/prj.conf            |  2 +-
 samples/bluetooth/ipsp/prj.conf                 |  1 +
 samples/bluetooth/peripheral/prj.conf           |  1 +
 samples/bluetooth/peripheral/prj_nble.conf      |  1 +
 samples/bluetooth/peripheral/src/main.c         |  2 +-
 samples/bluetooth/peripheral_csc/prj.conf       |  1 +
 samples/bluetooth/peripheral_csc/prj_nble.conf  |  1 +
 samples/bluetooth/peripheral_csc/src/main.c     |  2 +-
 samples/bluetooth/peripheral_dis/prj.conf       |  1 +
 samples/bluetooth/peripheral_dis/src/main.c     |  2 +-
 samples/bluetooth/peripheral_esp/prj.conf       |  1 +
 samples/bluetooth/peripheral_esp/prj_nble.conf  |  1 +
 samples/bluetooth/peripheral_esp/src/main.c     |  2 +-
 samples/bluetooth/peripheral_hids/prj.conf      |  1 +
 samples/bluetooth/peripheral_hids/prj_nble.conf |  1 +
 samples/bluetooth/peripheral_hids/src/main.c    |  2 +-
 samples/bluetooth/peripheral_hr/prj.conf        |  1 +
 samples/bluetooth/peripheral_hr/prj_nble.conf   |  1 +
 samples/bluetooth/peripheral_hr/src/main.c      |  2 +-
 samples/bluetooth/peripheral_sc_only/prj.conf   |  1 +
 samples/bluetooth/peripheral_sc_only/src/main.c |  2 +-
 subsys/bluetooth/host/Kconfig                   | 13 ++--
 subsys/bluetooth/host/a2dp.c                    | 91 +++++++++++++++++---
 subsys/bluetooth/host/a2dp_internal.h           |  6 --
 subsys/bluetooth/host/at.c                      | 35 ++++++++---
 subsys/bluetooth/host/at.h                      | 13 +++-
 subsys/bluetooth/host/avdtp.c                   | 11 ++++
 subsys/bluetooth/host/avdtp_internal.h          | 22 +++++++
 subsys/bluetooth/host/hci_core.c                |  2 +-
 subsys/bluetooth/host/hci_raw.c                 |  2 +-
 subsys/bluetooth/host/hfp_hf.c                  | 49 +++++++++++++--
 subsys/bluetooth/host/l2cap.c                   |  3 +-
 subsys/bluetooth/host/rfcomm.c                  | 50 +++++++++++----
 subsys/bluetooth/host/rfcomm_internal.h         |  2 +
 tests/bluetooth/shell/arduino_101.conf          |  2 +-
 tests/bluetooth/shell/prj.conf                  |  2 +-
 tests/bluetooth/shell/prj_br.conf               |  2 +-
 tests/bluetooth/shell/prj_nble.conf             |  1 +
 tests/bluetooth/shell/src/main.c                |  2 +-
 54 files changed, 412 insertions(+), 122 deletions(-)
 create mode 100644 doc/subsystems/bluetooth/rfcomm-pics.rst

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