You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2015/10/30 23:50:03 UTC
incubator-mynewt-larva git commit: Prefix modules, functions,
definitions and variables with ble_
Repository: incubator-mynewt-larva
Updated Branches:
refs/heads/master faa8f5424 -> 43735fadb
Prefix modules, functions, definitions and variables with ble_
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/43735fad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/43735fad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/43735fad
Branch: refs/heads/master
Commit: 43735fadb673ed209e53f2666d49565c67a9660a
Parents: faa8f54
Author: Willam San Filippo <wi...@micosa.io>
Authored: Fri Oct 30 15:49:51 2015 -0700
Committer: Willam San Filippo <wi...@micosa.io>
Committed: Fri Oct 30 15:49:51 2015 -0700
----------------------------------------------------------------------
.../controller/include/controller/ble_ll_hci.h | 42 ++++++++++
.../controller/include/controller/ble_ll_scan.h | 85 ++++++++++++++++++++
.../controller/include/controller/ll_hci.h | 42 ----------
.../controller/include/controller/ll_scan.h | 85 --------------------
4 files changed, 127 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/43735fad/net/nimble/controller/include/controller/ble_ll_hci.h
----------------------------------------------------------------------
diff --git a/net/nimble/controller/include/controller/ble_ll_hci.h b/net/nimble/controller/include/controller/ble_ll_hci.h
new file mode 100644
index 0000000..882dabb
--- /dev/null
+++ b/net/nimble/controller/include/controller/ble_ll_hci.h
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2015 Stack 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_LL_HCI_
+#define H_BLE_LL_HCI_
+
+/* Define the number of data packets that the controller can store */
+#define BLE_LL_CFG_NUM_ACL_DATA_PKTS (4)
+#define BLE_LL_CFG_ACL_DATA_PKT_LEN (256)
+
+/*
+ * This determines the number of outstanding commands allowed from the
+ * host to the controller.
+ */
+#define BLE_LL_CFG_NUM_HCI_CMD_PKTS (1)
+
+/* Initialize LL HCI */
+void ble_ll_hci_init(void);
+
+/* HCI command processing function */
+void ble_ll_hci_cmd_proc(struct os_event *ev);
+
+/* Used to determine if the LE event is enabled or disabled */
+uint8_t ble_ll_hci_is_le_event_enabled(int bitpos);
+
+/* Send event from controller to host */
+int ble_ll_hci_event_send(uint8_t *evbuf);
+
+#endif /* H_LL_ADV_ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/43735fad/net/nimble/controller/include/controller/ble_ll_scan.h
----------------------------------------------------------------------
diff --git a/net/nimble/controller/include/controller/ble_ll_scan.h b/net/nimble/controller/include/controller/ble_ll_scan.h
new file mode 100644
index 0000000..42f1be7
--- /dev/null
+++ b/net/nimble/controller/include/controller/ble_ll_scan.h
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) 2015 Stack 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_LL_SCAN_
+#define H_BLE_LL_SCAN_
+
+#define BLE_LL_SCAN_CFG_NUM_DUP_ADVS (8)
+#define BLE_LL_SCAN_CFG_NUM_SCAN_RSP_ADVS (8)
+
+/* Dont allow more than 255 of these entries */
+#if BLE_LL_SCAN_CFG_NUM_DUP_ADVSS > 255
+ #error "Cannot have more than 255 duplicate entries!"
+#endif
+#if BLE_LL_SCAN_CFG_NUM_SCAN_RSP_ADVS > 255
+ #error "Cannot have more than 255 scan response entries!"
+#endif
+
+/* Maximum amount of scan response data in a scan response */
+#define BLE_SCAN_RSP_DATA_MAX_LEN (31)
+
+/*
+ * SCAN_REQ
+ * -> ScanA (6 bytes)
+ * -> AdvA (6 bytes)
+ *
+ * ScanA is the scanners public (TxAdd=0) or random (TxAdd = 1) address
+ * AdvaA is the advertisers public (RxAdd=0) or random (RxAdd=1) address.
+ *
+ * Sent by the LL in the Scanning state; received by the LL in the advertising
+ * state. The advertising address is the intended recipient of this frame.
+ */
+#define BLE_SCAN_REQ_LEN (12)
+#define BLE_SCAN_REQ_TXTIME_USECS (176)
+
+/*
+ * SCAN_RSP
+ * -> AdvA (6 bytes)
+ * -> ScanRspData (0 - 31 bytes)
+ *
+ * AdvaA is the advertisers public (TxAdd=0) or random (TxAdd=1) address.
+ * ScanRspData may contain any data from the advertisers host.
+ *
+ * Sent by the LL in the advertising state; received by the LL in the
+ * scanning state.
+ */
+#define BLE_SCAN_RSP_MIN_LEN (6)
+#define BLE_SCAN_RSP_MAX_LEN (6 + BLE_SCAN_RSP_DATA_MAX_LEN)
+
+/*---- HCI ----*/
+/* Set scanning parameters */
+int ble_ll_scan_set_scan_params(uint8_t *cmd);
+
+/* Turn scanning on/off */
+int ble_ll_scan_set_enable(uint8_t *cmd);
+
+/*--- Controller Internal API ---*/
+/* Process scan window end event */
+void ble_ll_scan_win_end_proc(void *arg);
+
+/* Initialize the scanner */
+void ble_ll_scan_init(void);
+
+/* Called when Link Layer starts to receive a PDU and is in scanning state */
+int ble_ll_scan_rx_pdu_start(uint8_t pdu_type, struct os_mbuf *rxpdu);
+
+/* Called when Link Layer has finished receiving a PDU while scanning */
+int ble_ll_scan_rx_pdu_end(uint8_t *rxbuf);
+
+/* Process a scan response PDU */
+void ble_ll_scan_rx_pdu_proc(uint8_t pdu_type, uint8_t *rxbuf, int8_t rssi);
+
+#endif /* H_LL_SCAN_ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/43735fad/net/nimble/controller/include/controller/ll_hci.h
----------------------------------------------------------------------
diff --git a/net/nimble/controller/include/controller/ll_hci.h b/net/nimble/controller/include/controller/ll_hci.h
deleted file mode 100644
index 3d2fcd4..0000000
--- a/net/nimble/controller/include/controller/ll_hci.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2015 Stack 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_LL_HCI_
-#define H_LL_HCI_
-
-/* Define the number of data packets that the controller can store */
-#define BLE_LL_CFG_NUM_ACL_DATA_PKTS (4)
-#define BLE_LL_CFG_ACL_DATA_PKT_LEN (256)
-
-/*
- * This determines the number of outstanding commands allowed from the
- * host to the controller.
- */
-#define BLE_LL_CFG_NUM_HCI_CMD_PKTS (1)
-
-/* Initialize LL HCI */
-void ble_ll_hci_init(void);
-
-/* HCI command processing function */
-void ble_ll_hci_cmd_proc(struct os_event *ev);
-
-/* Used to determine if the LE event is enabled or disabled */
-uint8_t ble_ll_hci_is_le_event_enabled(int bitpos);
-
-/* Send event from controller to host */
-int ble_ll_hci_event_send(uint8_t *evbuf);
-
-#endif /* H_LL_ADV_ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/43735fad/net/nimble/controller/include/controller/ll_scan.h
----------------------------------------------------------------------
diff --git a/net/nimble/controller/include/controller/ll_scan.h b/net/nimble/controller/include/controller/ll_scan.h
deleted file mode 100644
index 42f1be7..0000000
--- a/net/nimble/controller/include/controller/ll_scan.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright (c) 2015 Stack 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_LL_SCAN_
-#define H_BLE_LL_SCAN_
-
-#define BLE_LL_SCAN_CFG_NUM_DUP_ADVS (8)
-#define BLE_LL_SCAN_CFG_NUM_SCAN_RSP_ADVS (8)
-
-/* Dont allow more than 255 of these entries */
-#if BLE_LL_SCAN_CFG_NUM_DUP_ADVSS > 255
- #error "Cannot have more than 255 duplicate entries!"
-#endif
-#if BLE_LL_SCAN_CFG_NUM_SCAN_RSP_ADVS > 255
- #error "Cannot have more than 255 scan response entries!"
-#endif
-
-/* Maximum amount of scan response data in a scan response */
-#define BLE_SCAN_RSP_DATA_MAX_LEN (31)
-
-/*
- * SCAN_REQ
- * -> ScanA (6 bytes)
- * -> AdvA (6 bytes)
- *
- * ScanA is the scanners public (TxAdd=0) or random (TxAdd = 1) address
- * AdvaA is the advertisers public (RxAdd=0) or random (RxAdd=1) address.
- *
- * Sent by the LL in the Scanning state; received by the LL in the advertising
- * state. The advertising address is the intended recipient of this frame.
- */
-#define BLE_SCAN_REQ_LEN (12)
-#define BLE_SCAN_REQ_TXTIME_USECS (176)
-
-/*
- * SCAN_RSP
- * -> AdvA (6 bytes)
- * -> ScanRspData (0 - 31 bytes)
- *
- * AdvaA is the advertisers public (TxAdd=0) or random (TxAdd=1) address.
- * ScanRspData may contain any data from the advertisers host.
- *
- * Sent by the LL in the advertising state; received by the LL in the
- * scanning state.
- */
-#define BLE_SCAN_RSP_MIN_LEN (6)
-#define BLE_SCAN_RSP_MAX_LEN (6 + BLE_SCAN_RSP_DATA_MAX_LEN)
-
-/*---- HCI ----*/
-/* Set scanning parameters */
-int ble_ll_scan_set_scan_params(uint8_t *cmd);
-
-/* Turn scanning on/off */
-int ble_ll_scan_set_enable(uint8_t *cmd);
-
-/*--- Controller Internal API ---*/
-/* Process scan window end event */
-void ble_ll_scan_win_end_proc(void *arg);
-
-/* Initialize the scanner */
-void ble_ll_scan_init(void);
-
-/* Called when Link Layer starts to receive a PDU and is in scanning state */
-int ble_ll_scan_rx_pdu_start(uint8_t pdu_type, struct os_mbuf *rxpdu);
-
-/* Called when Link Layer has finished receiving a PDU while scanning */
-int ble_ll_scan_rx_pdu_end(uint8_t *rxbuf);
-
-/* Process a scan response PDU */
-void ble_ll_scan_rx_pdu_proc(uint8_t pdu_type, uint8_t *rxbuf, int8_t rssi);
-
-#endif /* H_LL_SCAN_ */