Skip to content

Commit 3f9f58c

Browse files
hubertmishubertmis
committed
Update SoftDevice to version 6.0.0
1 parent 87e35e0 commit 3f9f58c

22 files changed

+8441
-7967
lines changed

‎external/softdevice/s140/headers/ble.h

+622-620
Large diffs are not rendered by default.

‎external/softdevice/s140/headers/ble_err.h

+93-93
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
1-
/*
2-
* Copyright (c) 2012 - 2017, Nordic Semiconductor ASA
3-
* All rights reserved.
4-
*
5-
* Redistribution and use in source and binary forms, with or without modification,
6-
* are permitted provided that the following conditions are met:
7-
*
8-
* 1. Redistributions of source code must retain the above copyright notice, this
9-
* list of conditions and the following disclaimer.
10-
*
11-
* 2. Redistributions in binary form, except as embedded into a Nordic
12-
* Semiconductor ASA integrated circuit in a product or a software update for
13-
* such product, must reproduce the above copyright notice, this list of
14-
* conditions and the following disclaimer in the documentation and/or other
15-
* materials provided with the distribution.
16-
*
17-
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its
18-
* contributors may be used to endorse or promote products derived from this
19-
* software without specific prior written permission.
20-
*
21-
* 4. This software, with or without modification, must only be used with a
22-
* Nordic Semiconductor ASA integrated circuit.
23-
*
24-
* 5. Any software provided in binary form under this license must not be reverse
25-
* engineered, decompiled, modified and/or disassembled.
26-
*
27-
* THIS SOFTWARE IS PROVIDED BY NORDIC SEMICONDUCTOR ASA "AS IS" AND ANY EXPRESS
28-
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
29-
* OF MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE ARE
30-
* DISCLAIMED. IN NO EVENT SHALL NORDIC SEMICONDUCTOR ASA OR CONTRIBUTORS BE
31-
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
33-
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
36-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37-
*/
38-
39-
/**
40-
@addtogroup BLE_COMMON
41-
@{
42-
@addtogroup nrf_error
43-
@{
44-
@ingroup BLE_COMMON
45-
@}
46-
47-
@defgroup ble_err General error codes
48-
@{
49-
50-
@brief General error code definitions for the BLE API.
51-
52-
@ingroup BLE_COMMON
53-
*/
54-
#ifndef NRF_BLE_ERR_H__
55-
#define NRF_BLE_ERR_H__
56-
57-
#include "nrf_error.h"
58-
59-
#ifdef __cplusplus
60-
extern "C" {
61-
#endif
62-
63-
/* @defgroup BLE_ERRORS Error Codes
64-
* @{ */
65-
#define BLE_ERROR_NOT_ENABLED (NRF_ERROR_STK_BASE_NUM+0x001) /**< @ref sd_ble_enable has not been called. */
66-
#define BLE_ERROR_INVALID_CONN_HANDLE (NRF_ERROR_STK_BASE_NUM+0x002) /**< Invalid connection handle. */
67-
#define BLE_ERROR_INVALID_ATTR_HANDLE (NRF_ERROR_STK_BASE_NUM+0x003) /**< Invalid attribute handle. */
68-
#define BLE_ERROR_NO_TX_PACKETS (NRF_ERROR_STK_BASE_NUM+0x004) /**< Not enough application packets available on this connection. */
69-
#define BLE_ERROR_INVALID_ROLE (NRF_ERROR_STK_BASE_NUM+0x005) /**< Invalid role. */
70-
#define BLE_ERROR_BLOCKED_BY_OTHER_LINKS (NRF_ERROR_STK_BASE_NUM+0x006) /**< The attempt to change link settings failed due to the scheduling of other links. */
71-
/** @} */
72-
73-
74-
/** @defgroup BLE_ERROR_SUBRANGES Module specific error code subranges
75-
* @brief Assignment of subranges for module specific error codes.
76-
* @note For specific error codes, see ble_<module>.h or ble_error_<module>.h.
77-
* @{ */
78-
#define NRF_L2CAP_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x100) /**< L2CAP specific errors. */
79-
#define NRF_GAP_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x200) /**< GAP specific errors. */
80-
#define NRF_GATTC_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x300) /**< GATT client specific errors. */
81-
#define NRF_GATTS_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x400) /**< GATT server specific errors. */
82-
/** @} */
83-
84-
#ifdef __cplusplus
85-
}
86-
#endif
87-
#endif
88-
89-
90-
/**
91-
@}
92-
@}
93-
*/
1+
/*
2+
* Copyright (c) 2012 - 2018, Nordic Semiconductor ASA
3+
* All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without modification,
6+
* are permitted provided that the following conditions are met:
7+
*
8+
* 1. Redistributions of source code must retain the above copyright notice, this
9+
* list of conditions and the following disclaimer.
10+
*
11+
* 2. Redistributions in binary form, except as embedded into a Nordic
12+
* Semiconductor ASA integrated circuit in a product or a software update for
13+
* such product, must reproduce the above copyright notice, this list of
14+
* conditions and the following disclaimer in the documentation and/or other
15+
* materials provided with the distribution.
16+
*
17+
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its
18+
* contributors may be used to endorse or promote products derived from this
19+
* software without specific prior written permission.
20+
*
21+
* 4. This software, with or without modification, must only be used with a
22+
* Nordic Semiconductor ASA integrated circuit.
23+
*
24+
* 5. Any software provided in binary form under this license must not be reverse
25+
* engineered, decompiled, modified and/or disassembled.
26+
*
27+
* THIS SOFTWARE IS PROVIDED BY NORDIC SEMICONDUCTOR ASA "AS IS" AND ANY EXPRESS
28+
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
29+
* OF MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE ARE
30+
* DISCLAIMED. IN NO EVENT SHALL NORDIC SEMICONDUCTOR ASA OR CONTRIBUTORS BE
31+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
33+
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
36+
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37+
*/
38+
39+
/**
40+
@addtogroup BLE_COMMON
41+
@{
42+
@addtogroup nrf_error
43+
@{
44+
@ingroup BLE_COMMON
45+
@}
46+
47+
@defgroup ble_err General error codes
48+
@{
49+
50+
@brief General error code definitions for the BLE API.
51+
52+
@ingroup BLE_COMMON
53+
*/
54+
#ifndef NRF_BLE_ERR_H__
55+
#define NRF_BLE_ERR_H__
56+
57+
#include "nrf_error.h"
58+
59+
#ifdef __cplusplus
60+
extern "C" {
61+
#endif
62+
63+
/* @defgroup BLE_ERRORS Error Codes
64+
* @{ */
65+
#define BLE_ERROR_NOT_ENABLED (NRF_ERROR_STK_BASE_NUM+0x001) /**< @ref sd_ble_enable has not been called. */
66+
#define BLE_ERROR_INVALID_CONN_HANDLE (NRF_ERROR_STK_BASE_NUM+0x002) /**< Invalid connection handle. */
67+
#define BLE_ERROR_INVALID_ATTR_HANDLE (NRF_ERROR_STK_BASE_NUM+0x003) /**< Invalid attribute handle. */
68+
#define BLE_ERROR_INVALID_ADV_HANDLE (NRF_ERROR_STK_BASE_NUM+0x004) /**< Invalid advertising handle. */
69+
#define BLE_ERROR_INVALID_ROLE (NRF_ERROR_STK_BASE_NUM+0x005) /**< Invalid role. */
70+
#define BLE_ERROR_BLOCKED_BY_OTHER_LINKS (NRF_ERROR_STK_BASE_NUM+0x006) /**< The attempt to change link settings failed due to the scheduling of other links. */
71+
/** @} */
72+
73+
74+
/** @defgroup BLE_ERROR_SUBRANGES Module specific error code subranges
75+
* @brief Assignment of subranges for module specific error codes.
76+
* @note For specific error codes, see ble_<module>.h or ble_error_<module>.h.
77+
* @{ */
78+
#define NRF_L2CAP_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x100) /**< L2CAP specific errors. */
79+
#define NRF_GAP_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x200) /**< GAP specific errors. */
80+
#define NRF_GATTC_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x300) /**< GATT client specific errors. */
81+
#define NRF_GATTS_ERR_BASE (NRF_ERROR_STK_BASE_NUM+0x400) /**< GATT server specific errors. */
82+
/** @} */
83+
84+
#ifdef __cplusplus
85+
}
86+
#endif
87+
#endif
88+
89+
90+
/**
91+
@}
92+
@}
93+
*/

0 commit comments

Comments
 (0)