Merge branch 'master' of https://github.com/autopulated/nRF51822 into autopulated-master

This commit is contained in:
Rohit Grover 2015-07-02 12:56:29 +01:00
commit 094e94b9f8
123 changed files with 3152 additions and 3093 deletions

59
module.json Normal file
View File

@ -0,0 +1,59 @@
{
"name": "ble-nrf51822",
"version": "0.0.1",
"description": "Nordic stack and drivers for the mbed BLE API.",
"keywords": [
"Bluetooth",
"BLE"
],
"author": "Rohit Grover",
"repository": {
"url": "git@github.com:mbedmicro/nRF51822.git",
"type": "git"
},
"homepage": "https://developer.mbed.org/teams/Nordic-Semiconductor/",
"licenses": [
{
"url": "https://spdx.org/licenses/Apache-2.0",
"type": "Apache-2.0"
}
],
"dependencies": {
"ble": "~0.0.0"
},
"extraIncludes": [
"ble-nrf51822",
"ble-nrf51822/btle",
"ble-nrf51822/btle/custom",
"ble-nrf51822/common",
"source/nordic-sdk",
"source/nordic-sdk/components",
"source/nordic-sdk/components/libraries",
"source/nordic-sdk/components/libraries/scheduler",
"source/nordic-sdk/components/libraries/util",
"source/nordic-sdk/components/libraries/hci",
"source/nordic-sdk/components/libraries/bootloader_dfu",
"source/nordic-sdk/components/libraries/bootloader_dfu/hci_transport",
"source/nordic-sdk/components/libraries/bootloader_dfu/experimental",
"source/nordic-sdk/components/libraries/crc16",
"source/nordic-sdk/components/softdevice",
"source/nordic-sdk/components/softdevice/s130",
"source/nordic-sdk/components/softdevice/s130/include",
"source/nordic-sdk/components/softdevice/s130/doc",
"source/nordic-sdk/components/softdevice/common",
"source/nordic-sdk/components/softdevice/common/softdevice_handler",
"source/nordic-sdk/components/drivers_nrf",
"source/nordic-sdk/components/drivers_nrf/hal",
"source/nordic-sdk/components/drivers_nrf/ble_flash",
"source/nordic-sdk/components/drivers_nrf/pstorage",
"source/nordic-sdk/components/drivers_nrf/pstorage/config",
"source/nordic-sdk/components/ble",
"source/nordic-sdk/components/ble/ble_radio_notification",
"source/nordic-sdk/components/ble/ble_services",
"source/nordic-sdk/components/ble/ble_services/ble_dfu",
"source/nordic-sdk/components/ble/common",
"source/nordic-sdk/components/ble/device_manager",
"source/nordic-sdk/components/ble/device_manager/config"
],
"targetDependencies": {}
}

View File

@ -69,7 +69,7 @@
#elif defined ( __GNUC__ )
#ifndef __ASM
#define __ASM __asm /*!< asm keyword for GNU Compiler */
#define __ASM __asm__ /*!< asm keyword for GNU Compiler */
#endif
#ifndef __INLINE
@ -84,7 +84,7 @@
static inline unsigned int gcc_current_sp(void)
{
register unsigned sp asm("sp");
register unsigned sp __ASM("sp");
return sp;
}

View File

@ -29,7 +29,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "compiler_abstraction.h"
#include "bootloader_util.h"
#include <stdint.h>
#include <string.h>
@ -88,7 +88,7 @@ isr_abort
#elif defined(TOOLCHAIN_GCC)
static void bootloader_util_reset(uint32_t start_addr)
{
asm(
__ASM(
".equ MASK_ONES, 0xFFFFFFFF\n\t" /* Ones, to be loaded into register as default value before reset. */
".equ MASK_ZEROS, 0x00000000\n\t" /* Zeros, to be loaded into register as default value before reset. */
".equ xPSR_RESET, 0x21000000\n\t" /* Default value of xPSR after System Reset. */

Some files were not shown because too many files have changed in this diff Show More