Merge pull request #185 from tkuyucu/master

nrf-mbed merge

Author: emilmont

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s

@@ -1,5 +1,5 @@
 ; mbed Microcontroller Library
-; Copyright (c) 2006-2013 ARM Limited
+; Copyright (c) 2013 Nordic Semiconductor.
 ;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

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis_nvic.c

@@ -52,7 +52,7 @@ uint32_t NVIC_GetVector(IRQn_Type IRQn) {
 }*/
 
 void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
-    int i;
+   // int i;
     // Space for dynamic vectors, initialised to allocate in R/W
     static volatile uint32_t* vectors = (uint32_t*)NVIC_RAM_VECTOR_ADDRESS;
     /*

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nordic_global.h

@@ -0,0 +1,17 @@
+#ifndef _NORDIC_GLOBAL_H_
+#define _NORDIC_GLOBAL_H_
+
+/* There are no global defines in mbed, so we need to define */
+/* mandatory conditional compilation flags here              */
+//#define NRF51
+#ifndef	DEBUG_NRF_USER
+#define DEBUG_NRF_USER
+#endif
+#ifndef	BLE_STACK_SUPPORT_REQD
+#define BLE_STACK_SUPPORT_REQD
+#endif
+#ifndef	BOARD_PCA10001
+#define BOARD_PCA10001
+#endif
+
+#endif

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51.h

@@ -1,18 +1,13 @@
-/* mbed Microcontroller Library
-
- * Copyright (c) 2006-2013 ARM Limited
+/* Copyright (c) 2012 Nordic Semiconductor. All Rights Reserved.
  *
- * 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
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
  *
- * 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.
  */
 
 

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51822.h

