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

Merge bluetooth branch into master



Main changes:

 - Restructure Kconfig to a more logical hierarchy
 - Update code to use unified APIs
 - Initial RFCOMM client support
 - Add HCI_LE_Remove_Device_From_White_List command to controller

----------------------------------------------------------------
Carles Cufi (1):
      Bluetooth: Controller: Add ASSERT info dump on HCI builds

Jaganath Kanakkassery (2):
      Bluetooth: RFCOMM: Initiate session connection
      Bluetooth: shell: Add support for RFCOMM Connect

Johan Hedberg (26):
      Bluetooth: Controller: Kconfig: Clean up style issues
      Bluetooth: samples/hci_uart: Add micro:bit configuration
      Bluetooth: Dump the content of unhandled events as hex
      Bluetooth: Kconfig: Restructure for a more logical hierarchy
      Bluetooth: Kconfig: Remove redundant 'default n' declarations
      Bluetooth: Fine-tune default incoming ACL buffer count
      Bluetooth: samples/hci_uart: Remove dependency on controller
      Bluetooth: samples/hci_uart: Declare assert handler only when needed
      Bluetooth: samples/hci_uart: Remove redundant semicolon
      Bluetooth: Controller: Improve default RX/TX buffer counts
      Bluetooth: Use k_uptime_get() instead of deprecated sys_tick_get_32()
      Bluetooth: Use k_yield() instead of deprecated fiber_yield()
      Bluetooth: Use k_thread_spawn() instead of deprecated nano_fiber_start()
      Bluetooth: Use k_sleep() instead of deprecated fiber_sleep()
      Bluetooth: Remove need for fiber offload
      Bluetooth: drivers: Don't use deprecated NANOKERNEL init level
      Bluetooth: RFCOMM: Switch to using k_thread_spawn()
      Bluetooth: Controller: Stop using deprecated APIs
      Bluetooth: Rename left-over mentions of "fiber" to "thread"
      Bluetooth: hci_ecc: Convert to new thread API
      Bluetooth: samples/hci_ecc: Switch to using k_thread_spawn()
      Bluetooth: tests/tester: Convert left-overs to unified kernel APIs
      Bluetooth: drivers/h5: Convert to unified work APIs
      Bluetooth: drivers/nble: Convert to unified work APIs
      Bluetooth: doc: Remove mentions of legacy kernel concepts
      Bluetooth: Kconfig: Fix order of default entries

Luiz Augusto von Dentz (6):
      Bluetooth: ATT: Fix not forwarding error properly
      Bluetooth: L2CAP: Fix using nano_delayed_work API
      Bluetooth: ATT: Fix using nano_delayed_work API
      Bluetooth: SMP: Fix using nano_delayed_work API
      Bluetooth: conn: Fix using nano_delayed_work API
      Bluetooth: HCI: Fix using nano_delayed_work API

Szymon Janc (9):
      Bluetooth: ATT: Fix non-ASCII characters in code comments
      Bluetooth:  Use unified k_fifo API for FIFOs
      Bluetooth: drivers: Use unified k_fifo API for FIFOs
      Bluetooth: Remove not needed nano_work.h includes
      Bluetooth: samples: Fix using nano_delayed_work in eddystone
      net: buf: Use new API for checking if executing from ISR
      Bluetooth: samples: Fix use of deprecated sleep API
      net: buf: Use unified k_fifo API for FIFOs
      Bluetooth: Use proper timeout defines for net_buf_get_timeout

