You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2015/12/10 03:56:43 UTC
[2/3] incubator-mynewt-larva git commit: Split ble_hs.h into a public
and private header.
Split ble_hs.h into a public and private header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/8c0118a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/8c0118a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/8c0118a1
Branch: refs/heads/master
Commit: 8c0118a14ba250fb55d6f3008045d8657605c8c2
Parents: 05254c7
Author: Christopher Collins <cc...@gmail.com>
Authored: Wed Dec 9 14:26:37 2015 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Wed Dec 9 18:52:07 2015 -0800
----------------------------------------------------------------------
net/nimble/host/include/host/ble_hs.h | 31 +++++-------------
net/nimble/host/src/ble_att.c | 2 +-
net/nimble/host/src/ble_att_clt.c | 2 +-
net/nimble/host/src/ble_att_cmd.c | 2 +-
net/nimble/host/src/ble_att_svr.c | 2 +-
net/nimble/host/src/ble_gap.c | 2 +-
net/nimble/host/src/ble_gap_conn.c | 2 +-
net/nimble/host/src/ble_gatt.c | 2 +-
net/nimble/host/src/ble_hs.c | 2 +-
net/nimble/host/src/ble_hs_conn.c | 2 +-
net/nimble/host/src/ble_hs_hci_batch.c | 2 +-
net/nimble/host/src/ble_hs_priv.h | 39 +++++++++++++++++++++++
net/nimble/host/src/ble_hs_uuid.c | 2 +-
net/nimble/host/src/ble_l2cap.c | 2 +-
net/nimble/host/src/host_hci.c | 2 +-
net/nimble/host/src/host_hci_cmd.c | 2 +-
net/nimble/host/src/test/ble_att_clt_test.c | 2 +-
net/nimble/host/src/test/ble_att_svr_test.c | 2 +-
net/nimble/host/src/test/ble_gap_test.c | 2 +-
net/nimble/host/src/test/ble_host_hci_test.c | 2 +-
net/nimble/host/src/test/ble_hs_conn_test.c | 2 +-
net/nimble/host/src/test/ble_hs_test.c | 2 +-
net/nimble/host/src/test/ble_hs_test_util.c | 2 +-
net/nimble/host/src/test/ble_l2cap_test.c | 2 +-
24 files changed, 69 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/include/host/ble_hs.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/include/host/ble_hs.h b/net/nimble/host/include/host/ble_hs.h
index 45cc4dd..9afa8b1 100644
--- a/net/nimble/host/include/host/ble_hs.h
+++ b/net/nimble/host/include/host/ble_hs.h
@@ -4,7 +4,7 @@
* 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
@@ -14,36 +14,21 @@
* limitations under the License.
*/
-#ifndef _BLE_HOST_H
-#define _BLE_HOST_H
+#ifndef H_BLE_HS_
+#define H_BLE_HS_
#include <inttypes.h>
-struct os_mbuf;
#define BLE_HS_EAGAIN 1
#define BLE_HS_EALREADY 2
#define BLE_HS_EINVAL 3
#define BLE_HS_EMSGSIZE 4
#define BLE_HS_ENOENT 5
-#define BLE_HS_ENOMEM 5
-#define BLE_HS_ENOTCONN 6
-#define BLE_HS_ENOTSUP 7
-#define BLE_HS_EATT 8
-
-#define BLE_HOST_HCI_EVENT_CTLR_EVENT (OS_EVENT_T_PERUSER + 0)
-#define BLE_HS_KICK_HCI_EVENT (OS_EVENT_T_PERUSER + 1)
-#define BLE_HS_KICK_GATT_EVENT (OS_EVENT_T_PERUSER + 2)
-#define BLE_HS_RX_DATA_EVENT (OS_EVENT_T_PERUSER + 3)
-#define BLE_HS_TX_DATA_EVENT (OS_EVENT_T_PERUSER + 4)
-
-extern struct os_mbuf_pool ble_hs_mbuf_pool;
-extern struct os_eventq ble_hs_evq;
+#define BLE_HS_ENOMEM 6
+#define BLE_HS_ENOTCONN 7
+#define BLE_HS_ENOTSUP 8
+#define BLE_HS_EATT 9
-void ble_hs_process_tx_data_queue(void);
-int ble_hs_rx_data(struct os_mbuf *om);
-int ble_hs_tx_data(struct os_mbuf *om);
-void ble_hs_kick_hci(void);
-void ble_hs_kick_gatt(void);
int ble_hs_init(uint8_t prio);
-#endif /* _BLE_HOST_H */
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_att.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att.c b/net/nimble/host/src/ble_att.c
index 9ce0fe0..b30b04a 100644
--- a/net/nimble/host/src/ble_att.c
+++ b/net/nimble/host/src/ble_att.c
@@ -16,7 +16,7 @@
#include <stddef.h>
#include <errno.h>
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "ble_l2cap.h"
#include "ble_att_cmd.h"
#include "ble_att_priv.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_att_clt.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_clt.c b/net/nimble/host/src/ble_att_clt.c
index cf10000..5b913bc 100644
--- a/net/nimble/host/src/ble_att_clt.c
+++ b/net/nimble/host/src/ble_att_clt.c
@@ -21,7 +21,7 @@
#include "os/os_mempool.h"
#include "nimble/ble.h"
#include "host/ble_gatt.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_uuid.h"
#include "ble_hs_conn.h"
#include "ble_att_cmd.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_att_cmd.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_cmd.c b/net/nimble/host/src/ble_att_cmd.c
index b3cf355..f08ce51 100644
--- a/net/nimble/host/src/ble_att_cmd.c
+++ b/net/nimble/host/src/ble_att_cmd.c
@@ -18,7 +18,7 @@
#include <string.h>
#include "os/os.h"
#include "nimble/ble.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_att.h"
#include "host/ble_hs_uuid.h"
#include "ble_l2cap.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_att_svr.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_svr.c b/net/nimble/host/src/ble_att_svr.c
index c7d3abc..b08754b 100644
--- a/net/nimble/host/src/ble_att_svr.c
+++ b/net/nimble/host/src/ble_att_svr.c
@@ -19,7 +19,7 @@
#include <assert.h>
#include "os/os.h"
#include "nimble/ble.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "ble_l2cap.h"
#include "ble_hs_conn.h"
#include "host/ble_hs_uuid.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_gap.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gap.c b/net/nimble/host/src/ble_gap.c
index 56a77d4..27587af 100644
--- a/net/nimble/host/src/ble_gap.c
+++ b/net/nimble/host/src/ble_gap.c
@@ -17,7 +17,7 @@
#include <stddef.h>
#include <errno.h>
#include <string.h>
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_gap.h"
#include "ble_hs_hci_batch.h"
#include "ble_gap_conn.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_gap_conn.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gap_conn.c b/net/nimble/host/src/ble_gap_conn.c
index 9942734..9f9b101 100644
--- a/net/nimble/host/src/ble_gap_conn.c
+++ b/net/nimble/host/src/ble_gap_conn.c
@@ -18,7 +18,7 @@
#include <string.h>
#include <errno.h>
#include "os/os.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/host_hci.h"
#include "ble_hs_ack.h"
#include "ble_hs_conn.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_gatt.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gatt.c b/net/nimble/host/src/ble_gatt.c
index 2671ebc..05c2868 100644
--- a/net/nimble/host/src/ble_gatt.c
+++ b/net/nimble/host/src/ble_gatt.c
@@ -22,7 +22,7 @@
#include "os/os_mempool.h"
#include "nimble/ble.h"
#include "host/ble_gatt.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_uuid.h"
#include "ble_hs_conn.h"
#include "ble_att_cmd.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_hs.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs.c b/net/nimble/host/src/ble_hs.c
index a5a4936..5d72e4e 100644
--- a/net/nimble/host/src/ble_hs.c
+++ b/net/nimble/host/src/ble_hs.c
@@ -20,7 +20,7 @@
#include "nimble/hci_transport.h"
#include "host/host_hci.h"
#include "host/ble_gatt.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "ble_att_priv.h"
#include "ble_hs_conn.h"
#include "ble_hs_ack.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_hs_conn.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_conn.c b/net/nimble/host/src/ble_hs_conn.c
index b97718d..b573bc7 100644
--- a/net/nimble/host/src/ble_hs_conn.c
+++ b/net/nimble/host/src/ble_hs_conn.c
@@ -19,7 +19,7 @@
#include <errno.h>
#include "os/os.h"
#include "host/host_hci.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "ble_l2cap.h"
#include "ble_l2cap_sig.h"
#include "ble_hs_conn.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_hs_hci_batch.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_hci_batch.c b/net/nimble/host/src/ble_hs_hci_batch.c
index 809203a..f89a4a8 100644
--- a/net/nimble/host/src/ble_hs_hci_batch.c
+++ b/net/nimble/host/src/ble_hs_hci_batch.c
@@ -19,7 +19,7 @@
#include <errno.h>
#include "os/os.h"
#include "host/host_hci.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "ble_hs_ack.h"
#include "ble_gap_conn.h"
#include "ble_hs_hci_batch.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_hs_priv.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_priv.h b/net/nimble/host/src/ble_hs_priv.h
new file mode 100644
index 0000000..6daedd6
--- /dev/null
+++ b/net/nimble/host/src/ble_hs_priv.h
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2015 Runtime Inc.
+ *
+ * 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.
+ */
+
+#ifndef H_BLE_HS_PRIV_
+#define H_BLE_HS_PRIV_
+
+#include <inttypes.h>
+#include "host/ble_hs.h"
+struct os_mbuf;
+
+#define BLE_HOST_HCI_EVENT_CTLR_EVENT (OS_EVENT_T_PERUSER + 0)
+#define BLE_HS_KICK_HCI_EVENT (OS_EVENT_T_PERUSER + 1)
+#define BLE_HS_KICK_GATT_EVENT (OS_EVENT_T_PERUSER + 2)
+#define BLE_HS_RX_DATA_EVENT (OS_EVENT_T_PERUSER + 3)
+#define BLE_HS_TX_DATA_EVENT (OS_EVENT_T_PERUSER + 4)
+
+extern struct os_mbuf_pool ble_hs_mbuf_pool;
+extern struct os_eventq ble_hs_evq;
+
+void ble_hs_process_tx_data_queue(void);
+int ble_hs_rx_data(struct os_mbuf *om);
+int ble_hs_tx_data(struct os_mbuf *om);
+void ble_hs_kick_hci(void);
+void ble_hs_kick_gatt(void);
+
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_hs_uuid.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_uuid.c b/net/nimble/host/src/ble_hs_uuid.c
index 06da0c8..2dd5d83 100644
--- a/net/nimble/host/src/ble_hs_uuid.c
+++ b/net/nimble/host/src/ble_hs_uuid.c
@@ -20,7 +20,7 @@
#include <errno.h>
#include "os/os_mbuf.h"
#include "nimble/ble.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_uuid.h"
static uint8_t ble_hs_uuid_base[16] = {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/ble_l2cap.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_l2cap.c b/net/nimble/host/src/ble_l2cap.c
index 04ca0be..d4cf433 100644
--- a/net/nimble/host/src/ble_l2cap.c
+++ b/net/nimble/host/src/ble_l2cap.c
@@ -20,7 +20,7 @@
#include "os/os.h"
#include "nimble/ble.h"
#include "nimble/hci_common.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/host_hci.h"
#include "ble_hs_conn.h"
#include "ble_l2cap.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/host_hci.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/host_hci.c b/net/nimble/host/src/host_hci.c
index 3a442d2..a159468 100644
--- a/net/nimble/host/src/host_hci.c
+++ b/net/nimble/host/src/host_hci.c
@@ -23,7 +23,7 @@
#include "nimble/hci_common.h"
#include "nimble/hci_transport.h"
#include "host/host_hci.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host_dbg.h"
#include "ble_hs_conn.h"
#include "ble_l2cap.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/host_hci_cmd.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/host_hci_cmd.c b/net/nimble/host/src/host_hci_cmd.c
index 5d28f62..fd27ef8 100644
--- a/net/nimble/host/src/host_hci_cmd.c
+++ b/net/nimble/host/src/host_hci_cmd.c
@@ -22,7 +22,7 @@
#include "console/console.h"
#include "nimble/hci_common.h"
#include "nimble/hci_transport.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/host_hci.h"
#include "host_dbg.h"
#include "ble_hs_ack.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_att_clt_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_att_clt_test.c b/net/nimble/host/src/test/ble_att_clt_test.c
index 7c00673..6b14176 100644
--- a/net/nimble/host/src/test/ble_att_clt_test.c
+++ b/net/nimble/host/src/test/ble_att_clt_test.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include "testutil/testutil.h"
#include "nimble/ble.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_test.h"
#include "ble_hs_conn.h"
#include "ble_att_priv.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_att_svr_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_att_svr_test.c b/net/nimble/host/src/test/ble_att_svr_test.c
index 01a84e1..54a11ad 100644
--- a/net/nimble/host/src/test/ble_att_svr_test.c
+++ b/net/nimble/host/src/test/ble_att_svr_test.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <string.h>
#include "nimble/hci_common.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_test.h"
#include "host/ble_hs_uuid.h"
#include "testutil/testutil.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_gap_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_gap_test.c b/net/nimble/host/src/test/ble_gap_test.c
index b769dc8..b353da4 100644
--- a/net/nimble/host/src/test/ble_gap_test.c
+++ b/net/nimble/host/src/test/ble_gap_test.c
@@ -19,7 +19,7 @@
#include "testutil/testutil.h"
#include "nimble/hci_common.h"
#include "nimble/hci_transport.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_test.h"
#include "host/ble_gap.h"
#include "ble_hs_test_util.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_host_hci_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_host_hci_test.c b/net/nimble/host/src/test/ble_host_hci_test.c
index 062059e..271104f 100644
--- a/net/nimble/host/src/test/ble_host_hci_test.c
+++ b/net/nimble/host/src/test/ble_host_hci_test.c
@@ -19,7 +19,7 @@
#include <string.h>
#include "nimble/hci_common.h"
#include "host/host_hci.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_test.h"
#include "testutil/testutil.h"
#include "ble_l2cap.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_hs_conn_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_hs_conn_test.c b/net/nimble/host/src/test/ble_hs_conn_test.c
index 1cfbfc7..5b6feff 100644
--- a/net/nimble/host/src/test/ble_hs_conn_test.c
+++ b/net/nimble/host/src/test/ble_hs_conn_test.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <string.h>
#include "nimble/hci_common.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_test.h"
#include "host/host_hci.h"
#include "ble_l2cap.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_hs_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_hs_test.c b/net/nimble/host/src/test/ble_hs_test.c
index 7724cd8..61235d8 100644
--- a/net/nimble/host/src/test/ble_hs_test.c
+++ b/net/nimble/host/src/test/ble_hs_test.c
@@ -16,7 +16,7 @@
#include "os/os.h"
#include "nimble/hci_common.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/ble_hs_test.h"
#include "testutil/testutil.h"
#include "ble_l2cap.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_hs_test_util.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_hs_test_util.c b/net/nimble/host/src/test/ble_hs_test_util.c
index 123a160..31bfe9e 100644
--- a/net/nimble/host/src/test/ble_hs_test_util.c
+++ b/net/nimble/host/src/test/ble_hs_test_util.c
@@ -20,7 +20,7 @@
#include "nimble/hci_common.h"
#include "testutil/testutil.h"
#include "host/host_hci.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "ble_hs_ack.h"
#include "ble_hs_conn.h"
#include "ble_gap_conn.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8c0118a1/net/nimble/host/src/test/ble_l2cap_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_l2cap_test.c b/net/nimble/host/src/test/ble_l2cap_test.c
index 38bcd4d..460da5b 100644
--- a/net/nimble/host/src/test/ble_l2cap_test.c
+++ b/net/nimble/host/src/test/ble_l2cap_test.c
@@ -17,7 +17,7 @@
#include <stddef.h>
#include <errno.h>
#include "nimble/hci_common.h"
-#include "host/ble_hs.h"
+#include "ble_hs_priv.h"
#include "host/host_hci.h"
#include "host/ble_hs_test.h"
#include "ble_hs_conn.h"