@@ -1,6 +1,6 @@
 /* mbed Microcontroller Library
 
- * Copyright (c) 2006-2013 ARM Limited
+ * Copyright (c) 2013 Nordic Semiconductor.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #ifndef NRF_H
 #define NRF_H
 
-
+#include "nordic_global.h"
 #include "compiler_abstraction.h"
 #include "nrf51.h"
 #include "nrf51_bitfields.h"

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.c

@@ -1,6 +1,6 @@
 /* mbed Microcontroller Library
 
- * Copyright (c) 2006-2013 ARM Limited
+ * Copyright (c) 2013 Nordic Semiconductor.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,33 +43,19 @@ void SystemCoreClockUpdate(void)
 }
 
 void SystemInit(void)
-{
+{   
+    NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos);
+    while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
+    }
+    //write FWID (NRF_UICR->FWID is readonly)
+    *(uint32_t *)0x10001010 = 0xFFFF0049;
 
-    //Write the necessary UICR and FWID values if needed
-    if (NRF_UICR->CLENR0 == 0xFFFFFFFF){
-        NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos);
-        while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
-        }
-    
-        NRF_UICR->CLENR0 = 0x14000;
-        while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
-        }
-        
-        //write FWID (NRF_UICR->FWID is readonly)
-        *(uint32_t *)0x10001010 = 0xFFFF0049;
-       
-        while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
-        }
-        
-        NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos);
-        while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
-        }
-    
-        NVIC_SystemReset();
-        while (true){
-        }
+    while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
+    }
+
+    NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos);
+    while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
     }
-    
     // Prepare the peripherals for use as indicated by the PAN 26 "System: Manual setup is required
     // to enable the use of peripherals" found at Product Anomaly document for your device found at
     // https://www.nordicsemi.com/. The side effect of executing these instructions in the devices 

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.h

@@ -1,6 +1,6 @@
 /* mbed Microcontroller Library
 
- * Copyright (c) 2006-2013 ARM Limited
+ * Copyright (c) 2013 Nordic Semiconductor.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/Lib/s110_nrf51822_6.0.0/README.md

@@ -0,0 +1,174 @@
+NORDIC SEMICONDUCTOR ASA SOFTDEVICE LICENSE AGREEMENT
+
+
+License Agreement for the Nordic Semiconductor ASA ("Nordic")
+S110 Bluetooth SoftDevice software package ("SoftDevice").
+
+
+You ("You" "Licensee") must carefully and thoroughly read this License
+Agreement ("Agreement"), and accept to adhere to this Agreement before
+downloading, installing and/or using any software or content in the
+SoftDevice provided herewith.
+
+YOU ACCEPT THIS LICENSE AGREEMENT BY (A) CLICKING ACCEPT OR AGREE TO
+THIS LICENSE AGREEMENT, WHERE THIS OPTION IS MADE AVAILABLE TO YOU; OR
+(B) BY ACTUALLY USING THE SOFTDEVICE, IN THIS CASE YOU AGREE THAT THE
+USE OF THE SOFTDEVICE CONSTITUTES ACCEPTANCE OF THE LICENSING
+AGREEMENT FROM THAT POINT ONWARDS.
+
+IF YOU DO NOT AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT, THEN
+DO NOT DOWNLOAD, INSTALL/COMPLETE INSTALLATION OF, OR IN ANY OTHER WAY
+MAKE USE OF THE SOFTDEVICE.
+
+
+
+1.	Grant of License 
+
+Subject to the terms in this Agreement Nordic grants Licensee a
+limited, non-exclusive, non-transferable, non-sub licensable,
+revocable license ("License"): (a) to use the SoftDevice solely in
+connection with a Nordic integrated circuit, and (b) to distribute the
+SoftDevice solely as integrated in Licensee Product. Licensee shall
+not use the SoftDevice for any purpose other than specifically
+authorized herein. It is a material breach of this agreement to use or
+modify the SoftDevice for use on any wireless connectivity integrated
+circuit other than a Nordic integrated circuit.
+
+
+2.	Title 
+
+Nordic retains full rights, title, and ownership to the SoftDevice and
+any and all patents, copyrights, trade secrets, trade names,
+trademarks, and other intellectual property rights in and to the
+SoftDevice.
+
+
+3.	No Modifications or Reverse Engineering
+
+Licensee shall not, modify, reverse engineer, disassemble, decompile
+or otherwise attempt to discover the source code of any non-source
+code parts of the SoftDevice including, but not limited to
+pre-compiled hex files, binaries and object code.
+
+
+4.	Distribution Restrictions
+
+Except as set forward in Section 1 above, the Licensee may not
+disclose or distribute any or all parts of the SoftDevice to any third
+party. Licensee agrees to provide reasonable security precautions to
+prevent unauthorized access to or use of the SoftDevice as proscribed
+herein. Licensee also agrees that use of and access to the SoftDevice
+will be strictly limited to the employees and subcontractors of the
+Licensee necessary for the performance of development, verification
+and production tasks under this Agreement. The Licensee is responsible
+for making such employees and subcontractors comply with the
+obligations concerning use and non-disclosure of the SoftDevice.
+
+
+6.	No Other Rights 
+
+Licensee shall use the SoftDevice only in compliance with this
+Agreement and shall refrain from using the SoftDevice in any way that
+may be contrary to this Agreement.
+
+
+7.	Fees 
+
+Nordic grants the License to the Licensee free of charge provided that
+the Licensee undertakes the obligations in the Agreement and warrants
+to comply with the Agreement.
+
+
+8.	DISCLAIMER OF WARRANTY 
+
+THE SOFTDEVICE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND
+EXPRESS OR IMPLIED AND NEITHER NORDIC, ITS LICENSORS OR AFFILIATES NOR
+THE COPYRIGHT HOLDERS MAKE ANY REPRESENTATIONS OR WARRANTIES, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OR THAT THE
+SOFTDEVICE WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS. THERE IS NO WARRANTY BY NORDIC OR BY ANY
+OTHER PARTY THAT THE FUNCTIONS CONTAINED IN THE SOFTDEVICE WILL MEET
+THE REQUIREMENTS OF LICENSEE OR THAT THE OPERATION OF THE SOFTDEVICE
+WILL BE UNINTERRUPTED OR ERROR-FREE. LICENSEE ASSUMES ALL
+RESPONSIBILITY AND RISK FOR THE SELECTION OF THE SOFTDEVICE TO ACHIEVE
+LICENSEE’S INTENDED RESULTS AND FOR THE INSTALLATION, USE AND RESULTS
+OBTAINED FROM IT.
+
+
+9.	No Support
+
+Nordic is not obligated to furnish or make available to Licensee any
+further information, software, technical information, know-how,
+show-how, bug-fixes or support. Nordic reserves the right to make
+changes to the SoftDevice without further notice.
+
+
+10.	Limitation of Liability
+
+In no event shall Nordic, its employees or suppliers, licensors or
+affiliates be liable for any lost profits, revenue, sales, data or
+costs of procurement of substitute goods or services, property damage,
+personal injury, interruption of business, loss of business
+information or for any special, direct, indirect, incidental,
+economic, punitive, special or consequential damages, however caused
+and whether arising under contract, tort, negligence, or other theory
+of liability arising out of the use of or inability to use the
+SoftDevice, even if Nordic or its employees or suppliers, licensors or
+affiliates are advised of the possibility of such damages. Because
+some countries/states/jurisdictions do not allow the exclusion or
+limitation of liability, but may allow liability to be limited, in
+such cases, Nordic, its employees or licensors or affiliates’
+liability shall be limited to USD 50.
+
+
+11.	Breach of Contract
+
+Upon a breach of contract by the Licensee, Nordic and its licensor are
+entitled to damages in respect of any direct loss which can be
+reasonably attributed to the breach by the Licensee. If the Licensee
+has acted with gross negligence or willful misconduct, the Licensee
+shall cover both direct and indirect costs for Nordic and its
+licensors.
+
+
+12.	Indemnity
+
+Licensee undertakes to indemnify, hold harmless and defend Nordic and
+its directors, officers, affiliates, shareholders, licensors,
+employees and agents from and against any claims or lawsuits,
+including attorney's fees, that arise or result of the Licensee’s
+execution of the License and which is not due to causes for which
+Nordic is responsible.
+
+
+13.	Governing Law
+
+This Agreement shall be construed according to the laws of Norway, and
+hereby submits to the exclusive jurisdiction of the Oslo tingrett.
+
+
+14.	Assignment
+
+Licensee shall not assign this Agreement or any rights or obligations
+hereunder without the prior written consent of Nordic.
+
+
+15.	Termination
+
+Without prejudice to any other rights, Nordic may cancel this
+Agreement if Licensee does not abide by the terms and conditions of
+this Agreement. Upon termination Licensee must promptly cease the use
+of the License and destroy all copies of the Licensed Technology and
+any other material provided by Nordic or its affiliate, or produced by
+the Licensee in connection with the Agreement or the Licensed
+Technology.
+
+
+16.	Third party beneficiaries  
+
+Nordic’s licensors are intended third party beneficiaries under this
+Agreement.
+
+
+