Merge branch 'zero-core'

Author: cmaglie

boards.txt

@@ -1,3 +1,19 @@
+# Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 arduino_zero_edbg.name=Arduino Zero (Programming Port)
 arduino_zero_edbg.vid.0=0x03eb
 arduino_zero_edbg.pid.0=0x2157

cores/arduino/Arduino.h

@@ -1,6 +1,6 @@
 /*
   Arduino.h - Main include file for the Arduino SDK
-  Copyright (c) 2014 Arduino Team.  All right reserved.
+  Copyright (c) 2014 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

cores/arduino/HardwareSerial.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

cores/arduino/Reset.cpp

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

cores/arduino/Reset.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2012 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef RESET_H
-#define RESET_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,5 +29,3 @@ void cancelReset();
 #ifdef __cplusplus
 }
 #endif
-
-#endif

cores/arduino/Tone.cpp

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

cores/arduino/Tone.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _WIRING_TONE_
-#define _WIRING_TONE_
+#pragma once
 
 #ifdef __cplusplus
 
@@ -26,8 +25,4 @@
 void tone(uint32_t _pin, uint32_t frequency, uint32_t duration = 0);
 void noTone(uint32_t _pin);
 
-void toneAccurateClock (uint32_t);
-
-#endif /*  __cplusplus */
-
-#endif /* _WIRING_TONE_ */
+#endif

cores/arduino/Uart.cpp

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

cores/arduino/Uart.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _SERCOM_UART_CLASS
-#define _SERCOM_UART_CLASS
+#pragma once
 
 #include "HardwareSerial.h"
 #include "SERCOM.h"
@@ -56,5 +55,3 @@ class Uart : public HardwareSerial
     SercomUartCharSize extractCharSize(uint8_t config);
     SercomParityMode extractParity(uint8_t config);
 };
-
-#endif

cores/arduino/WInterrupts.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -35,24 +35,13 @@ static struct
 /* Configure I/O interrupt sources */
 static void __initialize()
 {
-#if 0
-  int i ;
-
-  for ( i = 0 ; i < EXTERNAL_NUM_INTERRUPTS ; i++ )
-  {
-    callbacksInt[i]._callback = NULL ;
-  }
-#else
   memset( callbacksInt, 0, sizeof( callbacksInt ) ) ;
-#endif
 
   NVIC_DisableIRQ( EIC_IRQn ) ;
   NVIC_ClearPendingIRQ( EIC_IRQn ) ;
   NVIC_SetPriority( EIC_IRQn, 0 ) ;
   NVIC_EnableIRQ( EIC_IRQn ) ;
 
-
-
   // Enable GCLK for IEC (External Interrupt Controller)
   GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_EIC )) ;