Add v7.1.0 of the Nordic softdevice.

This is necessary in order to utilize the additional 16KB of SRAM in the updated nRF51822.
pull/574/head
Rohit Grover 2014-10-17 10:47:24 +01:00
parent 834362b845
commit 0c651617eb
28 changed files with 6675 additions and 6642 deletions

View File

@ -1,14 +0,0 @@
s110_nrf51822_7.0.0
This release consists of the following:
- This readme file
- The s110_nrf51822_7.0.0 license
- The s110_nrf51822_7.0.0 softdevice (binary hex file)
- The s110_nrf51822_7.0.0 API (softdevice header files)
- The s110_nrf51822_7.0.0 release notes
- The s110_nrf51822_7.0.0 migration document
IMPORTANT NOTE: If you intend to use the softdevice with the nRF51
SDK only, you do _not_ need the API files. The API header files are
already installed as part of the nRF51 SDK versions 6.0.0.

View File

@ -46,6 +46,13 @@ enum BLE_COMMON_SVCS
SD_BLE_OPT_GET, /**< Get a BLE option. */
};
/**@brief Common Option IDs.
* IDs that uniquely identify a common option.
*/
enum BLE_COMMON_OPTS
{
BLE_COMMON_OPT_RADIO_CPU_MUTEX = BLE_OPT_BASE /**< Radio CPU mutex option. @ref ble_common_opt_radio_cpu_mutex_t */
};
/** @} */
/** @addtogroup BLE_COMMON_DEFINES Defines
@ -153,9 +160,36 @@ typedef struct
uint16_t subversion_number; /**< Link Layer Sub Version number, corresponds to the SoftDevice Config ID or Firmware ID (FWID). */
} ble_version_t;
/**@brief Mutual exclusion of radio activity and CPU execution.
*
* This option configures the application's access to the CPU when the radio is active. The
* application can configure itself to have access to the CPU while the radio is active.
* By default, the application will be not able to share CPU time with the SoftDevice
* during radio activity. This parameter structure is used together with @ref sd_ble_opt_set
* to configure the @ref BLE_COMMON_OPT_RADIO_CPU_MUTEX option.
*
* @note Note that the mutual exclusion of radio activity and CPU execution should remain enabled
* when running the SoftDevice on hardware affected by PAN #44 "CCM may exceed real time
* requirements"and PAN #45 "AAR may exceed real time requirements".
*
* @note @ref sd_ble_opt_get is not supported for this option.
*
*/
typedef struct
{
uint8_t enable : 1; /**< Enable mutual exclusion of radio activity and the CPU execution. */
} ble_common_opt_radio_cpu_mutex_t;
/**@brief Option structure for common options. */
typedef union
{
ble_common_opt_radio_cpu_mutex_t radio_cpu_mutex; /**< Parameters for the option for the mutual exclusion of radio activity and CPU execution. */
} ble_common_opt_t;
/**@brief Common BLE Option type, wrapping the module specific options. */
typedef union
{
ble_common_opt_t common_opt; /**< Common option, opt_id in BLE_COMMON_OPT_* series. */
ble_gap_opt_t gap; /**< GAP option, opt_id in BLE_GAP_OPT_* series. */
} ble_opt_t;

View File

@ -366,8 +366,10 @@ typedef struct
ble_gap_addr_t* p_peer_addr; /**< For BLE_GAP_CONN_MODE_DIRECTED mode only, known peer address. */
uint8_t fp; /**< Filter Policy, see @ref BLE_GAP_ADV_FILTER_POLICIES. */
ble_gap_whitelist_t * p_whitelist; /**< Pointer to whitelist, NULL if none is given. */
uint16_t interval; /**< Advertising interval between 0x0020 and 0x4000 in 0.625 ms units (20ms to 10.24s), see @ref BLE_GAP_ADV_INTERVALS. This parameter must be set to 0 if type equals @ref BLE_GAP_ADV_TYPE_ADV_DIRECT_IND. */
uint16_t timeout; /**< Advertising timeout between 0x0001 and 0x3FFF in seconds, 0x0000 disables timeout. See also @ref BLE_GAP_ADV_TIMEOUT_VALUES. This parameter must be set to 0 if type equals @ref BLE_GAP_ADV_TYPE_ADV_DIRECT_IND. */
uint16_t interval; /**< Advertising interval between 0x0020 and 0x4000 in 0.625 ms units (20ms to 10.24s), see @ref BLE_GAP_ADV_INTERVALS.
- If type equals @ref BLE_GAP_ADV_TYPE_ADV_DIRECT_IND, this parameter must be set to 0 for high duty cycle directed advertising.
- If type equals @ref BLE_GAP_ADV_TYPE_ADV_DIRECT_IND, set @ref BLE_GAP_ADV_INTERVAL_MIN <= interval <= @ref BLE_GAP_ADV_INTERVAL_MAX for low duty cycle advertising */
uint16_t timeout; /**< Advertising timeout between 0x0001 and 0x3FFF in seconds, 0x0000 disables timeout. See also @ref BLE_GAP_ADV_TIMEOUT_VALUES. If type equals @ref BLE_GAP_ADV_TYPE_ADV_DIRECT_IND, this parameter must be set to 0 for High duty cycle directed advertising. */
} ble_gap_adv_params_t;
@ -923,6 +925,7 @@ SVCALL(SD_BLE_GAP_DEVICE_NAME_GET, uint32_t, sd_ble_gap_device_name_get(uint8_t
* @return @ref NRF_ERROR_INVALID_PARAM Invalid parameter(s) supplied.
* @return @ref NRF_ERROR_INVALID_STATE Invalid state to perform operation.
* @return @ref BLE_ERROR_INVALID_CONN_HANDLE Invalid connection handle supplied.
* @return @ref NRF_ERROR_TIMEOUT A SMP timeout has occured, and further SMP operations on this link is prohibited.
*/
SVCALL(SD_BLE_GAP_AUTHENTICATE, uint32_t, sd_ble_gap_authenticate(uint16_t conn_handle, ble_gap_sec_params_t const * const p_sec_params));

View File

@ -16,7 +16,7 @@
{ \
__asm( \
"svc %0\n" \
"bx r14" : : "I" ((uint32_t)number) : "r0" \
"bx r14" : : "I" (number) : "r0" \
); \
}
#elif defined (__ICCARM__)

View File

@ -0,0 +1,16 @@
s110_nrf51822_7.1.0
This release consists of the following:
- This readme file
- The s110_nrf51822_7.1.0 license
- The s110_nrf51822_7.1.0 softdevice (binary hex file)
- The s110_nrf51822_7.1.0 API (softdevice header files)
- The s110_nrf51822_7.1.0 release notes
IMPORTANT NOTE:
If you intend to use the CPU unlock feature of this relase, replace
the header files in the SDK (nRF51 SDK version 6.0.0) with the header
files in this release.
Otherwise, you may continue to use the header files already installed
as part of the nRF51 SDK versions 6.0.0.

View File

@ -473,6 +473,10 @@ class NRF51822(Target):
# the following is a list of possible Nordic softdevices in decreasing order
# of preference.
EXPECTED_SOFTDEVICES_WITH_OFFSETS = [
{
'name' : 's110_nrf51822_7.1.0_softdevice.hex',
'offset' : 0x16000
},
{
'name' : 's110_nrf51822_7.0.0_softdevice.hex',
'offset' : 0x16000