Skip to content

Commit

Permalink
Merge pull request #6700 from haukepetersen/opt_vendorheaders
Browse files Browse the repository at this point in the history
cpu: moved all vendor headers to CPUNAME/include/vendor/
  • Loading branch information
Joakim Nohlgård authored Mar 7, 2017
2 parents f3d3c08 + 19bf9f8 commit 302d5d3
Show file tree
Hide file tree
Showing 594 changed files with 110 additions and 128 deletions.
1 change: 0 additions & 1 deletion boards/avsextrem/board_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*
* @note $Id: board_init.c 1071 2013-09-19 16:50:56 kasmi $
*/
#include "lpc23xx.h"
#include "cpu.h"

#define CL_CPU_DIV 4
Expand Down
2 changes: 1 addition & 1 deletion boards/mbed_lpc1768/system.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
******************************************************************************/

#include "LPC17xx.h"
#include "vendor/LPC17xx.h"

/*--------------------- Clock Configuration ----------------------------------
*
Expand Down
1 change: 0 additions & 1 deletion boards/msba2-common/board_common_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <string.h>
#include "board.h"
#include "msba2_common.h"
#include "lpc23xx.h"
#include "cpu.h"

#define CL_CPU_DIV 4
Expand Down
2 changes: 1 addition & 1 deletion boards/msba2-common/drivers/include/sht11-board.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* @note $Id$
*/

#include "lpc23xx.h"
#include "cpu.h"
#include "board.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion boards/seeeduino_arch-pro/system.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
******************************************************************************/

#include "LPC17xx.h"
#include "vendor/LPC17xx.h"

/*--------------------- Clock Configuration ----------------------------------
*
Expand Down
6 changes: 4 additions & 2 deletions cpu/atmega_common/avr-libc-extra/errno.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. */


#ifndef ERRNO_H
#define ERRNO_H_ 1
#define ERRNO_H

/**
* @addtogroup cpu_atmega_common
Expand All @@ -55,6 +54,9 @@
extern "C" {
#endif

/**
* @brief Export errno value
*/
extern int errno;

