Bluetooth: Move Bluetooth host stack to subsys

Move the Bluetooth host stack from net/bluetooth to
subsys/bluetooth/host. This is preparation for having both host and
controller under the same root, i.e. subsys/bluetooth/.

Change-Id: I3bc796f7e331fca0c485f3890d62b9c03e027b96
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-11-02 11:06:56 +02:00
parent d622b09bc0
commit 6bc645962a
48 changed files with 24 additions and 8 deletions

View file

@ -175,7 +175,7 @@ M: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
M: Szymon Janc <szymon.janc@gmail.com>
S: Supported
W: https://www.zephyrproject.org/doc/subsystems/bluetooth/bluetooth.html
F: net/bluetooth/
F: subsys/bluetooth/
F: include/bluetooth/
F: drivers/bluetooth/
F: samples/bluetooth/

View file

@ -38,7 +38,7 @@ Source tree layout
The stack is split up as follows in the source tree:
``net/bluetooth/``
``subsys/bluetooth/``
The core stack itself. This is where the HCI command & event handling
as well as connection tracking happens. The implementation of the
core protocols such as L2CAP, ATT & SMP is also here.

View file

@ -2,4 +2,4 @@ subdir-ccflags-$(CONFIG_NBLE) +=-I$(srctree)/drivers/bluetooth
obj-$(CONFIG_NBLE) += gap.o conn.o gatt.o uart.o rpc_serialize.o \
rpc_deserialize.o stubs.o smp.o \
../../../net/bluetooth/uuid.o
../../../subsys/bluetooth/host/uuid.o

View file

@ -18,8 +18,6 @@
menu "Networking"
source "net/bluetooth/Kconfig"
source "net/ip/Kconfig"
config NET_BUF

View file

@ -1,3 +1,2 @@
obj-$(CONFIG_BLUETOOTH) += bluetooth/
obj-$(CONFIG_NET_BUF) += buf.o
obj-$(CONFIG_NETWORKING) += ip/

View file

@ -19,3 +19,4 @@ source "subsys/fs/Kconfig"
source "subsys/usb/Kconfig"
source "subsys/bluetooth/Kconfig"

View file

@ -1,2 +1,3 @@
obj-$(CONFIG_FILE_SYSTEM) += fs/
obj-$(CONFIG_USB) += usb/
obj-$(CONFIG_BLUETOOTH) += bluetooth/

18
subsys/bluetooth/Kconfig Normal file
View file

@ -0,0 +1,18 @@
# Kconfig - Bluetooth configuration options
#
# Copyright (c) 2016 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
source "subsys/bluetooth/host/Kconfig"

View file

@ -0,0 +1 @@
obj-$(CONFIG_BLUETOOTH) += host/

View file

@ -71,4 +71,3 @@ typedef void (*bt_dh_key_cb_t)(const uint8_t key[32]);
* @return Zero on success or negative error code otherwise
*/
int bt_dh_key_gen(const uint8_t remote_pk[64], bt_dh_key_cb_t cb);

View file

@ -170,4 +170,3 @@ void bt_keys_clear(struct bt_keys *keys)
memset(keys, 0, sizeof(*keys));
}