Skip to content

Commit 1a1856c

Browse files
committed
License fix and cosmetic changes.
1 parent 8bf65ca commit 1a1856c

25 files changed

+87
-98
lines changed

boards.txt

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

cores/arduino/Arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Arduino.h - Main include file for the Arduino SDK
3-
Copyright (c) 2014 Arduino Team. All right reserved.
3+
Copyright (c) 2014 Arduino LLC. All right reserved.
44
55
This library is free software; you can redistribute it and/or
66
modify it under the terms of the GNU Lesser General Public

cores/arduino/HardwareSerial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public

cores/arduino/Reset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public

cores/arduino/Reset.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#ifndef RESET_H
20-
#define RESET_H
19+
#pragma once
2120

2221
#ifdef __cplusplus
2322
extern "C" {
@@ -30,5 +29,3 @@ void cancelReset();
3029
#ifdef __cplusplus
3130
}
3231
#endif
33-
34-
#endif

cores/arduino/Tone.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public

cores/arduino/Tone.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#ifndef _WIRING_TONE_
20-
#define _WIRING_TONE_
19+
#pragma once
2120

2221
#ifdef __cplusplus
2322

@@ -28,6 +27,4 @@ void noTone(uint32_t _pin);
2827

2928
void toneAccurateClock (uint32_t);
3029

31-
#endif /* __cplusplus */
32-
33-
#endif /* _WIRING_TONE_ */
30+
#endif

cores/arduino/Uart.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public

cores/arduino/Uart.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#ifndef _SERCOM_UART_CLASS
20-
#define _SERCOM_UART_CLASS
19+
#pragma once
2120

2221
#include "HardwareSerial.h"
2322
#include "SERCOM.h"
@@ -56,5 +55,3 @@ class Uart : public HardwareSerial
5655
SercomUartCharSize extractCharSize(uint8_t config);
5756
SercomParityMode extractParity(uint8_t config);
5857
};
59-
60-
#endif

cores/arduino/WInterrupts.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014 Arduino. All right reserved.
2+
Copyright (c) 2015 Arduino LLC. All right reserved.
33
44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public
@@ -35,24 +35,13 @@ static struct
3535
/* Configure I/O interrupt sources */
3636
static void __initialize()
3737
{
38-
#if 0
39-
int i ;
40-
41-
for ( i = 0 ; i < EXTERNAL_NUM_INTERRUPTS ; i++ )
42-
{
43-
callbacksInt[i]._callback = NULL ;
44-
}
45-
#else
4638
memset( callbacksInt, 0, sizeof( callbacksInt ) ) ;
47-
#endif
4839

4940
NVIC_DisableIRQ( EIC_IRQn ) ;
5041
NVIC_ClearPendingIRQ( EIC_IRQn ) ;
5142
NVIC_SetPriority( EIC_IRQn, 0 ) ;
5243
NVIC_EnableIRQ( EIC_IRQn ) ;
5344

54-
55-
5645
// Enable GCLK for IEC (External Interrupt Controller)
5746
GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_EIC )) ;
5847

0 commit comments

Comments
 (0)