#ifdef __cplusplus
Expand Down
8 changes: 6 additions & 2 deletions cpu/atmega_common/include/sys/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@
extern "C" {
#endif

/**
* @brief Definition of struct timeval for the atmega
*
*/
struct timeval {
time_t tv_sec;
suseconds_t tv_usec;
time_t tv_sec; /**< seconds */
suseconds_t tv_usec; /**< microseconds */
};

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion cpu/cc26x0/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

/**
* @defgroup cpu_specific_peripheral_memory_map
* @defgroup cpu_specific_peripheral_memory_map CC26x0 peripheral memory map
* @ingroup cpu
*/

Expand Down
3 changes: 2 additions & 1 deletion cpu/cortexm_common/Makefile.include
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# include module specific includes
export INCLUDES += -I$(RIOTCPU)/cortexm_common/include
INCLUDES += -I$(RIOTCPU)/cortexm_common/include
INCLUDES += -I$(RIOTCPU)/cortexm_common/include/vendor

USEMODULE += cortexm_common_periph
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/ezr32wg/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "cpu_conf_common.h"

#if (CPU_MODEL == ezr32wg330f256r60)
#include "ezr32wg330f256r60.h"
#include "vendor/ezr32wg330f256r60.h"
#else
#error "No CPU headers for the defined CPU_MODEL found"
#endif
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions cpu/k60/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extern "C"

/* Rev. 2.x silicon */
#define K60_CPU_REV 2
#include "MK60D10.h"
#include "vendor/MK60D10.h"

/** The expected CPUID value, can be used to implement a check that we are
* running on the right hardware */
Expand All @@ -47,7 +47,7 @@ extern "C"

/* Rev. 1.x silicon */
#define K60_CPU_REV 1
#include "MK60DZ10.h"
#include "vendor/MK60DZ10.h"

/** The expected CPUID value, can be used to implement a check that we are
* running on the right hardware */
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/k64f/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "cpu_conf_common.h"

#ifdef CPU_MODEL_MK64FN1M0VLL12
#include "MK64F12.h"
#include "vendor/MK64F12.h"
#else
#error "undefined CPU_MODEL"
#endif
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions cpu/kw2x/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
#include "cpu_conf_common.h"

#ifdef CPU_MODEL_KW21D256
#include "MKW22D5.h"
#include "vendor/MKW22D5.h"
#elif CPU_MODEL_KW21D512
#include "MKW22D5.h"
#include "vendor/MKW22D5.h"
#elif CPU_MODEL_KW22D512
#include "MKW22D5.h"
#include "vendor/MKW22D5.h"
#else
#error "undefined CPU_MODEL"
#endif
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lm4f120/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extern "C" {
#include "periph/uart.h"

#ifdef CPU_MODEL_LM4F120H5QR
#include "lm4f120h5qr.h"
#include "vendor/lm4f120h5qr.h"
#endif

/**
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc11u34/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "cpu_conf_common.h"

#include "LPC11Uxx.h"
#include "vendor/LPC11Uxx.h"

#ifdef __cplusplus
extern "C" {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc1768/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "cpu_conf_common.h"

#include "LPC17xx.h"
#include "vendor/LPC17xx.h"

#ifdef __cplusplus
extern "C" {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc2387/include/lpc2387.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef LPC2387_H
#define LPC2387_H

#include "lpc23xx.h"
#include "vendor/lpc23xx.h"
#include "arm7_common.h"
#include "bitarithm.h"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc2387/mci/lpc2387-mci.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/---------------------------------------------------------------------------*/

#include <string.h>
#include "lpc23xx.h"
#include "cpu.h"
#include "VIC.h"
#include "xtimer.h"
#include "diskio.h"
Expand Down
2 changes: 1 addition & 1 deletion cpu/lpc2387/periph/uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <string.h>
#include <stdio.h>

#include "lpc23xx.h"
#include "cpu.h"
#include "VIC.h"
#include "periph/uart.h"

Expand Down
4 changes: 2 additions & 2 deletions cpu/nrf51/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#define CPU_CONF_H

#include "cpu_conf_common.h"
#include "nrf51.h"
#include "nrf51_bitfields.h"
#include "vendor/nrf51.h"
#include "vendor/nrf51_bitfields.h"

#ifdef __cplusplus
extern "C" {
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions cpu/nrf52/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#define CPU_CONF_H

#include "cpu_conf_common.h"
#include "nrf52.h"
#include "nrf52_bitfields.h"
#include "vendor/nrf52.h"
#include "vendor/nrf52_bitfields.h"

#ifdef __cplusplus
extern "C" {
Expand Down
File renamed without changes.
File renamed without changes.
90 changes: 45 additions & 45 deletions cpu/sam0_common/include/sam0.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,97 +27,97 @@ extern "C" {
#endif

#if defined(CPU_MODEL_SAML21E18A)
#include "cmsis/saml21/include/saml21e18a.h"
#include "vendor/saml21/include/saml21e18a.h"
#elif defined(CPU_MODEL_SAML21G18A)
#include "cmsis/saml21/include/saml21g18a.h"
#include "vendor/saml21/include/saml21g18a.h"
#elif defined(CPU_MODEL_SAML21J18A)
#include "cmsis/saml21/include/saml21j18a.h"
#include "vendor/saml21/include/saml21j18a.h"
#elif defined(CPU_MODEL_SAML21E15B)
#include "cmsis/saml21/include_b/saml21e15b.h"
#include "vendor/saml21/include_b/saml21e15b.h"
#elif defined(CPU_MODEL_SAML21E16B)
#include "cmsis/saml21/include_b/saml21e16b.h"
#include "vendor/saml21/include_b/saml21e16b.h"
#elif defined(CPU_MODEL_SAML21E17B)
#include "cmsis/saml21/include_b/saml21e17b.h"
#include "vendor/saml21/include_b/saml21e17b.h"
#elif defined(CPU_MODEL_SAML21E18B)
#include "cmsis/saml21/include_b/saml21e18b.h"
#include "vendor/saml21/include_b/saml21e18b.h"
#elif defined(CPU_MODEL_SAML21G16B)
#include "cmsis/saml21/include_b/saml21g16b.h"
#include "vendor/saml21/include_b/saml21g16b.h"
#elif defined(CPU_MODEL_SAML21G17B)
#include "cmsis/saml21/include_b/saml21g17b.h"
#include "vendor/saml21/include_b/saml21g17b.h"
#elif defined(CPU_MODEL_SAML21G18B)
#include "cmsis/saml21/include_b/saml21g18b.h"
#include "vendor/saml21/include_b/saml21g18b.h"
#elif defined(CPU_MODEL_SAML21J16B)
#include "cmsis/saml21/include_b/saml21j16b.h"
#include "vendor/saml21/include_b/saml21j16b.h"
#elif defined(CPU_MODEL_SAML21J17B)
#include "cmsis/saml21/include_b/saml21j17b.h"
#include "vendor/saml21/include_b/saml21j17b.h"
#elif defined(CPU_MODEL_SAML21J18B)
#include "cmsis/saml21/include_b/saml21j18b.h"
#include "vendor/saml21/include_b/saml21j18b.h"

#elif defined(CPU_MODEL_SAMR21E16A)
#include "cmsis/samr21/include/samr21e16a.h"
#include "vendor/samr21/include/samr21e16a.h"
#elif defined(CPU_MODEL_SAMR21E17A)
#include "cmsis/samr21/include/samr21e17a.h"
#include "vendor/samr21/include/samr21e17a.h"
#elif defined(CPU_MODEL_SAMR21E18A)
#include "cmsis/samr21/include/samr21e18a.h"
#include "vendor/samr21/include/samr21e18a.h"
#elif defined(CPU_MODEL_SAMR21G16A)
#include "cmsis/samr21/include/samr21g16a.h"
#include "vendor/samr21/include/samr21g16a.h"
#elif defined(CPU_MODEL_SAMR21G17A)
#include "cmsis/samr21/include/samr21g17a.h"
#include "vendor/samr21/include/samr21g17a.h"
#elif defined(CPU_MODEL_SAMR21G18A)
#include "cmsis/samr21/include/samr21g18a.h"
#include "vendor/samr21/include/samr21g18a.h"

#elif defined(CPU_MODEL_SAMD21E15A)
#include "cmsis/samd21/include/samd21e15a.h"
#include "vendor/samd21/include/samd21e15a.h"
#elif defined(CPU_MODEL_SAMD21E16A)
#include "cmsis/samd21/include/samd21e16a.h"
#include "vendor/samd21/include/samd21e16a.h"
#elif defined(CPU_MODEL_SAMD21E17A)
#include "cmsis/samd21/include/samd21e17a.h"
#include "vendor/samd21/include/samd21e17a.h"
#elif defined(CPU_MODEL_SAMD21E18A)
#include "cmsis/samd21/include/samd21e18a.h"
#include "vendor/samd21/include/samd21e18a.h"
#elif defined(CPU_MODEL_SAMD21G15A)
#include "cmsis/samd21/include/samd21g15a.h"
#include "vendor/samd21/include/samd21g15a.h"
#elif defined(CPU_MODEL_SAMD21G16A)
#include "cmsis/samd21/include/samd21g16a.h"
#include "vendor/samd21/include/samd21g16a.h"
#elif defined(CPU_MODEL_SAMD21G17A)
#include "cmsis/samd21/include/samd21g17a.h"
#include "vendor/samd21/include/samd21g17a.h"
#elif defined(CPU_MODEL_SAMD21G17AU)
#include "cmsis/samd21/include/samd21g17au.h"
#include "vendor/samd21/include/samd21g17au.h"
#elif defined(CPU_MODEL_SAMD21G18A)
#include "cmsis/samd21/include/samd21g18a.h"
#include "vendor/samd21/include/samd21g18a.h"
#elif defined(CPU_MODEL_SAMD21G18AU)
#include "cmsis/samd21/include/samd21g18au.h"
#include "vendor/samd21/include/samd21g18au.h"
#elif defined(CPU_MODEL_SAMD21J15A)
#include "cmsis/samd21/include/samd21j15a.h"
#include "vendor/samd21/include/samd21j15a.h"
#elif defined(CPU_MODEL_SAMD21J16A)
#include "cmsis/samd21/include/samd21j16a.h"
#include "vendor/samd21/include/samd21j16a.h"
#elif defined(CPU_MODEL_SAMD21J17A)
#include "cmsis/samd21/include/samd21j17a.h"
#include "vendor/samd21/include/samd21j17a.h"
#elif defined(CPU_MODEL_SAMD21J18A)
#include "cmsis/samd21/include/samd21j18a.h"
#include "vendor/samd21/include/samd21j18a.h"
#elif defined(CPU_MODEL_SAMD21E15B)
#include "cmsis/samd21/include/samd21e15b.h"
#include "vendor/samd21/include/samd21e15b.h"
#elif defined(CPU_MODEL_SAMD21E15BU)
#include "cmsis/samd21/include/samd21e15bu.h"
#include "vendor/samd21/include/samd21e15bu.h"
#elif defined(CPU_MODEL_SAMD21E15L)
#include "cmsis/samd21/include/samd21e15l.h"
#include "vendor/samd21/include/samd21e15l.h"
#elif defined(CPU_MODEL_SAMD21E16B)
#include "cmsis/samd21/include/samd21e16b.h"
#include "vendor/samd21/include/samd21e16b.h"
#elif defined(CPU_MODEL_SAMD21E16BU)
#include "cmsis/samd21/include/samd21e16bu.h"
#include "vendor/samd21/include/samd21e16bu.h"
#elif defined(CPU_MODEL_SAMD21E16L)
#include "cmsis/samd21/include/samd21e16l.h"
#include "vendor/samd21/include/samd21e16l.h"
#elif defined(CPU_MODEL_SAMD21G15B)
#include "cmsis/samd21/include/samd21g15b.h"
#include "vendor/samd21/include/samd21g15b.h"
#elif defined(CPU_MODEL_SAMD21G15L)
#include "cmsis/samd21/include/samd21g15l.h"
#include "vendor/samd21/include/samd21g15l.h"
#elif defined(CPU_MODEL_SAMD21G16B)
#include "cmsis/samd21/include/samd21g16b.h"
#include "vendor/samd21/include/samd21g16b.h"
#elif defined(CPU_MODEL_SAMD21G16L)
#include "cmsis/samd21/include/samd21g16l.h"
#include "vendor/samd21/include/samd21g16l.h"
#elif defined(CPU_MODEL_SAMD21J15B)
#include "cmsis/samd21/include/samd21j15b.h"
#include "vendor/samd21/include/samd21j15b.h"
#elif defined(CPU_MODEL_SAMD21J16B)
#include "cmsis/samd21/include/samd21j16b.h"
#include "vendor/samd21/include/samd21j16b.h"

#else
#error "Unsupported SAM0 variant."
Expand Down
Loading

0 comments on commit 302d5d3

Please sign in to comment.