Merge "Merge bluetooth branch into master"

12 files changed, 342 insertions, 8 deletions

diff --git a/samples/bluetooth/gatt/bas.c b/samples/bluetooth/gatt/bas.c
index 81ccaa3f5..17ae76277 100644
--- a/samples/bluetooth/gatt/bas.c
+++ b/samples/bluetooth/gatt/bas.c
@@ -36,7 +36,8 @@ static struct bt_gatt_ccc_cfg  blvl_ccc_cfg[CONFIG_BLUETOOTH_MAX_PAIRED] = {};
 static uint8_t simulate_blvl;
 static uint8_t battery = 100;
 
-static void blvl_ccc_cfg_changed(uint16_t value)
+static void blvl_ccc_cfg_changed(const struct bt_gatt_attr *attr,
+				 uint16_t value)
 {
 	simulate_blvl = (value == BT_GATT_CCC_NOTIFY) ? 1 : 0;
 }
diff --git a/samples/bluetooth/gatt/cts.c b/samples/bluetooth/gatt/cts.c
index 0d80dc67c..98691b1f1 100644
--- a/samples/bluetooth/gatt/cts.c
+++ b/samples/bluetooth/gatt/cts.c
@@ -36,7 +36,7 @@ static struct bt_gatt_ccc_cfg ct_ccc_cfg[CONFIG_BLUETOOTH_MAX_PAIRED] = {};
 static uint8_t ct[10];
 static uint8_t ct_update;
 
-static void ct_ccc_cfg_changed(uint16_t value)
+static void ct_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	/* TODO: Handle value */
 }
diff --git a/samples/bluetooth/gatt/hog.c b/samples/bluetooth/gatt/hog.c
index 4564e8885..86561906e 100644
--- a/samples/bluetooth/gatt/hog.c
+++ b/samples/bluetooth/gatt/hog.c
@@ -122,7 +122,7 @@ static ssize_t read_report(struct bt_conn *conn,
 				 sizeof(struct hids_report));
 }
 
-static void input_ccc_changed(uint16_t value)
+static void input_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	simulate_input = (value == BT_GATT_CCC_NOTIFY) ? 1 : 0;
 }
diff --git a/samples/bluetooth/gatt/hrs.c b/samples/bluetooth/gatt/hrs.c
index 3dd6f459b..8f1b150dc 100644
--- a/samples/bluetooth/gatt/hrs.c
+++ b/samples/bluetooth/gatt/hrs.c
@@ -37,7 +37,8 @@ static uint8_t simulate_hrm;
 static uint8_t heartrate = 90;
 static uint8_t hrs_blsc;
 
-static void hrmc_ccc_cfg_changed(uint16_t value)
+static void hrmc_ccc_cfg_changed(const struct bt_gatt_attr *attr,
+				 uint16_t value)
 {
 	simulate_hrm = (value == BT_GATT_CCC_NOTIFY) ? 1 : 0;
 }
