No Ports reduced to 1

tkuyucu-nordicsemi · tkuyucu-nordicsemi · commit 9b701f6a496a · 2014-02-07T10:28:34.000+01:00
Licensing headers replaced with mbed Apache.
SPI/SPIS pin configuration is done via PIN_CNF
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s
@@ -1,15 +1,14 @@
-; Copyright (c) 2009 Nordic Semiconductor. All Rights Reserved.
-;
-; 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.
-;
-; 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.
- 
-; NOTE: Template files (including this one) are application specific and therefore 
-; expected to be copied into the application project folder prior to its use!
+; mbed Microcontroller Library
+; Copyright (c) 2006-2013 ARM Limited
+;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
+;http://www.apache.org/licenses/LICENSE-2.0
+;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.
 
 ; Description message
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51.h
@@ -1,28 +1,19 @@
+/* mbed Microcontroller Library
 
-/****************************************************************************************************//**
- * @file     nRF51.h
+ * Copyright (c) 2006-2013 ARM Limited
  *
- * @brief    CMSIS Cortex-M0 Peripheral Access Layer Header File for
- *           nRF51 from 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
  *
- * @version  V2.4C
- * @date     31. October 2013
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * @note     Generated with SVDConv V2.77p 
- *           from CMSIS SVD File 'nRF51.xml' Version 2.4C,
- *
- * @par      Copyright (c) 2009 Nordic Semiconductor. All Rights Reserved. 
- *           
- *           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. 
- *           
- *           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.
+ */
 
 
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51822.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51822.h
@@ -1,13 +1,18 @@
-/* Copyright (c) 2009 Nordic Semiconductor. All Rights Reserved.
+/* mbed Microcontroller Library
+
+ * Copyright (c) 2006-2013 ARM Limited
  *
- * 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.
+ * 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
  *
- * 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * 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.
  */
 
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.c b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.c
@@ -1,13 +1,18 @@
-/* Copyright (c) 2009 Nordic Semiconductor. All Rights Reserved.
+/* mbed Microcontroller Library
+
+ * Copyright (c) 2006-2013 ARM Limited
  *
- * 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.
+ * 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
  *
- * 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * 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.
  */
 
 
@@ -88,8 +93,7 @@ void SystemInit(void)
     NRF_CLOCK->TASKS_HFCLKSTART     = 1;
 
     // Wait for the external oscillator to start up.
-    while (NRF_CLOCK->EVENTS_HFCLKSTARTED == 0) 
-    {
+    while (NRF_CLOCK->EVENTS_HFCLKSTARTED == 0) {
         // Do nothing.
     }
 }
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.h
@@ -1,13 +1,18 @@
-/* Copyright (c) 2009 Nordic Semiconductor. All Rights Reserved.
+/* mbed Microcontroller Library
+
+ * Copyright (c) 2006-2013 ARM Limited
  *
- * 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.
+ * 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
  *
- * 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * 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.
  */
 
 
@@ -34,16 +39,6 @@ extern uint32_t SystemCoreClock;    /*!< System Clock Frequency (Core Clock)  */
  */
 extern void SystemInit (void);
 
