diff options
| -rw-r--r-- | lib/cmsis-sam4e/include/component-version.h | 72 | ||||
| -rw-r--r-- | lib/cmsis-sam4e/include/sam.h | 60 | ||||
| -rw-r--r-- | src/sam4e8e/main.c | 2 | ||||
| -rw-r--r-- | src/sam4e8e/serial.c | 2 | ||||
| -rw-r--r-- | src/sam4e8e/spi.c | 2 | ||||
| -rw-r--r-- | src/sam4e8e/timer.c | 2 |
6 files changed, 4 insertions, 136 deletions
diff --git a/lib/cmsis-sam4e/include/component-version.h b/lib/cmsis-sam4e/include/component-version.h deleted file mode 100644 index 6aa152d2..00000000 --- a/lib/cmsis-sam4e/include/component-version.h +++ /dev/null @@ -1,72 +0,0 @@ -/***************************************************************************** - * - * Copyright (C) 2016 Atmel Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of the copyright holders nor the names of - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ****************************************************************************/ - - -#ifndef _COMPONENT_VERSION_H_INCLUDED -#define _COMPONENT_VERSION_H_INCLUDED - -#define COMPONENT_VERSION_MAJOR 1 -#define COMPONENT_VERSION_MINOR 1 - -// -// The COMPONENT_VERSION define is composed of the major and the minor version number. -// -// The last four digits of the COMPONENT_VERSION is the minor version with leading zeros. -// The rest of the COMPONENT_VERSION is the major version, with leading zeros. The COMPONENT_VERSION -// is at least 8 digits long. -// -#define COMPONENT_VERSION 00010001 - -// -// The build number does not refer to the component, but to the build number -// of the device pack that provides the component. -// -#define BUILD_NUMBER 57 - -// -// The COMPONENT_VERSION_STRING is a string (enclosed in ") that can be used for logging or embedding. -// -#define COMPONENT_VERSION_STRING "1.1" - -// -// The COMPONENT_DATE_STRING contains a timestamp of when the pack was generated. -// -// The COMPONENT_DATE_STRING is written out using the following strftime pattern. -// -// "%Y-%m-%d %H:%M:%S" -// -// -#define COMPONENT_DATE_STRING "2016-09-15 20:37:05" - -#endif/* #ifndef _COMPONENT_VERSION_H_INCLUDED */ - diff --git a/lib/cmsis-sam4e/include/sam.h b/lib/cmsis-sam4e/include/sam.h deleted file mode 100644 index dd27c620..00000000 --- a/lib/cmsis-sam4e/include/sam.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * \file - * - * \brief Top level header file - * - * Copyright (c) 2016 Atmel Corporation. All rights reserved. - * - * \asf_license_start - * - * \page License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The name of Atmel may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * 4. This software may only be redistributed and used in connection with an - * Atmel microcontroller product. - * - * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE - * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * \asf_license_stop - * - */ - -#ifndef _SAM_ -#define _SAM_ - -#if defined(__SAM4E16C__) || defined(__ATSAM4E16C__) - #include "sam4e16c.h" -#elif defined(__SAM4E16E__) || defined(__ATSAM4E16E__) - #include "sam4e16e.h" -#elif defined(__SAM4E8C__) || defined(__ATSAM4E8C__) - #include "sam4e8c.h" -#elif defined(__SAM4E8E__) || defined(__ATSAM4E8E__) - #include "sam4e8e.h" -#else - #error Library does not support the specified device -#endif - -#endif /* _SAM_ */ - diff --git a/src/sam4e8e/main.c b/src/sam4e8e/main.c index 9e02a5d0..38e9653a 100644 --- a/src/sam4e8e/main.c +++ b/src/sam4e8e/main.c @@ -5,7 +5,7 @@ // This file may be distributed under the terms of the GNU GPLv3 license. // CMSIS -#include "sam.h" +#include "sam4e.h" // Klipper #include "command.h" // DECL_CONSTANT diff --git a/src/sam4e8e/serial.c b/src/sam4e8e/serial.c index 0946186c..7339cbb2 100644 --- a/src/sam4e8e/serial.c +++ b/src/sam4e8e/serial.c @@ -5,7 +5,7 @@ // This file may be distributed under the terms of the GNU GPLv3 license. // CMSIS -#include "sam.h" // UART +#include "sam4e.h" // UART // Klipper #include "autoconf.h" // CONFIG_SERIAL_BAUD diff --git a/src/sam4e8e/spi.c b/src/sam4e8e/spi.c index 5a8a6ae3..a424918f 100644 --- a/src/sam4e8e/spi.c +++ b/src/sam4e8e/spi.c @@ -10,7 +10,7 @@ #include "autoconf.h" // CONFIG_CLOCK_FREQ // SAM4E port -#include "sam.h" +#include "sam4e.h" #include "gpio.h" #define SSPI_USART0 0 diff --git a/src/sam4e8e/timer.c b/src/sam4e8e/timer.c index d5a87a8f..8115ea8a 100644 --- a/src/sam4e8e/timer.c +++ b/src/sam4e8e/timer.c @@ -5,7 +5,7 @@ // This file may be distributed under the terms of the GNU GPLv3 license. // CMSIS -#include "sam.h" +#include "sam4e.h" // Klipper #include "board/irq.h" // irq_disable #include "board/misc.h" // timer_read_time |