Vinayak Chettimada (1):
      Bluetooth: Controller: Add HCI_LE_Remove_Device_From_White_List

 doc/subsystems/bluetooth/devel.rst                |   9 +-
 drivers/bluetooth/Kconfig                         |   6 +-
 drivers/bluetooth/hci/Kconfig                     |  21 +--
 drivers/bluetooth/hci/h4.c                        |   2 +-
 drivers/bluetooth/hci/h5.c                        |  80 +++++----
 drivers/bluetooth/nble/Kconfig                    |  26 +--
 drivers/bluetooth/nble/conn.c                     |  16 +-
 drivers/bluetooth/nble/conn_internal.h            |   4 +-
 drivers/bluetooth/nble/gatt.c                     |  14 +-
 drivers/bluetooth/nble/uart.c                     |  23 +--
 drivers/bluetooth/nrf51_pm.c                      |  18 +--
 include/bluetooth/hci_raw.h                       |   2 +-
 include/bluetooth/l2cap.h                         |   3 +-
 include/bluetooth/rfcomm.h                        |  19 ++-
 include/net/buf.h                                 |  25 ++-
 net/buf.c                                         |  22 ++-
 net/ip/net_core.c                                 |   2 +-
 samples/bluetooth/beacon/prj.conf                 |   1 -
 samples/bluetooth/beacon/prj_nble.conf            |   2 +-
 samples/bluetooth/central/prj.conf                |   1 -
 samples/bluetooth/central_hr/prj.conf             |   1 -
 samples/bluetooth/central_hr/src/main.c           |   8 -
 samples/bluetooth/eddystone/prj.conf              |   1 -
 samples/bluetooth/eddystone/prj_nble.conf         |   2 +-
 samples/bluetooth/eddystone/src/main.c            |  15 +-
 samples/bluetooth/handsfree/src/main.c            |   6 +-
 samples/bluetooth/hci_uart/Makefile               |   7 +-
 samples/bluetooth/hci_uart/generic.conf           |   2 +-
 samples/bluetooth/hci_uart/microbit.conf          |  11 ++
 samples/bluetooth/hci_uart/nrf5.conf              |   5 +-
 samples/bluetooth/hci_uart/src/main.c             |  87 ++++++++--
 samples/bluetooth/hci_usb/prj.conf                |   2 +-
 samples/bluetooth/hci_usb/src/main.c              |  10 +-
 samples/bluetooth/peripheral/prj.conf             |   1 -
 samples/bluetooth/peripheral/prj_nble.conf        |   2 +-
 samples/bluetooth/peripheral/src/main.c           |   2 +-
 samples/bluetooth/peripheral_csc/prj_nble.conf    |   2 +-
 samples/bluetooth/peripheral_csc/src/main.c       |   2 +-
 samples/bluetooth/peripheral_dis/prj.conf         |   1 -
 samples/bluetooth/peripheral_esp/prj.conf         |   1 -
 samples/bluetooth/peripheral_esp/prj_nble.conf    |   2 +-
 samples/bluetooth/peripheral_esp/src/main.c       |   2 +-
 samples/bluetooth/peripheral_hids/prj.conf        |   1 -
 samples/bluetooth/peripheral_hids/prj_nble.conf   |   2 +-
 samples/bluetooth/peripheral_hr/prj.conf          |   1 -
 samples/bluetooth/peripheral_hr/prj_nble.conf     |   2 +-
 samples/bluetooth/peripheral_hr/src/main.c        |   2 +-
 samples/bluetooth/peripheral_sc_only/prj.conf     |   1 -
 samples/environmental_sensing/x86/prj_nble.conf   |   2 +-
 samples/environmental_sensing/x86/prj_nimble.conf |   1 -
 samples/net/echo_client/prj_bt.conf               |   1 -
 samples/net/echo_server/prj_bt.conf               |   1 -
 samples/net/trickle-legacy/prj_bt.conf            |   1 -
 samples/testing/unit/main.c                       |  20 +--
 subsys/bluetooth/Kconfig                          |  42 +++++
 subsys/bluetooth/Makefile                         |   2 +-
 subsys/bluetooth/controller/Kconfig               |  27 +++-
 subsys/bluetooth/controller/hal/debug.h           |  10 ++
 subsys/bluetooth/controller/hal/ecb.c             |   2 +-
 subsys/bluetooth/controller/hal/radio.c           |   2 +-
 subsys/bluetooth/controller/hal/rand.c            |   2 +-
 subsys/bluetooth/controller/hal/rtc.c             |   2 +-
 subsys/bluetooth/controller/hci/hci.c             |  25 ++-
 subsys/bluetooth/controller/hci/hci_driver.c      |  20 +--
 subsys/bluetooth/controller/ll/ctrl.c             | 276 +++++++++++++++++---------------
 subsys/bluetooth/controller/ll/ctrl.h             |   1 +
 subsys/bluetooth/controller/ll/ticker.c           |   2 +-
 subsys/bluetooth/host/Kconfig                     | 111 +++----------
 subsys/bluetooth/host/Makefile                    |   7 +-
 subsys/bluetooth/host/a2dp.c                      |   1 -
 subsys/bluetooth/host/att.c                       |  62 ++++---
 subsys/bluetooth/host/avdtp.c                     |   3 +-
 subsys/bluetooth/host/conn.c                      |  60 +++----
 subsys/bluetooth/host/conn_internal.h             |  14 +-
 subsys/bluetooth/host/gatt.c                      |   1 -
 subsys/bluetooth/host/hci_core.c                  | 130 +++++++++------
 subsys/bluetooth/host/hci_core.h                  |  12 +-
 subsys/bluetooth/host/hci_ecc.c                   |  39 ++---
 subsys/bluetooth/host/hci_raw.c                   |   8 +-
 subsys/bluetooth/host/hfp_hf.c                    |   3 +-
 subsys/bluetooth/host/keys.c                      |   1 -
 subsys/bluetooth/host/keys_br.c                   |   1 -
 subsys/bluetooth/host/l2cap.c                     |  27 ++--
 subsys/bluetooth/host/l2cap_br.c                  |  36 ++---
 subsys/bluetooth/host/l2cap_internal.h            |   2 +-
 subsys/bluetooth/host/monitor.c                   |   2 +-
 subsys/bluetooth/host/rfcomm.c                    | 138 ++++++++++++++--
 subsys/bluetooth/host/rfcomm_internal.h           |   1 +
 subsys/bluetooth/host/sdp.c                       |   6 +-
 subsys/bluetooth/host/smp.c                       |  29 ++--
 subsys/bluetooth/host/smp_null.c                  |   3 +-
 tests/bluetooth/init/prj.conf                     |   1 -
 tests/bluetooth/init/prj_0.conf                   |   1 -
 tests/bluetooth/init/prj_1.conf                   |   1 -
 tests/bluetooth/init/prj_10.conf                  |   1 -
 tests/bluetooth/init/prj_11.conf                  |   1 -
 tests/bluetooth/init/prj_12.conf                  |   1 -
 tests/bluetooth/init/prj_13.conf                  |   1 -
 tests/bluetooth/init/prj_14.conf                  |   1 -
 tests/bluetooth/init/prj_15.conf                  |   1 -
 tests/bluetooth/init/prj_16.conf                  |   1 -
 tests/bluetooth/init/prj_17.conf                  |   1 -
 tests/bluetooth/init/prj_18.conf                  |   1 -
 tests/bluetooth/init/prj_19.conf                  |   1 -
 tests/bluetooth/init/prj_2.conf                   |   1 -
 tests/bluetooth/init/prj_20.conf                  |   1 -
 tests/bluetooth/init/prj_21.conf                  |   1 -
 tests/bluetooth/init/prj_22.conf                  |   1 -
 tests/bluetooth/init/prj_3.conf                   |   1 -
 tests/bluetooth/init/prj_4.conf                   |   1 -
 tests/bluetooth/init/prj_5.conf                   |   1 -
 tests/bluetooth/init/prj_6.conf                   |   1 -
 tests/bluetooth/init/prj_7.conf                   |   1 -
 tests/bluetooth/init/prj_8.conf                   |   1 -
 tests/bluetooth/init/prj_9.conf                   |   1 -
 tests/bluetooth/init/prj_controller.conf          |   1 -
 tests/bluetooth/init/prj_controller_dbg.conf      |   1 -
 tests/bluetooth/init/prj_h5.conf                  |   1 -
 tests/bluetooth/init/prj_h5_dbg.conf              |   1 -
 tests/bluetooth/shell/arduino_101.conf            |   1 -
 tests/bluetooth/shell/prj.conf                    |   1 -
 tests/bluetooth/shell/prj_br.conf                 |   1 -
 tests/bluetooth/shell/prj_nble.conf               |   2 +-
 tests/bluetooth/shell/prj_nimble.conf             |   1 -
 tests/bluetooth/shell/src/main.c                  |  36 ++++-
 tests/bluetooth/test_bluetooth/prj.conf           |   1 -
 tests/bluetooth/tester/default.conf               |   1 -
 tests/bluetooth/tester/nble.conf                  |   2 +-
 tests/bluetooth/tester/nimble.conf                |   1 -
 tests/bluetooth/tester/qemu.conf                  |   1 -
 tests/bluetooth/tester/src/bttester.c             |  25 +--
 tests/bluetooth/tester/src/gatt.c                 |   4 +-
 tests/bluetooth/tester/src/l2cap.c                |   4 +-
 tests/net/buf/src/main.c                          |  12 +-
 tests/unit/net/buf/main.c                         |  20 +--
 135 files changed, 958 insertions(+), 796 deletions(-)
 create mode 100644 samples/bluetooth/hci_uart/microbit.conf

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