-/**
- * Enable Soft Device
- *
- * @param  none
- * @return none
- *
- * @brief  Initializes softdevice with NRF_CLOCK_LFCLKSRC_XTAL_20_PPM
- */
-extern void EnableSoftDevice (void);
-
 
 /**
  * Update SystemCoreClock variable
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PinNames.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PinNames.h
@@ -30,92 +30,88 @@ typedef enum {
 #define PORT_SHIFT  3
 
 typedef enum {
-    p0=0,
-    p1=1,
-    p2=2,
-    p3=3,
-    p4=4,
-    p5=5,
-    p6=6,
-    p7=7,
-    p8=8,
-    p9=9,
-    p10=10,
-    p11=11,
-    p12=12,
-    p13=13,
-    p14=14,
-    p15=15,
-    p16=16,
-    p17=17,
-    p18=18,
-    p19=19,
-    p20=20,
-    p21=21,
-    p22=22,
-    p23=23,
-    p24=24,
-    p25=25,
-    p26=26,
-    p27=27,
-    p28=28,
-    p29=29,
-    p30=30,
+    p0  = 0,
+    p1  = 1,
+    p2  = 2,
+    p3  = 3,
+    p4  = 4,
+    p5  = 5,
+    p6  = 6,
+    p7  = 7,
+    p8  = 8,
+    p9  = 9,
+    p10 = 10,
+    p11 = 11,
+    p12 = 12,
+    p13 = 13,
+    p14 = 14,
+    p15 = 15,
+    p16 = 16,
+    p17 = 17,
+    p18 = 18,
+    p19 = 19,
+    p20 = 20,
+    p21 = 21,
+    p22 = 22,
+    p23 = 23,
+    p24 = 24,
+    p25 = 25,
+    p26 = 26,
+    p27 = 27,
+    p28 = 28,
+    p29 = 29,
+    p30 = 30,
 //    p31=31,    
     
-    P0_0 = p0,
-    P0_1 = p1,
-    P0_2 = p2,
-    P0_3 = p3,
-    P0_4 = p4,
-    P0_5 = p5,
-    P0_6 = p6,
-    P0_7 = p7,
+    P0_0  = p0,
+    P0_1  = p1,
+    P0_2  = p2,
+    P0_3  = p3,
+    P0_4  = p4,
+    P0_5  = p5,
+    P0_6  = p6,
+    P0_7  = p7,
     
-    P1_0 = p8,
-    P1_1 = p9,
-    P1_2 = p10,
-    P1_3 = p11,
-    P1_4 = p12,
-    P1_5 = p13,
-    P1_6 = p14,
-    P1_7 = p15,
+    P0_8  = p8,
+    P0_9  = p9,
+    P0_10 = p10,
+    P0_11 = p11,
+    P0_12 = p12,
+    P0_13 = p13,
+    P0_14 = p14,
+    P0_15 = p15,
     
-    P2_0 = p16,
-    P2_1 = p17,
-    P2_2 = p18,
-    P2_3 = p19,
-    P2_4 = p20,
-    P2_5 = p21,
-    P2_6 = p22,
-    P2_7 = p23,
+    P0_16 = p16,
+    P0_17 = p17,
+    P0_18 = p18,
+    P0_19 = p19,
+    P0_20 = p20,
+    P0_21 = p21,
+    P0_22 = p22,
+    P0_23 = p23,
     
-    P3_0 = p24,
-    P3_1 = p25,
-    P3_2 = p26,
-    P3_3 = p27,
-    P3_4 = p28,
-    P3_5 = p29,
-    P3_6 = p30,
-    //P3_7 = p31,
+    P0_24 = p24,
+    P0_25 = p25,
+    P0_26 = p26,
+    P0_27 = p27,
+    P0_28 = p28,
+    P0_29 = p29,
+    P0_30 = p30,
     
-    LED_START = p18,
-    LED_STOP = p19,
-    LED1 = LED_START,
-    LED2 = LED_STOP,
-    LED3 = LED_START,
-    LED4 = LED_STOP,
+    LED1 = p18,
+    LED2 = p19,
+    LED3 = p18,
+    LED4 = p19,
 
-    BUTTON_START = p16,
-    BUTTON_STOP = p17,
-    BUTTON0 = BUTTON_START,
-    BUTTON1 = BUTTON_STOP,
-    // USB Pins
+    BUTTON0 = p16,
+    BUTTON1 = p17,
+        
     RX_PIN_NUMBER = p11,
     TX_PIN_NUMBER = p9,
     CTS_PIN_NUMBER = p10,
     RTS_PIN_NUMBER = p8,
-    
+
+    // mBed interface Pins
     USBTX = TX_PIN_NUMBER,
     USBRX = RX_PIN_NUMBER,
         
@@ -133,15 +129,20 @@ typedef enum {
     SPIS_PSELMISO = p13,
     SPIS_PSELSS = p14,    
     SPIS_PSELSCK = p15,
-    
+
+    I2C_SDA0 = p22,
+    I2C_SCL0 = p20,
+
+    I2C_SDA1 = p13,
+    I2C_SCL1 = p15,
     // Not connected
     NC = (int)0xFFFFFFFF
 } PinName;
 
 typedef enum {
     PullNone = 0,
     PullDown = 1,
-    PullUp = 3,
+    PullUp = 3
 } PinMode;
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PortNames.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PortNames.h
@@ -21,10 +21,7 @@ extern "C" {
 #endif
 
 typedef enum {
-    Port0 = 0, //GPIO pins 0-7
-    Port1 = 1, //GPIO pins 8-15
-    Port2 = 2, //GPIO pins 16-22
-    Port3 = 3, //GPIO pins 24-31
+    Port0 = 0 //GPIO pins 0-31
 } PortName;
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c
@@ -20,7 +20,7 @@ void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
     if(pin == NC) return;
 
     obj->pin = pin;
-    obj->mask = (1<<pin);
+    obj->mask = (1ul<<pin);
 
     obj->reg_set = &NRF_GPIO->OUTSET;
     obj->reg_clr = &NRF_GPIO->OUTCLR;
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/port_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/port_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
