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 2016/04/07 09:08:41 UTC
incubator-mynewt-core git commit: Fix incorrect scan response
advertising event type
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop a3d4e5ea2 -> fbc310f6e
Fix incorrect scan response advertising event type
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/fbc310f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/fbc310f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/fbc310f6
Branch: refs/heads/develop
Commit: fbc310f6e36009d5e6fdec60eaf7b8876bd6941c
Parents: a3d4e5e
Author: William San Filippo <wi...@runtime.io>
Authored: Thu Apr 7 00:08:18 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Thu Apr 7 00:08:18 2016 -0700
----------------------------------------------------------------------
net/nimble/include/nimble/hci_common.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fbc310f6/net/nimble/include/nimble/hci_common.h
----------------------------------------------------------------------
diff --git a/net/nimble/include/nimble/hci_common.h b/net/nimble/include/nimble/hci_common.h
index f74c176..7b93d63 100644
--- a/net/nimble/include/nimble/hci_common.h
+++ b/net/nimble/include/nimble/hci_common.h
@@ -6,7 +6,7 @@
* to you 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,
@@ -22,9 +22,9 @@
#include "ble.h"
-/*
+/*
* HCI Command Header
- *
+ *
* Comprises the following fields
* -> Opcode group field & Opcode command field (2)
* -> Parameter Length (1)
@@ -48,7 +48,7 @@
#define BLE_HCI_OGF_TESTING (0x06)
#define BLE_HCI_OGF_LE (0x08)
-/*
+/*
* Number of LE commands. NOTE: this is really just used to size the array
* containing the lengths of the LE commands.
*/
@@ -196,11 +196,11 @@
#define BLE_HCI_CONN_PEER_ADDR_RANDOM_IDENT (3)
#define BLE_HCI_CONN_PEER_ADDR_MAX (3)
-/*
+/*
* Advertising filter policy
- *
+ *
* Determines how an advertiser filters scan and connection requests.
- *
+ *
* NONE: no filtering (default value). No whitelist used.
* SCAN: process all connection requests but only scans from white list.
* CONN: process all scan request but only connection requests from white list
@@ -237,7 +237,7 @@
#define BLE_HCI_SCAN_WINDOW_MAX (16384) /* units */
#define BLE_HCI_SCAN_WINDOW_DEF (16) /* units */
-/*
+/*
* Scanning filter policy
* NO_WL:
* Scanner processes all advertising packets (white list not used) except
@@ -264,7 +264,7 @@
#define BLE_HCI_CHG_WHITE_LIST_LEN (7)
/* Create Connection */
-#define BLE_HCI_CREATE_CONN_LEN (25)
+#define BLE_HCI_CREATE_CONN_LEN (25)
#define BLE_HCI_CONN_ITVL (1250) /* usecs */
#define BLE_HCI_CONN_FILT_NO_WL (0)
#define BLE_HCI_CONN_FILT_USE_WL (1)
@@ -452,7 +452,7 @@
#define BLE_HCI_ADV_RPT_EVTYPE_DIR_IND (1)
#define BLE_HCI_ADV_RPT_EVTYPE_SCAN_IND (2)
#define BLE_HCI_ADV_RPT_EVTYPE_NONCONN_IND (3)
-#define BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP (5)
+#define BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP (4)
/* LE sub-event specific definitions */
#define BLE_HCI_LE_MIN_LEN (1) /* Not including event hdr. */
@@ -523,7 +523,7 @@ struct hci_adv_params
uint8_t own_addr_type;
uint8_t peer_addr_type;
uint8_t adv_filter_policy;
- uint16_t adv_itvl_min;
+ uint16_t adv_itvl_min;
uint16_t adv_itvl_max;
uint8_t peer_addr[BLE_DEV_ADDR_LEN];
};