Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 33 additions & 0 deletions .codespell-ignore-lines
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,39 @@ Linix 45ZWN24-40 2 0.5 Ohm 0.400 mH 2.34A 24V
* [#4526](https://github.com/apache/nuttx/pull/4526) Rearch video
* [#6447](https://github.com/apache/nuttx/pull/6447) bcm43xxx: Remove bcmf_txavail_work and resue bcmf_tx_poll_work
ans init
* include/nuttx/net/bluetooth/services/ans.h
* @brief Alert Notification Service (ANS)
* @defgroup bt_ans Alert Notification Service (ANS)
* @brief ANS max text string size in octets
* @brief ANS Category ID Enum
* an immediate replay is requested via the ANS control point.
* net/bt/services/ans.c
LOG_INF("ANS initialization complete");
# net/bt/services/Kconfig.ans
module-str = Alert Notification Service (ANS)
#include <nuttx/net/bluetooth/services/ans.h>
/* Build time ANS supported category bit mask */
#define BT_ANS_NALRT_CAT_MASK \
#define BT_ANS_UNALRT_CAT_MASK \
"At least one ANS New Alert category must be enabled in "
list(APPEND BT_SERVICE_SRCS ${CMAKE_CURRENT_LIST_DIR}/ans.c)
BT_CSRCS += bt/services/ans.c
rsource "../mesh/Kconfig"
rsource "Kconfig.l2cap"
rsource "Kconfig.gatt"
rsource "../services/Kconfig"
rsource "./classic/Kconfig"
rsource "Kconfig.ans"
rsource "Kconfig.dis"
rsource "Kconfig.gap_svc"
rsource "Kconfig.cts"
rsource "Kconfig.ets"
rsource "Kconfig.hrs"
rsource "Kconfig.tps"
rsource "nus/Kconfig.nus"
rsource "ias/Kconfig.ias"
rsource "ots/Kconfig"
rsource "bas/Kconfig.bas"
* CAF : Depends on CONFIG_NET_PROMISCUOUS
* been lost). If ORE is set along with RXNE then it tells you
/* GIR bits must be masked! */
Expand Down
1 change: 1 addition & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ignore-words-list =
AFE,
afile,
als,
ans,
ameba,
ARCHTYPE,
BU,
Expand Down
1 change: 1 addition & 0 deletions Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3046,6 +3046,7 @@ endmenu

menu "Wireless Support"
source "wireless/Kconfig"
source "libs/zblue/Kconfig"
endmenu

menu "Binary Loader"
Expand Down
12 changes: 12 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,18 @@

------------------------------------------------------------------------------

Zephyr Bluetooth Host Stack
libs/zblue
include/nuttx/net/bluetooth
===========================

The Bluetooth host stack and public Bluetooth API headers are derived from the
Zephyr Project Bluetooth host stack, with changes for Apache NuttX integration.
The derived files retain their original copyright and Apache-2.0 SPDX license
notices.

------------------------------------------------------------------------------

uIP
include/nuttx/net/arp.h
include/nuttx/net/can.h
Expand Down
2 changes: 1 addition & 1 deletion arch/sim/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ endmenu
config SIM_HCISOCKET
bool "Attach Host Bluetooth"
default false
depends on HOST_LINUX && (UART_BTH4 || UART_BTH5 || WIRELESS_BLUETOOTH)
depends on HOST_LINUX && (UART_BTH4 || UART_BTH5 || WIRELESS_BLUETOOTH || BT)
---help---
Attached the local bluetooth device to the simulation
target via HCI_CHANNEL_USER. This gives NuttX full
Expand Down
3 changes: 3 additions & 0 deletions arch/sim/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,9 @@ endif
ifeq ($(CONFIG_SIM_HCISOCKET),y)
HOSTSRCS += sim_hosthcisocket.c
CSRCS += sim_hcisocket.c
ifeq ($(CONFIG_BT),y)
STDLIBS += -lmbedcrypto
endif
endif

ifeq ($(CONFIG_SIM_I2CBUS_LINUX),y)
Expand Down
135 changes: 135 additions & 0 deletions boards/sim/sim/sim/configs/bt/defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
#
# This file is autogenerated: PLEASE DO NOT EDIT IT.
#
# You can use "make menuconfig" to make any modifications to the installed .config file.
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
# modifications.
#
# CONFIG_LIBSBC is not set
CONFIG_ARCH="sim"
CONFIG_ARCH_BOARD="sim"
CONFIG_ARCH_BOARD_SIM=y
CONFIG_ARCH_CHIP="sim"
CONFIG_ARCH_SIM=y
CONFIG_BASE_DEFCONFIG="sim/bt"
CONFIG_BOARDCTL_POWEROFF=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BT_A2DP=y
CONFIG_BT_A2DP_SINK=y
CONFIG_BT_ASCS=y
CONFIG_BT_ATT_PREPARE_COUNT=1
CONFIG_BT_AUDIO=y
CONFIG_BT_AVRCP=y
CONFIG_BT_AVRCP_BROWSING=y
CONFIG_BT_AVRCP_CONTROLLER=y
CONFIG_BT_AVRCP_TARGET=y
CONFIG_BT_BAP_BROADCAST_ASSISTANT=y
CONFIG_BT_BAP_BROADCAST_SINK=y
CONFIG_BT_BAP_BROADCAST_SOURCE=y
CONFIG_BT_BAP_SCAN_DELEGATOR=y
CONFIG_BT_BAP_UNICAST_CLIENT=y
CONFIG_BT_BAP_UNICAST_SERVER=y
CONFIG_BT_BAS=y
CONFIG_BT_BR_MIN_ENC_KEY_SIZE=12
CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=7
CONFIG_BT_BUF_ACL_RX_SIZE=1024
CONFIG_BT_BUF_ACL_TX_COUNT=22
CONFIG_BT_BUF_ACL_TX_SIZE=27
CONFIG_BT_BUF_EVT_RX_COUNT=30
CONFIG_BT_CAP_ACCEPTOR=y
CONFIG_BT_CAP_COMMANDER=y
CONFIG_BT_CAP_HANDOVER=y
CONFIG_BT_CAP_INITIATOR=y
CONFIG_BT_CLASSIC=y
CONFIG_BT_COD=0x240404
CONFIG_BT_CSIP_SET_COORDINATOR=y
CONFIG_BT_CSIP_SET_MEMBER=y
CONFIG_BT_DEFAULT_ROLE_SWITCH_ENABLE=y
CONFIG_BT_DEVICE_NAME_DYNAMIC=y
CONFIG_BT_DEVICE_NAME_MAX=64
CONFIG_BT_DID=y
CONFIG_BT_DIS=y
CONFIG_BT_EXT_ADV_LEGACY_SUPPORT=y
CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
CONFIG_BT_GMAP=y
CONFIG_BT_HAS=y
CONFIG_BT_HAS_CLIENT=y
CONFIG_BT_HCI_TX_STACK_SIZE=4096
CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_ISO_BROADCASTER=y
CONFIG_BT_ISO_CENTRAL=y
CONFIG_BT_ISO_PERIPHERAL=y
CONFIG_BT_ISO_SYNC_RECEIVER=y
CONFIG_BT_L2CAP_TX_BUF_COUNT=12
CONFIG_BT_LONG_WQ_PRIO=100
CONFIG_BT_LONG_WQ_STACK_SIZE=5120
CONFIG_BT_MAX_CONN=6
CONFIG_BT_MAX_PAIRED=10
CONFIG_BT_MCC=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_CDB=y
CONFIG_BT_MESH_CFG_CLI=y
CONFIG_BT_MESH_GATT_PROXY=y
CONFIG_BT_MESH_HEALTH_CLI=y
CONFIG_BT_MESH_PB_GATT=y
CONFIG_BT_MESH_PB_GATT_CLIENT=y
CONFIG_BT_MESH_PROXY_CLIENT=y
CONFIG_BT_MICP_MIC_CTLR=y
CONFIG_BT_MICP_MIC_DEV=y
CONFIG_BT_MONITOR=y
CONFIG_BT_MPL=y
CONFIG_BT_PBP=y
CONFIG_BT_POWER_MODE_CONTROL=y
CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_L2CAP_MTU=1021
CONFIG_BT_RX_STACK_SIZE=5120
CONFIG_BT_SERVICES=y
CONFIG_BT_TBS=y
CONFIG_BT_TMAP=y
CONFIG_BT_TPS=y
CONFIG_BT_TX_PROCESSOR_STACK_SIZE=2048
CONFIG_BT_VCP_VOL_CTLR=y
CONFIG_BT_VCP_VOL_REND=y
CONFIG_BT_ZEPHYR_NUS=y
CONFIG_BT_ZEPHYR_NUS_AUTO_START_BLUETOOTH=y
CONFIG_BUILTIN=y
CONFIG_CRYPTO_MBEDTLS=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_BLUETOOTH=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_LIBC_ENVPATH=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_NDEBUG=y
CONFIG_NET=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_READLINE=y
CONFIG_PIPES=y
CONFIG_RTC=y
CONFIG_RTC_ARCH=y
CONFIG_RTC_DRIVER=y
CONFIG_SCHED_LPNTHREADS=2
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_LPWORKSTACKSIZE=3072
CONFIG_SCHED_WAITPID=y
CONFIG_SIM_HCISOCKET=y
CONFIG_SIM_WALLTIME_SIGNAL=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSLOG_BUFFER=y
CONFIG_SYSLOG_BUFSIZE=128
CONFIG_SYSLOG_CONSOLE=y
CONFIG_SYSLOG_INTBUFFER=y
CONFIG_SYSLOG_PROCESSID=y
CONFIG_SYSLOG_TIMESTAMP=y
CONFIG_SYSLOG_TIMESTAMP_MS=y
CONFIG_SYSTEM_NSH=y
CONFIG_ZBLUE_ENABLED=y
17 changes: 17 additions & 0 deletions boards/sim/sim/sim/src/sim_bringup.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
#include <nuttx/usb/mtp.h>
#include <nuttx/usb/rndis.h>

#ifdef CONFIG_BT
#include <nuttx/net/bluetooth/compat/init.h>
#endif

#ifdef CONFIG_LCD_DEV
#include <nuttx/lcd/lcd_dev.h>
#endif
Expand Down Expand Up @@ -430,6 +434,19 @@ int sim_bringup(void)
}
#endif

#ifdef CONFIG_BT
/* Run NuttX Bluetooth compatibility initializers after the simulated
* board-level Bluetooth HCI drivers have had a chance to register
* themselves.
*/

ret = bluetooth_initialize();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: bluetooth_initialize() failed: %d\n", ret);
}
#endif

#ifdef CONFIG_SIM_I2CBUS
/* Initialize the i2c master bus device */

Expand Down
8 changes: 8 additions & 0 deletions drivers/wireless/bluetooth/bt_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
#include <nuttx/config.h>
#include <nuttx/wireless/bluetooth/bt_driver.h>

#ifdef CONFIG_BT
# include <nuttx/net/bluetooth/hci_driver_nuttx.h>
#endif

#ifdef CONFIG_UART_BTH4
# include <nuttx/serial/uart_bth4.h>
#endif
Expand Down Expand Up @@ -96,6 +100,10 @@ int bt_driver_register_with_id(FAR struct bt_driver_s *driver, int id)
}
#endif

#ifdef CONFIG_BT
return bt_netdev_register(driver);
#endif

#ifdef CONFIG_BLUETOOTH_BRIDGE
ret = bt_bridge_register(driver, &btdrv, &bledrv);
if (ret < 0)
Expand Down
Loading
Loading