diff --git a/samples/bluetooth/hci-uart/Makefile b/samples/bluetooth/hci-uart/Makefile
new file mode 100644
index 000000000..3c84ff178
--- /dev/null
+++ b/samples/bluetooth/hci-uart/Makefile
@@ -0,0 +1,5 @@
+KERNEL_TYPE = nano
+CONF_FILE = prj.conf
+BOARD ?= nrf52_pca10040
+
+include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/bluetooth/hci-uart/prj.conf b/samples/bluetooth/hci-uart/prj.conf
new file mode 100644
index 000000000..933da9a41
--- /dev/null
+++ b/samples/bluetooth/hci-uart/prj.conf
@@ -0,0 +1,12 @@
+CONFIG_CONSOLE=n
+CONFIG_STDOUT_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_GPIO=y
+CONFIG_ARC_INIT=n
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_BLUETOOTH=y
+CONFIG_BLUETOOTH_LE=y
+CONFIG_BLUETOOTH_STACK_HCI_RAW=y
+CONFIG_BLUETOOTH_DEBUG_LOG=n
+CONFIG_BLUETOOTH_DEBUG_MONITOR=n
diff --git a/samples/bluetooth/hci-uart/src/Makefile b/samples/bluetooth/hci-uart/src/Makefile
new file mode 100644
index 000000000..b666967fd
--- /dev/null
+++ b/samples/bluetooth/hci-uart/src/Makefile
@@ -0,0 +1 @@
+obj-y += main.o
diff --git a/samples/bluetooth/hci-uart/src/main.c b/samples/bluetooth/hci-uart/src/main.c
new file mode 100644
index 000000000..04a307909
--- /dev/null
+++ b/samples/bluetooth/hci-uart/src/main.c
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2016 Nordic Semiconductor ASA
+ * Copyright (c) 2015-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.
+ */
+
+#include <errno.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <nanokernel.h>
+#include <arch/cpu.h>
+#include <misc/byteorder.h>
+#include <misc/sys_log.h>
+#include <misc/util.h>
+
+#include <device.h>
+#include <init.h>
+#include <uart.h>
+
+#include <net/buf.h>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/driver.h>
+#include <bluetooth/buf.h>
+#include <bluetooth/hci_raw.h>
+
+static struct device *hci_uart_dev;
+
+/* HCI command buffers */
+#define CMD_BUF_SIZE (CONFIG_BLUETOOTH_HCI_SEND_RESERVE + \
+		      sizeof(struct bt_hci_cmd_hdr) + \
+		      CONFIG_BLUETOOTH_MAX_CMD_LEN)
+
+static struct nano_fifo avail_cmd_tx;
+static NET_BUF_POOL(tx_pool, CONFIG_BLUETOOTH_HCI_CMD_COUNT, CMD_BUF_SIZE,
+		    &avail_cmd_tx, NULL, BT_BUF_USER_DATA_MIN);
+
+#define BT_L2CAP_MTU 64
+/** Data size needed for ACL buffers */
+#define BT_BUF_ACL_SIZE (CONFIG_BLUETOOTH_HCI_RECV_RESERVE + \
+			 sizeof(struct bt_hci_acl_hdr) + \
+			 4 /* L2CAP header size */ + \
+			 BT_L2CAP_MTU)
+
+static struct nano_fifo avail_acl_tx;
+static NET_BUF_POOL(acl_tx_pool, 2, BT_BUF_ACL_SIZE, &avail_acl_tx, NULL,
+		    BT_BUF_USER_DATA_MIN);
+
+#define H4_CMD          0x01
+#define H4_ACL          0x02
+#define H4_SCO          0x03
+#define H4_EVT          0x04
+
+/* Length of a discard/flush buffer.
+ * This is sized to align with a BLE HCI packet:
+ * 1 byte H:4 header + 32 bytes ACL/event data
+ * Bigger values might overflow the stack since this is declared as a local
+ * variable, smaller ones will force the caller to call into discard more
+ * often.
+ */
+#define H4_DISCARD_LEN  33
+
+static int h4_read(struct device *uart, uint8_t *buf,
+		   size_t len, size_t min)
+{
+	int total = 0;
+
+	while (len) {
+		int rx;
+
+		rx = uart_fifo_read(uart, buf, len);
+		if (rx == 0) {
+			SYS_LOG_DBG("Got zero bytes from UART");
+			if (total < min) {
+				continue;
+			}
+			break;
+		}
+
+		SYS_LOG_DBG("read %d remaining %d", rx, len - rx);
+		len -= rx;
+		total += rx;
+		buf += rx;
+	}
+
+	return total;
+}
+
+static size_t h4_discard(struct device *uart, size_t len)
+{
+	uint8_t buf[H4_DISCARD_LEN];
+
+	return uart_fifo_read(uart, buf, min(len, sizeof(buf)));
+}
+
+static struct net_buf *h4_cmd_recv(int *remaining)
+{
+	struct bt_hci_cmd_hdr hdr;
+	struct net_buf *buf;
+
+	/* We can ignore the return value since we pass len == min */
+	h4_read(hci_uart_dev, (void *)&hdr, sizeof(hdr), sizeof(hdr));
+
+	*remaining = hdr.param_len;
+
+	buf = net_buf_get(&avail_cmd_tx, 0);
+	if (buf) {
+		bt_buf_set_type(buf, BT_BUF_CMD);
+		memcpy(net_buf_add(buf, sizeof(hdr)), &hdr, sizeof(hdr));
+	} else {
+		SYS_LOG_ERR("No available command buffers!");
+	}
+
+	SYS_LOG_DBG("len %u", hdr.param_len);
+
+	return buf;
+}
+
+static struct net_buf *h4_acl_recv(int *remaining)
+{
+	struct bt_hci_acl_hdr hdr;
+	struct net_buf *buf;
+
+	/* We can ignore the return value since we pass len == min */
+	h4_read(hci_uart_dev, (void *)&hdr, sizeof(hdr), sizeof(hdr));
+
+	buf = net_buf_get(&avail_acl_tx, 0);
+	if (buf) {
+		bt_buf_set_type(buf, BT_BUF_ACL_OUT);
+		memcpy(net_buf_add(buf, sizeof(hdr)), &hdr, sizeof(hdr));
+	} else {
+		SYS_LOG_ERR("No available ACL buffers!");
+	}
+
+	*remaining = sys_le16_to_cpu(hdr.len);
+
+	SYS_LOG_DBG("len %u", *remaining);
+
+	return buf;
+}
+
+static void bt_uart_isr(struct device *unused)
+{
+	static struct net_buf *buf;
+	static int remaining;
+
+	ARG_UNUSED(unused);
+
+	while (uart_irq_update(hci_uart_dev) &&
+	       uart_irq_is_pending(hci_uart_dev)) {
+		int read;
+
+		if (!uart_irq_rx_ready(hci_uart_dev)) {
+			if (uart_irq_tx_ready(hci_uart_dev)) {
+				SYS_LOG_DBG("transmit ready");
+			} else {
+				SYS_LOG_DBG("spurious interrupt");
+			}
+			continue;
+		}
+
+		/* Beginning of a new packet */
+		if (!remaining) {
+			uint8_t type;
+
+			/* Get packet type */
+			read = h4_read(hci_uart_dev, &type, sizeof(type), 0);
+			if (read != sizeof(type)) {
+				SYS_LOG_WRN("Unable to read H4 packet type");
+				continue;
+			}
+
+			switch (type) {
+			case H4_CMD:
+				buf = h4_cmd_recv(&remaining);
+				break;
+			case H4_ACL:
+				buf = h4_acl_recv(&remaining);
+				break;
+			default:
+				SYS_LOG_ERR("Unknown H4 type %u", type);
+				return;
+			}
+
+			SYS_LOG_DBG("need to get %u bytes", remaining);
+
+			if (buf && remaining > net_buf_tailroom(buf)) {
+				SYS_LOG_ERR("Not enough space in buffer");
+				net_buf_unref(buf);
+				buf = NULL;
+			}
+		}
+
+		if (!buf) {
+			read = h4_discard(hci_uart_dev, remaining);
+			SYS_LOG_WRN("Discarded %d bytes", read);
+			remaining -= read;
+			continue;
+		}
+
+		read = h4_read(hci_uart_dev, net_buf_tail(buf), remaining, 0);
+
+		buf->len += read;
+		remaining -= read;
+
+		SYS_LOG_DBG("received %d bytes", read);
+
+		if (!remaining) {
+			SYS_LOG_DBG("full packet received");
+
+			/* Pass buffer to the stack */
+			bt_send(buf);
+			buf = NULL;
+		}
+	}
+}
+
+static int h4_send(struct net_buf *buf)
+{
+	SYS_LOG_DBG("buf %p type %u len %u", buf, bt_buf_get_type(buf),
+		    buf->len);
+
+	switch (bt_buf_get_type(buf)) {
+	case BT_BUF_ACL_IN:
+		uart_poll_out(hci_uart_dev, H4_ACL);
+		break;
+	case BT_BUF_EVT:
+		uart_poll_out(hci_uart_dev, H4_EVT);
+		break;
+	default:
+		SYS_LOG_ERR("Unknown type %u", bt_buf_get_type(buf));
+		net_buf_unref(buf);
+		return -EINVAL;
+	}
+
+	while (buf->len) {
+		uart_poll_out(hci_uart_dev, net_buf_pull_u8(buf));
+	}
+
+	net_buf_unref(buf);
+
+	return 0;
+}
+
+
+static int hci_uart_init(struct device *unused)
+{
+	SYS_LOG_DBG("");
+
+	hci_uart_dev =
+		device_get_binding(CONFIG_BLUETOOTH_UART_TO_HOST_DEV_NAME);
+	if (!hci_uart_dev) {
+		return -EINVAL;
+	}
+
+	uart_irq_rx_disable(hci_uart_dev);
+	uart_irq_tx_disable(hci_uart_dev);
+
+	uart_irq_callback_set(hci_uart_dev, bt_uart_isr);
+
+	uart_irq_rx_enable(hci_uart_dev);
+
+	return 0;
+}
+
+DEVICE_INIT(hci_uart, "hci_uart", &hci_uart_init, NULL, NULL,
+	    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+
+void main(void)
+{
+	/* incoming events and data from the controller */
+	static struct nano_fifo rx_queue;
+	int err;
+
+	SYS_LOG_DBG("Start");
+
+	/* Initialize the buffer pools */
+	net_buf_pool_init(tx_pool);
+	net_buf_pool_init(acl_tx_pool);
+	nano_fifo_init(&rx_queue);
+
+	bt_enable_raw(&rx_queue);
+
+	while (1) {
+		struct net_buf *buf;
+
+		buf = net_buf_get_timeout(&rx_queue, 0, TICKS_UNLIMITED);
+		err = h4_send(buf);
+		if (err) {
+			SYS_LOG_ERR("Failed to send");
+		}
+	}
+}
diff --git a/samples/bluetooth/hci-uart/testcase.ini b/samples/bluetooth/hci-uart/testcase.ini
new file mode 100644
index 000000000..c824dcb75
--- /dev/null
+++ b/samples/bluetooth/hci-uart/testcase.ini
@@ -0,0 +1,5 @@
+[test_arm]
+tags = uart bluetooth
+build_only = true
+arch_whitelist = arm
+platform_whitelist = nrf52_pca10040
diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c
index 5434afb20..19772def1 100644
--- a/samples/bluetooth/peripheral/src/main.c
+++ b/samples/bluetooth/peripheral/src/main.c
@@ -84,7 +84,7 @@ static uint8_t simulate_vnd;
 static uint8_t indicating;
 static struct bt_gatt_indicate_params ind_params;
 
-static void vnd_ccc_cfg_changed(uint16_t value)
+static void vnd_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	simulate_vnd = (value == BT_GATT_CCC_INDICATE) ? 1 : 0;
 }
diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c
index 57dc255e6..e5d796149 100644
--- a/samples/bluetooth/peripheral_csc/src/main.c
+++ b/samples/bluetooth/peripheral_csc/src/main.c
@@ -100,12 +100,14 @@ static uint8_t sensor_location; /* Current Sensor Location */
 static bool csc_simulate;
 static bool ctrl_point_configured;
 
-static void csc_meas_ccc_cfg_changed(uint16_t value)
+static void csc_meas_ccc_cfg_changed(const struct bt_gatt_attr *attr,
+				     uint16_t value)
 {
 	csc_simulate = value == BT_GATT_CCC_NOTIFY;
 }
 
-static void ctrl_point_ccc_cfg_changed(uint16_t value)
+static void ctrl_point_ccc_cfg_changed(const struct bt_gatt_attr *attr,
+				       uint16_t value)
 {
 	ctrl_point_configured = value == BT_GATT_CCC_INDICATE;
 }
diff --git a/samples/bluetooth/peripheral_esp/src/main.c b/samples/bluetooth/peripheral_esp/src/main.c
index 9fbf66b27..39b134b86 100644
--- a/samples/bluetooth/peripheral_esp/src/main.c
+++ b/samples/bluetooth/peripheral_esp/src/main.c
@@ -156,7 +156,8 @@ static struct humidity_sensor sensor_3 = {
 		.meas.meas_uncertainty = 0x01,
 };
 
-static void temp_ccc_cfg_changed(uint16_t value)
+static void temp_ccc_cfg_changed(const struct bt_gatt_attr *attr,
+				 uint16_t value)
 {
 	simulate_temp = value == BT_GATT_CCC_NOTIFY;
 }