diff --git a/arch/arm/src/sam34/chip.h b/arch/arm/src/sam34/chip.h index 96e26924f2..0100d075fd 100644 --- a/arch/arm/src/sam34/chip.h +++ b/arch/arm/src/sam34/chip.h @@ -47,7 +47,7 @@ */ #include -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /* Include the chip interrupt definition file */ diff --git a/arch/arm/src/sam34/chip/sam3u_memorymap.h b/arch/arm/src/sam34/hardware/sam3u_memorymap.h similarity index 97% rename from arch/arm/src/sam34/chip/sam3u_memorymap.h rename to arch/arm/src/sam34/hardware/sam3u_memorymap.h index ffcc5589fb..4cf145fd71 100644 --- a/arch/arm/src/sam34/chip/sam3u_memorymap.h +++ b/arch/arm/src/sam34/hardware/sam3u_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam3u_memorymap.h + * arch/arm/src/sam34/hardware/sam3u_memorymap.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_MEMORYMAP_H /************************************************************************************************ * Included Files @@ -142,4 +142,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_MEMORYMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam3u_pinmap.h b/arch/arm/src/sam34/hardware/sam3u_pinmap.h similarity index 98% rename from arch/arm/src/sam34/chip/sam3u_pinmap.h rename to arch/arm/src/sam34/hardware/sam3u_pinmap.h index 166a5213dc..5738684f1e 100644 --- a/arch/arm/src/sam34/chip/sam3u_pinmap.h +++ b/arch/arm/src/sam34/hardware/sam3u_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam3u_pinmap.h + * arch/arm/src/sam34/hardware/sam3u_pinmap.h * * Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H /************************************************************************************ * Included Files @@ -220,4 +220,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam3u_pio.h b/arch/arm/src/sam34/hardware/sam3u_pio.h similarity index 99% rename from arch/arm/src/sam34/chip/sam3u_pio.h rename to arch/arm/src/sam34/hardware/sam3u_pio.h index aa5e32266f..ffff788308 100644 --- a/arch/arm/src/sam34/chip/sam3u_pio.h +++ b/arch/arm/src/sam34/hardware/sam3u_pio.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam3u_pio.h + * arch/arm/src/sam34/hardware/sam3u_pio.h * Parallel Input/Output (PIO) Controller definitions for the SAM3U, SAM3X, and SAM3A. * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PIO_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PIO_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PIO_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PIO_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -464,4 +464,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PIO_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PIO_H */ diff --git a/arch/arm/src/sam34/chip/sam3x_memorymap.h b/arch/arm/src/sam34/hardware/sam3x_memorymap.h similarity index 98% rename from arch/arm/src/sam34/chip/sam3x_memorymap.h rename to arch/arm/src/sam34/hardware/sam3x_memorymap.h index ba053d3c35..0193d2471b 100644 --- a/arch/arm/src/sam34/chip/sam3x_memorymap.h +++ b/arch/arm/src/sam34/hardware/sam3x_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam3x_memorymap.h + * arch/arm/src/sam34/hardware/sam3x_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3X_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3X_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3X_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3X_MEMORYMAP_H /************************************************************************************************ * Included Files @@ -171,4 +171,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3X_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3X_MEMORYMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam3x_pinmap.h b/arch/arm/src/sam34/hardware/sam3x_pinmap.h similarity index 99% rename from arch/arm/src/sam34/chip/sam3x_pinmap.h rename to arch/arm/src/sam34/hardware/sam3x_pinmap.h index 4b886dd53f..e75782254e 100644 --- a/arch/arm/src/sam34/chip/sam3x_pinmap.h +++ b/arch/arm/src/sam34/hardware/sam3x_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam3x_pinmap.h + * arch/arm/src/sam34/hardware/sam3x_pinmap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3X_PINMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3X_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3X_PINMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3X_PINMAP_H /************************************************************************************ * Included Files @@ -456,4 +456,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3X_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3X_PINMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4cm_aes.h b/arch/arm/src/sam34/hardware/sam4cm_aes.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4cm_aes.h rename to arch/arm/src/sam34/hardware/sam4cm_aes.h index 051318dd17..767384903e 100644 --- a/arch/arm/src/sam34/chip/sam4cm_aes.h +++ b/arch/arm/src/sam34/hardware/sam4cm_aes.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/sam34/chip/sam4cm_aes.h + * arch/arm/src/sam34/hardware/sam4cm_aes.h * AES hardware accelerator for SAM4CM * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_AES_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_AES_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_AES_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_AES_H /******************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -136,4 +136,4 @@ #define AES_ISR_DATRDY (1 << 0) -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_AES_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_AES_H */ diff --git a/arch/arm/src/sam34/chip/sam4cm_ipc.h b/arch/arm/src/sam34/hardware/sam4cm_ipc.h similarity index 95% rename from arch/arm/src/sam34/chip/sam4cm_ipc.h rename to arch/arm/src/sam34/hardware/sam4cm_ipc.h index a4d9d3ec3a..6b7ee34d5b 100644 --- a/arch/arm/src/sam34/chip/sam4cm_ipc.h +++ b/arch/arm/src/sam34/hardware/sam4cm_ipc.h @@ -1,5 +1,5 @@ /*********************************************************************************** - * arch/arm/src/sam34/chip/sam4cm_ipc.h + * arch/arm/src/sam34/hardware/sam4cm_ipc.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ***********************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_IPC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_IPC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_IPC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_IPC_H /*********************************************************************************** * Included Files @@ -77,4 +77,4 @@ #define SAM_IPC1_IMR (SAM_IPC1_BASE + SAM_IPC_IMR_OFFSET) #define SAM_IPC1_ISR (SAM_IPC1_BASE + SAM_IPC_ISR_OFFSET) -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_IPC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_IPC_H */ diff --git a/arch/arm/src/sam34/chip/sam4cm_memorymap.h b/arch/arm/src/sam34/hardware/sam4cm_memorymap.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4cm_memorymap.h rename to arch/arm/src/sam34/hardware/sam4cm_memorymap.h index d719e268c0..4b08759afd 100644 --- a/arch/arm/src/sam34/chip/sam4cm_memorymap.h +++ b/arch/arm/src/sam34/hardware/sam4cm_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam4cm_memorymap.h + * arch/arm/src/sam34/hardware/sam4cm_memorymap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_MEMORYMAP_H /************************************************************************************************ * Included Files @@ -177,4 +177,4 @@ static inline unsigned long SAM_PION_BASE(int n) #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_MEMORYMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4cm_pinmap.h b/arch/arm/src/sam34/hardware/sam4cm_pinmap.h similarity index 98% rename from arch/arm/src/sam34/chip/sam4cm_pinmap.h rename to arch/arm/src/sam34/hardware/sam4cm_pinmap.h index 1cf999b3ef..990ba089eb 100644 --- a/arch/arm/src/sam34/chip/sam4cm_pinmap.h +++ b/arch/arm/src/sam34/hardware/sam4cm_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam4cm_pinmap.h + * arch/arm/src/sam34/hardware/sam4cm_pinmap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_PINMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_PINMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_PINMAP_H /************************************************************************************ * Included Files @@ -319,4 +319,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_PINMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4cm_slcdc.h b/arch/arm/src/sam34/hardware/sam4cm_slcdc.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4cm_slcdc.h rename to arch/arm/src/sam34/hardware/sam4cm_slcdc.h index 2575119d5c..babfcb7ecb 100644 --- a/arch/arm/src/sam34/chip/sam4cm_slcdc.h +++ b/arch/arm/src/sam34/hardware/sam4cm_slcdc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4cm_slcdc.h + * arch/arm/src/sam34/hardware/sam4cm_slcdc.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_SLCDC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_SLCDC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_SLCDC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_SLCDC_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -179,4 +179,4 @@ #define SLCDC_ISR_ENDFRAME (1 << 0) /* End of Frame Interrupt occurred */ #define SLCDC_ISR_DIS (1 << 2) /* The "Disable" interrupt occurred */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_SLCDC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_SLCDC_H */ diff --git a/arch/arm/src/sam34/chip/sam4cm_supc.h b/arch/arm/src/sam34/hardware/sam4cm_supc.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4cm_supc.h rename to arch/arm/src/sam34/hardware/sam4cm_supc.h index 5494582312..11951c9ddd 100644 --- a/arch/arm/src/sam34/chip/sam4cm_supc.h +++ b/arch/arm/src/sam34/hardware/sam4cm_supc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4cm_supc.h + * arch/arm/src/sam34/hardware/sam4cm_supc.h * Supply Controller (SUPC) definitions for the SAM4CM * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_SUPC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_SUPC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_SUPC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_SUPC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -174,4 +174,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4CM_SUPC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4CM_SUPC_H */ diff --git a/arch/arm/src/sam34/chip/sam4e_memorymap.h b/arch/arm/src/sam34/hardware/sam4e_memorymap.h similarity index 98% rename from arch/arm/src/sam34/chip/sam4e_memorymap.h rename to arch/arm/src/sam34/hardware/sam4e_memorymap.h index 1cf9599399..3cee120bbe 100644 --- a/arch/arm/src/sam34/chip/sam4e_memorymap.h +++ b/arch/arm/src/sam34/hardware/sam4e_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam4e_memorymap.h + * arch/arm/src/sam34/hardware/sam4e_memorymap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_MEMORYMAP_H /************************************************************************************************ * Included Files @@ -176,4 +176,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_MEMORYMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4e_pinmap.h b/arch/arm/src/sam34/hardware/sam4e_pinmap.h similarity index 99% rename from arch/arm/src/sam34/chip/sam4e_pinmap.h rename to arch/arm/src/sam34/hardware/sam4e_pinmap.h index c97111e4e4..ce67099694 100644 --- a/arch/arm/src/sam34/chip/sam4e_pinmap.h +++ b/arch/arm/src/sam34/hardware/sam4e_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam4e_pinmap.h + * arch/arm/src/sam34/hardware/sam4e_pinmap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_PINMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_PINMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_PINMAP_H /************************************************************************************ * Included Files @@ -334,4 +334,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_PINMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4e_pio.h b/arch/arm/src/sam34/hardware/sam4e_pio.h similarity index 99% rename from arch/arm/src/sam34/chip/sam4e_pio.h rename to arch/arm/src/sam34/hardware/sam4e_pio.h index 3918583a52..b04c415367 100644 --- a/arch/arm/src/sam34/chip/sam4e_pio.h +++ b/arch/arm/src/sam34/hardware/sam4e_pio.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4e_pio.h + * arch/arm/src/sam34/hardware/sam4e_pio.h * Parallel Input/Output (PIO) Controller definitions for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_PIO_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_PIO_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_PIO_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_PIO_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -551,4 +551,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4E_PIO_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4E_PIO_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_bpm.h b/arch/arm/src/sam34/hardware/sam4l_bpm.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4l_bpm.h rename to arch/arm/src/sam34/hardware/sam4l_bpm.h index 12dba10629..2dea825d83 100644 --- a/arch/arm/src/sam34/chip/sam4l_bpm.h +++ b/arch/arm/src/sam34/hardware/sam4l_bpm.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_bpm.h + * arch/arm/src/sam34/hardware/sam4l_bpm.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_BPM_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_BPM_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_BPM_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_BPM_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -175,4 +175,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_BPM_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_BPM_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_bscif.h b/arch/arm/src/sam34/hardware/sam4l_bscif.h similarity index 98% rename from arch/arm/src/sam34/chip/sam4l_bscif.h rename to arch/arm/src/sam34/hardware/sam4l_bscif.h index 6389e05d6e..4743f87795 100644 --- a/arch/arm/src/sam34/chip/sam4l_bscif.h +++ b/arch/arm/src/sam34/hardware/sam4l_bscif.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_bscif.h + * arch/arm/src/sam34/hardware/sam4l_bscif.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_BSCIF_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_BSCIF_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_BSCIF_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_BSCIF_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -313,4 +313,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_BSCIF_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_BSCIF_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_flashcalw.h b/arch/arm/src/sam34/hardware/sam4l_flashcalw.h similarity index 98% rename from arch/arm/src/sam34/chip/sam4l_flashcalw.h rename to arch/arm/src/sam34/hardware/sam4l_flashcalw.h index 6902578d77..baacf9120f 100644 --- a/arch/arm/src/sam34/chip/sam4l_flashcalw.h +++ b/arch/arm/src/sam34/hardware/sam4l_flashcalw.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/avr/src/sam34/sam4l_flashcalw.h + * arch/arm/src/sam34/hardware/sam4l_flashcalw.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_FLASHCALW_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_FLASHCALW_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_FLASHCALW_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_FLASHCALW_H /************************************************************************************ * Included Files @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -375,5 +375,5 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_FLASHCALW_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_FLASHCALW_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_gpio.h b/arch/arm/src/sam34/hardware/sam4l_gpio.h similarity index 99% rename from arch/arm/src/sam34/chip/sam4l_gpio.h rename to arch/arm/src/sam34/hardware/sam4l_gpio.h index bda888c0ae..e80b8c5870 100644 --- a/arch/arm/src/sam34/chip/sam4l_gpio.h +++ b/arch/arm/src/sam34/hardware/sam4l_gpio.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_gpio.h + * arch/arm/src/sam34/hardware/sam4l_gpio.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_GPIO_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_GPIO_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_GPIO_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_GPIO_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -592,4 +592,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_GPIO_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_GPIO_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_lcdca.h b/arch/arm/src/sam34/hardware/sam4l_lcdca.h similarity index 98% rename from arch/arm/src/sam34/chip/sam4l_lcdca.h rename to arch/arm/src/sam34/hardware/sam4l_lcdca.h index 7255ecda18..1d007a5daa 100644 --- a/arch/arm/src/sam34/chip/sam4l_lcdca.h +++ b/arch/arm/src/sam34/hardware/sam4l_lcdca.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_lcdca.h + * arch/arm/src/sam34/hardware/sam4l_lcdca.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_LCDCA_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_LCDCA_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_LCDCA_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_LCDCA_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -381,4 +381,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_LCDCA_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_LCDCA_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_memorymap.h b/arch/arm/src/sam34/hardware/sam4l_memorymap.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4l_memorymap.h rename to arch/arm/src/sam34/hardware/sam4l_memorymap.h index 62a8c6a0c5..d1aeee757c 100644 --- a/arch/arm/src/sam34/chip/sam4l_memorymap.h +++ b/arch/arm/src/sam34/hardware/sam4l_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam4l_memorymap.h + * arch/arm/src/sam34/hardware/sam4l_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_MEMORYMAP_H /************************************************************************************************ * Included Files @@ -162,4 +162,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_MEMORYMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_pdca.h b/arch/arm/src/sam34/hardware/sam4l_pdca.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4l_pdca.h rename to arch/arm/src/sam34/hardware/sam4l_pdca.h index 14b947de42..0181b4218f 100644 --- a/arch/arm/src/sam34/chip/sam4l_pdca.h +++ b/arch/arm/src/sam34/hardware/sam4l_pdca.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_pdca.h + * arch/arm/src/sam34/hardware/sam4l_pdca.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PDCA_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PDCA_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PDCA_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PDCA_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -201,4 +201,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PDCA_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PDCA_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_picouart.h b/arch/arm/src/sam34/hardware/sam4l_picouart.h similarity index 95% rename from arch/arm/src/sam34/chip/sam4l_picouart.h rename to arch/arm/src/sam34/hardware/sam4l_picouart.h index 50e2d1fbbd..cf20264244 100644 --- a/arch/arm/src/sam34/chip/sam4l_picouart.h +++ b/arch/arm/src/sam34/hardware/sam4l_picouart.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_picouart.h + * arch/arm/src/sam34/hardware/sam4l_picouart.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PICOUART_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PICOUART_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PICOUART_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PICOUART_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -118,4 +118,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PICOUART_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PICOUART_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_pinmap.h b/arch/arm/src/sam34/hardware/sam4l_pinmap.h similarity index 99% rename from arch/arm/src/sam34/chip/sam4l_pinmap.h rename to arch/arm/src/sam34/hardware/sam4l_pinmap.h index 7cf80dd4ac..f4e06df497 100644 --- a/arch/arm/src/sam34/chip/sam4l_pinmap.h +++ b/arch/arm/src/sam34/hardware/sam4l_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam3u_pinmap.h + * arch/arm/src/sam34/hardware/sam3u_pinmap.h * * Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H /************************************************************************************ * Included Files @@ -576,4 +576,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_pm.h b/arch/arm/src/sam34/hardware/sam4l_pm.h similarity index 98% rename from arch/arm/src/sam34/chip/sam4l_pm.h rename to arch/arm/src/sam34/hardware/sam4l_pm.h index 86a55af8dc..6b4eada8fc 100644 --- a/arch/arm/src/sam34/chip/sam4l_pm.h +++ b/arch/arm/src/sam34/hardware/sam4l_pm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/avr/src/sam34/sam4l_pm.h + * arch/arm/src/sam34/hardware/sam4l_pm.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PM_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PM_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PM_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PM_H /************************************************************************************ * Included Files @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -347,5 +347,5 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_PM_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PM_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_scif.h b/arch/arm/src/sam34/hardware/sam4l_scif.h similarity index 99% rename from arch/arm/src/sam34/chip/sam4l_scif.h rename to arch/arm/src/sam34/hardware/sam4l_scif.h index 191d786bc3..6595cb1c03 100644 --- a/arch/arm/src/sam34/chip/sam4l_scif.h +++ b/arch/arm/src/sam34/hardware/sam4l_scif.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_scif.h + * arch/arm/src/sam34/hardware/sam4l_scif.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_SCIF_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_SCIF_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_SCIF_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_SCIF_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -429,4 +429,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_SCIF_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_SCIF_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_usart.h b/arch/arm/src/sam34/hardware/sam4l_usart.h similarity index 99% rename from arch/arm/src/sam34/chip/sam4l_usart.h rename to arch/arm/src/sam34/hardware/sam4l_usart.h index 3c5bbd21ff..4e7a3552fd 100644 --- a/arch/arm/src/sam34/chip/sam4l_usart.h +++ b/arch/arm/src/sam34/hardware/sam4l_usart.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam4l_uart.h + * arch/arm/src/sam34/hardware/sam4l_uart.h * Universal Synchronous Asynchronous Receiver Transmitter (USART) definitions for the SAM4L * * Copyright (C) 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_UART_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_UART_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_UART_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_UART_H /************************************************************************************************ * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /************************************************************************************************ * Pre-processor Definitions @@ -445,4 +445,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_UART_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_UART_H */ diff --git a/arch/arm/src/sam34/chip/sam4l_wdt.h b/arch/arm/src/sam34/hardware/sam4l_wdt.h similarity index 96% rename from arch/arm/src/sam34/chip/sam4l_wdt.h rename to arch/arm/src/sam34/hardware/sam4l_wdt.h index 9c37c922a9..70de2c3536 100644 --- a/arch/arm/src/sam34/chip/sam4l_wdt.h +++ b/arch/arm/src/sam34/hardware/sam4l_wdt.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4l_wdt.h + * arch/arm/src/sam34/hardware/sam4l_wdt.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_WDT_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_WDT_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_WDT_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_WDT_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -134,4 +134,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4L_WDT_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_WDT_H */ diff --git a/arch/arm/src/sam34/chip/sam4s_memorymap.h b/arch/arm/src/sam34/hardware/sam4s_memorymap.h similarity index 97% rename from arch/arm/src/sam34/chip/sam4s_memorymap.h rename to arch/arm/src/sam34/hardware/sam4s_memorymap.h index 45e8a97a3f..f13d5a89ce 100644 --- a/arch/arm/src/sam34/chip/sam4s_memorymap.h +++ b/arch/arm/src/sam34/hardware/sam4s_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam4s_memorymap.h + * arch/arm/src/sam34/hardware/sam4s_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_MEMORYMAP_H /************************************************************************************************ * Included Files @@ -153,4 +153,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_MEMORYMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4s_pinmap.h b/arch/arm/src/sam34/hardware/sam4s_pinmap.h similarity index 98% rename from arch/arm/src/sam34/chip/sam4s_pinmap.h rename to arch/arm/src/sam34/hardware/sam4s_pinmap.h index b8fd5c46ec..b0256e444f 100644 --- a/arch/arm/src/sam34/chip/sam4s_pinmap.h +++ b/arch/arm/src/sam34/hardware/sam4s_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam4s_pinmap.h + * arch/arm/src/sam34/hardware/sam4s_pinmap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_PINMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_PINMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_PINMAP_H /************************************************************************************ * Included Files @@ -311,4 +311,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_PINMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam4s_pio.h b/arch/arm/src/sam34/hardware/sam4s_pio.h similarity index 99% rename from arch/arm/src/sam34/chip/sam4s_pio.h rename to arch/arm/src/sam34/hardware/sam4s_pio.h index be65af3b57..d599cf39a1 100644 --- a/arch/arm/src/sam34/chip/sam4s_pio.h +++ b/arch/arm/src/sam34/hardware/sam4s_pio.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam4s_pio.h + * arch/arm/src/sam34/hardware/sam4s_pio.h * Parallel Input/Output (PIO) Controller definitions for the SAM4S * * Copyright (C) 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_PIO_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_PIO_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_PIO_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_PIO_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -398,4 +398,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM4S_PIO_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4S_PIO_H */ diff --git a/arch/arm/src/sam34/chip/sam_acc.h b/arch/arm/src/sam34/hardware/sam_acc.h similarity index 97% rename from arch/arm/src/sam34/chip/sam_acc.h rename to arch/arm/src/sam34/hardware/sam_acc.h index 1e546ac14a..cff3627a0d 100644 --- a/arch/arm/src/sam34/chip/sam_acc.h +++ b/arch/arm/src/sam34/hardware/sam_acc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_rtt.h + * arch/arm/src/sam34/hardware/sam_rtt.h *Analog Comparator Controller (ACC) definitions for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_ACC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_ACC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_ACC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_ACC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -151,4 +151,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_ACC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_ACC_H */ diff --git a/arch/arm/src/sam34/chip/sam_adc.h b/arch/arm/src/sam34/hardware/sam_adc.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_adc.h rename to arch/arm/src/sam34/hardware/sam_adc.h index dd53ba4012..077ad27315 100644 --- a/arch/arm/src/sam34/chip/sam_adc.h +++ b/arch/arm/src/sam34/hardware/sam_adc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_adc.h + * arch/arm/src/sam34/hardware/sam_adc.h * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_ADC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_ADC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_ADC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_ADC_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -244,4 +244,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_ADC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_ADC_H */ diff --git a/arch/arm/src/sam34/chip/sam_aes.h b/arch/arm/src/sam34/hardware/sam_aes.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_aes.h rename to arch/arm/src/sam34/hardware/sam_aes.h index c5ef7ad9a6..22410d43b7 100644 --- a/arch/arm/src/sam34/chip/sam_aes.h +++ b/arch/arm/src/sam34/hardware/sam_aes.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_aes.h + * arch/arm/src/sam34/hardware/sam_aes.h * Advanced Encryption Standard (AES) for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_AES_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_AES_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_AES_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_AES_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -185,4 +185,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_AES_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_AES_H */ diff --git a/arch/arm/src/sam34/chip/sam_afec.h b/arch/arm/src/sam34/hardware/sam_afec.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_afec.h rename to arch/arm/src/sam34/hardware/sam_afec.h index d5a8be44ab..88c7181beb 100644 --- a/arch/arm/src/sam34/chip/sam_afec.h +++ b/arch/arm/src/sam34/hardware/sam_afec.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_afec.h + * arch/arm/src/sam34/hardware/sam_afec.h * Analog-Front-End Controller (AFEC) definitions for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_AFEC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_AFEC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_AFEC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_AFEC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -535,4 +535,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_AFEC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_AFEC_H */ diff --git a/arch/arm/src/sam34/chip/sam_can.h b/arch/arm/src/sam34/hardware/sam_can.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_can.h rename to arch/arm/src/sam34/hardware/sam_can.h index 22548314e7..05e9218618 100644 --- a/arch/arm/src/sam34/chip/sam_can.h +++ b/arch/arm/src/sam34/hardware/sam_can.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_can.h + * arch/arm/src/sam34/hardware/sam_can.h * Controller Area Network (CAN) for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_CAN_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_CAN_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CAN_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CAN_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -316,4 +316,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_CAN_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CAN_H */ diff --git a/arch/arm/src/sam34/chip/sam_chipid.h b/arch/arm/src/sam34/hardware/sam_chipid.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_chipid.h rename to arch/arm/src/sam34/hardware/sam_chipid.h index c09e538367..f578ac0ec6 100644 --- a/arch/arm/src/sam34/chip/sam_chipid.h +++ b/arch/arm/src/sam34/hardware/sam_chipid.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_chipid.h + * arch/arm/src/sam34/hardware/sam_chipid.h * CHIPID Register Definitions for the SAM3U, SAM4S, and SAM4L * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CHIPID_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CHIPID_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -198,4 +198,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CHIPID_H */ diff --git a/arch/arm/src/sam34/chip/sam_cmcc.h b/arch/arm/src/sam34/hardware/sam_cmcc.h similarity index 97% rename from arch/arm/src/sam34/chip/sam_cmcc.h rename to arch/arm/src/sam34/hardware/sam_cmcc.h index 0d0d96b916..cfc471925b 100644 --- a/arch/arm/src/sam34/chip/sam_cmcc.h +++ b/arch/arm/src/sam34/hardware/sam_cmcc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_cmcc.h + * arch/arm/src/sam34/hardware/sam_cmcc.h * Cortex M Cache Controller (CMCC) for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_CMCC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_CMCC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CMCC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CMCC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -178,4 +178,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_CMCC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_CMCC_H */ diff --git a/arch/arm/src/sam34/chip/sam_dacc.h b/arch/arm/src/sam34/hardware/sam_dacc.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_dacc.h rename to arch/arm/src/sam34/hardware/sam_dacc.h index 80a61d874a..cdd06a3022 100644 --- a/arch/arm/src/sam34/chip/sam_dacc.h +++ b/arch/arm/src/sam34/hardware/sam_dacc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_dacc.h + * arch/arm/src/sam34/hardware/sam_dacc.h * Digital-to-Analog Converter Controller (DACC) for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_DACC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_DACC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_DACC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_DACC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -229,4 +229,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_DACC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_DACC_H */ diff --git a/arch/arm/src/sam34/chip/sam_dmac.h b/arch/arm/src/sam34/hardware/sam_dmac.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_dmac.h rename to arch/arm/src/sam34/hardware/sam_dmac.h index 1a02ab4ec8..66a26546ae 100644 --- a/arch/arm/src/sam34/chip/sam_dmac.h +++ b/arch/arm/src/sam34/hardware/sam_dmac.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_dmac.h + * arch/arm/src/sam34/hardware/sam_dmac.h * DMA Controller (DMAC) definitions for the SAM3U, SAM3X, SAM3A, and SAM4E * * Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_DMAC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_DMAC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -535,4 +535,4 @@ struct dma_linklist_s * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_DMAC_H */ diff --git a/arch/arm/src/sam34/chip/sam_eefc.h b/arch/arm/src/sam34/hardware/sam_eefc.h similarity index 97% rename from arch/arm/src/sam34/chip/sam_eefc.h rename to arch/arm/src/sam34/hardware/sam_eefc.h index e247465f1c..d5452ed614 100644 --- a/arch/arm/src/sam34/chip/sam_eefc.h +++ b/arch/arm/src/sam34/hardware/sam_eefc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_eefc.h + * arch/arm/src/sam34/hardware/sam_eefc.h * Enhanced Embedded Flash Controller (EEFC) definitions for the SAM3U, SAM3X, SAM3A, * SAM4E, and SAM4S * @@ -35,8 +35,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_EEFC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_EEFC_H /**************************************************************************************** * Included Files @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -164,4 +164,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_EEFC_H */ diff --git a/arch/arm/src/sam34/chip/sam_emac.h b/arch/arm/src/sam34/hardware/sam_emac.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_emac.h rename to arch/arm/src/sam34/hardware/sam_emac.h index d5e8bf037e..ee99d4f472 100644 --- a/arch/arm/src/sam34/chip/sam_emac.h +++ b/arch/arm/src/sam34/hardware/sam_emac.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam_emac.h + * arch/arm/src/sam34/hardware/sam_emac.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,15 +33,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_EMAC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_EMAC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_EMAC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_EMAC_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -668,4 +668,4 @@ struct emac_txdesc_s uint32_t status; /* TX status and controls */ }; -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_EMAC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_EMAC_H */ diff --git a/arch/arm/src/sam34/chip/sam_gpbr.h b/arch/arm/src/sam34/hardware/sam_gpbr.h similarity index 95% rename from arch/arm/src/sam34/chip/sam_gpbr.h rename to arch/arm/src/sam34/hardware/sam_gpbr.h index 8e20925501..1b67c55bc7 100644 --- a/arch/arm/src/sam34/chip/sam_gpbr.h +++ b/arch/arm/src/sam34/hardware/sam_gpbr.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_gpbr.h + * arch/arm/src/sam34/hardware/sam_gpbr.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_GPBR_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_GPBR_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -119,4 +119,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_GPBR_H */ diff --git a/arch/arm/src/sam34/chip/sam_hsmci.h b/arch/arm/src/sam34/hardware/sam_hsmci.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_hsmci.h rename to arch/arm/src/sam34/hardware/sam_hsmci.h index fa3b375b7a..db246e99c1 100644 --- a/arch/arm/src/sam34/chip/sam_hsmci.h +++ b/arch/arm/src/sam34/hardware/sam_hsmci.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_hsmci.h + * arch/arm/src/sam34/hardware/sam_hsmci.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_HSMCI_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_HSMCI_H /**************************************************************************************** * Included Files @@ -43,8 +43,8 @@ #include #include "chip.h" -#include "chip/sam_pdc.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_pdc.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -363,4 +363,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_HSMCI_H */ diff --git a/arch/arm/src/sam34/chip/sam_matrix.h b/arch/arm/src/sam34/hardware/sam_matrix.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_matrix.h rename to arch/arm/src/sam34/hardware/sam_matrix.h index f519d5c633..975803b6dd 100644 --- a/arch/arm/src/sam34/chip/sam_matrix.h +++ b/arch/arm/src/sam34/hardware/sam_matrix.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_matrix.h + * arch/arm/src/sam34/hardware/sam_matrix.h * Bux matrix definitions for the SAM3U, SAM3X, SAM3A, SAM4E, and SAM4S * * Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_MATRIX_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_MATRIX_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -368,4 +368,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_MATRIX_H */ diff --git a/arch/arm/src/sam34/chip/sam_memorymap.h b/arch/arm/src/sam34/hardware/sam_memorymap.h similarity index 83% rename from arch/arm/src/sam34/chip/sam_memorymap.h rename to arch/arm/src/sam34/hardware/sam_memorymap.h index 8ec74f3b2d..e0ddc6650c 100644 --- a/arch/arm/src/sam34/chip/sam_memorymap.h +++ b/arch/arm/src/sam34/hardware/sam_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam_memorymap.h + * arch/arm/src/sam34/hardware/sam_memorymap.h * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_MEMORYMAP_H /************************************************************************************ * Included Files @@ -44,20 +44,20 @@ #include #if defined(CONFIG_ARCH_CHIP_SAM3U) -# include "chip/sam3u_memorymap.h" +# include "hardware/sam3u_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_SAM3X) || defined(CONFIG_ARCH_CHIP_SAM3A) -# include "chip/sam3x_memorymap.h" +# include "hardware/sam3x_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4CM) -# include "chip/sam4cm_memorymap.h" +# include "hardware/sam4cm_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4E) -# include "chip/sam4e_memorymap.h" +# include "hardware/sam4e_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4L) -# include "chip/sam4l_memorymap.h" +# include "hardware/sam4l_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4S) -# include "chip/sam4s_memorymap.h" +# include "hardware/sam4s_memorymap.h" #else # error Unrecognized SAM architecture #endif -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_MEMORYMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam_pdc.h b/arch/arm/src/sam34/hardware/sam_pdc.h similarity index 96% rename from arch/arm/src/sam34/chip/sam_pdc.h rename to arch/arm/src/sam34/hardware/sam_pdc.h index 2654508c13..d9ceae6260 100644 --- a/arch/arm/src/sam34/chip/sam_pdc.h +++ b/arch/arm/src/sam34/hardware/sam_pdc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_pdc.h + * arch/arm/src/sam34/hardware/sam_pdc.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PDC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PDC_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -116,4 +116,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PDC_H */ diff --git a/arch/arm/src/sam34/chip/sam_pinmap.h b/arch/arm/src/sam34/hardware/sam_pinmap.h similarity index 84% rename from arch/arm/src/sam34/chip/sam_pinmap.h rename to arch/arm/src/sam34/hardware/sam_pinmap.h index bf79625e88..43ba17f1e6 100644 --- a/arch/arm/src/sam34/chip/sam_pinmap.h +++ b/arch/arm/src/sam34/hardware/sam_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/chip/sam_pinmap.h + * arch/arm/src/sam34/hardware/sam_pinmap.h * * Copyright (C) 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PINMAP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PINMAP_H /************************************************************************************ * Included Files @@ -44,20 +44,20 @@ #include "chip.h" #if defined(CONFIG_ARCH_CHIP_SAM3U) -# include "chip/sam3u_pinmap.h" +# include "hardware/sam3u_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_SAM3X) || defined(CONFIG_ARCH_CHIP_SAM3A) -# include "chip/sam3x_pinmap.h" +# include "hardware/sam3x_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4CM) -# include "chip/sam4cm_pinmap.h" +# include "hardware/sam4cm_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4E) -# include "chip/sam4e_pinmap.h" +# include "hardware/sam4e_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4L) -# include "chip/sam4l_pinmap.h" +# include "hardware/sam4l_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_SAM4S) -# include "chip/sam4s_pinmap.h" +# include "hardware/sam4s_pinmap.h" #else # error Unrecognized SAM architecture #endif -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PINMAP_H */ diff --git a/arch/arm/src/sam34/chip/sam_pmc.h b/arch/arm/src/sam34/hardware/sam_pmc.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_pmc.h rename to arch/arm/src/sam34/hardware/sam_pmc.h index d7a75f6b03..66a2fe5e89 100644 --- a/arch/arm/src/sam34/chip/sam_pmc.h +++ b/arch/arm/src/sam34/hardware/sam_pmc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/sam34/chip/sam_pmc.h + * arch/arm/src/sam34/hardware/sam_pmc.h * Power Management Controller (PMC) for the SAM3U, SAM3X, SAM3A, SAM4CM, SAM4E, and * SAM4S * @@ -35,8 +35,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PMC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PMC_H /******************************************************************************************** * Included Files @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -622,4 +622,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PMC_H */ diff --git a/arch/arm/src/sam34/chip/sam_pwm.h b/arch/arm/src/sam34/hardware/sam_pwm.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_pwm.h rename to arch/arm/src/sam34/hardware/sam_pwm.h index 79b9aa043a..4571448a70 100644 --- a/arch/arm/src/sam34/chip/sam_pwm.h +++ b/arch/arm/src/sam34/hardware/sam_pwm.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_pwm.h + * arch/arm/src/sam34/hardware/sam_pwm.h * Pulse Width Modulation Controller (PWM) definitions for the SAM3U, SAM4E and SAM4S * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PWM_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PWM_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -846,4 +846,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_PWM_H */ diff --git a/arch/arm/src/sam34/chip/sam_rstc.h b/arch/arm/src/sam34/hardware/sam_rstc.h similarity index 96% rename from arch/arm/src/sam34/chip/sam_rstc.h rename to arch/arm/src/sam34/hardware/sam_rstc.h index 60250ef832..911830c743 100644 --- a/arch/arm/src/sam34/chip/sam_rstc.h +++ b/arch/arm/src/sam34/hardware/sam_rstc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_rstc.h + * arch/arm/src/sam34/hardware/sam_rstc.h * Reset Controller (RSTC) definitions for the SAM3U, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RSTC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RSTC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -125,4 +125,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RSTC_H */ diff --git a/arch/arm/src/sam34/chip/sam_rswdt.h b/arch/arm/src/sam34/hardware/sam_rswdt.h similarity index 95% rename from arch/arm/src/sam34/chip/sam_rswdt.h rename to arch/arm/src/sam34/hardware/sam_rswdt.h index 69ed294ea5..5090328490 100644 --- a/arch/arm/src/sam34/chip/sam_rswdt.h +++ b/arch/arm/src/sam34/hardware/sam_rswdt.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_rswdt.h + * arch/arm/src/sam34/hardware/sam_rswdt.h * Reinforced Safety Watchdog Timer (RSWDT) for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSWDT_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSWDT_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RSWDT_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RSWDT_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -102,4 +102,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSWDT_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RSWDT_H */ diff --git a/arch/arm/src/sam34/chip/sam_rtc.h b/arch/arm/src/sam34/hardware/sam_rtc.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_rtc.h rename to arch/arm/src/sam34/hardware/sam_rtc.h index b15cba7009..5ad40ed022 100644 --- a/arch/arm/src/sam34/chip/sam_rtc.h +++ b/arch/arm/src/sam34/hardware/sam_rtc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_rtc.h + * arch/arm/src/sam34/hardware/sam_rtc.h * Real-time Clock (RTC) definitions for the SAM3U, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RTC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RTC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -280,4 +280,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RTC_H */ diff --git a/arch/arm/src/sam34/chip/sam_rtt.h b/arch/arm/src/sam34/hardware/sam_rtt.h similarity index 95% rename from arch/arm/src/sam34/chip/sam_rtt.h rename to arch/arm/src/sam34/hardware/sam_rtt.h index b0ddcb621b..8a87b3168f 100644 --- a/arch/arm/src/sam34/chip/sam_rtt.h +++ b/arch/arm/src/sam34/hardware/sam_rtt.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_rtt.h + * arch/arm/src/sam34/hardware/sam_rtt.h * Real-time Timer (RTT) definitions for the SAM3U, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RTT_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RTT_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -100,4 +100,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_RTT_H */ diff --git a/arch/arm/src/sam34/chip/sam_smc.h b/arch/arm/src/sam34/hardware/sam_smc.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_smc.h rename to arch/arm/src/sam34/hardware/sam_smc.h index 6ed0ea98d9..a1b396baf2 100644 --- a/arch/arm/src/sam34/chip/sam_smc.h +++ b/arch/arm/src/sam34/hardware/sam_smc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_smc.h + * arch/arm/src/sam34/hardware/sam_smc.h * Static Memory Controller (SMC) definitions for the SAM3U, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SMC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SMC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -613,4 +613,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SMC_H */ diff --git a/arch/arm/src/sam34/chip/sam_spi.h b/arch/arm/src/sam34/hardware/sam_spi.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_spi.h rename to arch/arm/src/sam34/hardware/sam_spi.h index ce740c22e5..a22326cb30 100644 --- a/arch/arm/src/sam34/chip/sam_spi.h +++ b/arch/arm/src/sam34/hardware/sam_spi.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_spi.h + * arch/arm/src/sam34/hardware/sam_spi.h * Serial Peripheral Interface (SPI) definitions for the SAM3U, SAM4S, SAM4E, and SAM4L * * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SPI_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SPI_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -287,4 +287,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SPI_H */ diff --git a/arch/arm/src/sam34/chip/sam_ssc.h b/arch/arm/src/sam34/hardware/sam_ssc.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_ssc.h rename to arch/arm/src/sam34/hardware/sam_ssc.h index c1b6fd7ce3..5e28cc0420 100644 --- a/arch/arm/src/sam34/chip/sam_ssc.h +++ b/arch/arm/src/sam34/hardware/sam_ssc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_ssc.h + * arch/arm/src/sam34/hardware/sam_ssc.h * Synchronous Serial Controller (SSC) definitions for the SAM3U and SAM4S * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SSC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SSC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -292,4 +292,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SSC_H */ diff --git a/arch/arm/src/sam34/chip/sam_supc.h b/arch/arm/src/sam34/hardware/sam_supc.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_supc.h rename to arch/arm/src/sam34/hardware/sam_supc.h index d0095f42a6..6d571868e7 100644 --- a/arch/arm/src/sam34/chip/sam_supc.h +++ b/arch/arm/src/sam34/hardware/sam_supc.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_supc.h + * arch/arm/src/sam34/hardware/sam_supc.h * Supply Controller (SUPC) definitions for the SAM3U, SAM3X, SAM3A, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2015 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SUPC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SUPC_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -284,4 +284,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_SUPC_H */ diff --git a/arch/arm/src/sam34/chip/sam_tc.h b/arch/arm/src/sam34/hardware/sam_tc.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_tc.h rename to arch/arm/src/sam34/hardware/sam_tc.h index e5951fcdc9..20bccbdf57 100644 --- a/arch/arm/src/sam34/chip/sam_tc.h +++ b/arch/arm/src/sam34/hardware/sam_tc.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam_tc.h + * arch/arm/src/sam34/hardware/sam_tc.h * Timer Counter (TC) definitions for the SAM3U, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2014, 2016 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_TC_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_TC_H /************************************************************************************************ * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /************************************************************************************************ * Pre-processor Definitions @@ -594,4 +594,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_TC_H */ diff --git a/arch/arm/src/sam34/chip/sam_twi.h b/arch/arm/src/sam34/hardware/sam_twi.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_twi.h rename to arch/arm/src/sam34/hardware/sam_twi.h index 2f843dd07c..9904fd1090 100644 --- a/arch/arm/src/sam34/chip/sam_twi.h +++ b/arch/arm/src/sam34/hardware/sam_twi.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_twi.h + * arch/arm/src/sam34/hardware/sam_twi.h * Two-wire Interface (TWI) definitions for the SAM3U, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_TWI_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_TWI_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -229,4 +229,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_TWI_H */ diff --git a/arch/arm/src/sam34/chip/sam_uart.h b/arch/arm/src/sam34/hardware/sam_uart.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_uart.h rename to arch/arm/src/sam34/hardware/sam_uart.h index a80a898704..87161c7de4 100644 --- a/arch/arm/src/sam34/chip/sam_uart.h +++ b/arch/arm/src/sam34/hardware/sam_uart.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/sam34/chip/sam_uart.h + * arch/arm/src/sam34/hardware/sam_uart.h * Universal Asynchronous Receiver Transmitter (UART) and Universal Synchronous Asynchronous * Receiver Transmitter (USART) definitions for the SAM3U, SAM3X, SAM3A, SAM4S and SAM4E * @@ -35,8 +35,8 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UART_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UART_H /************************************************************************************************ * Included Files @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /************************************************************************************************ * Pre-processor Definitions @@ -569,4 +569,4 @@ * Public Functions ************************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UART_H */ diff --git a/arch/arm/src/sam34/chip/sam_udp.h b/arch/arm/src/sam34/hardware/sam_udp.h similarity index 98% rename from arch/arm/src/sam34/chip/sam_udp.h rename to arch/arm/src/sam34/hardware/sam_udp.h index 267bcc43ae..af7becb07d 100644 --- a/arch/arm/src/sam34/chip/sam_udp.h +++ b/arch/arm/src/sam34/hardware/sam_udp.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_udp.h + * arch/arm/src/sam34/hardware/sam_udp.h * USB Device Port (UDP) definitions for the SAM4E * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDP_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDP_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UDP_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UDP_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -258,4 +258,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDP_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UDP_H */ diff --git a/arch/arm/src/sam34/chip/sam_udphs.h b/arch/arm/src/sam34/hardware/sam_udphs.h similarity index 99% rename from arch/arm/src/sam34/chip/sam_udphs.h rename to arch/arm/src/sam34/hardware/sam_udphs.h index e359c55558..56666705a0 100644 --- a/arch/arm/src/sam34/chip/sam_udphs.h +++ b/arch/arm/src/sam34/hardware/sam_udphs.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_udphs.h + * arch/arm/src/sam34/hardware/sam_udphs.h * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UDPHS_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UDPHS_H /**************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -367,5 +367,5 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_UDPHS_H */ diff --git a/arch/arm/src/sam34/chip/sam_wdt.h b/arch/arm/src/sam34/hardware/sam_wdt.h similarity index 95% rename from arch/arm/src/sam34/chip/sam_wdt.h rename to arch/arm/src/sam34/hardware/sam_wdt.h index b2dd810b9d..6c876c97da 100644 --- a/arch/arm/src/sam34/chip/sam_wdt.h +++ b/arch/arm/src/sam34/hardware/sam_wdt.h @@ -1,5 +1,5 @@ /**************************************************************************************** - * arch/arm/src/sam34/chip/sam_wdt.h + * arch/arm/src/sam34/hardware/sam_wdt.h * Watchdog Timer (WDT) definitions for the SAM3U, SAM3X, SAM3A, SAM4E, and SAM4S * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H +#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_WDT_H +#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_WDT_H /**************************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_memorymap.h" +#include "hardware/sam_memorymap.h" /**************************************************************************************** * Pre-processor Definitions @@ -104,4 +104,4 @@ * Public Functions ****************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H */ +#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM_WDT_H */ diff --git a/arch/arm/src/sam34/sam3u_periphclks.h b/arch/arm/src/sam34/sam3u_periphclks.h index 145ebe4ac4..c652ab67c7 100644 --- a/arch/arm/src/sam34/sam3u_periphclks.h +++ b/arch/arm/src/sam34/sam3u_periphclks.h @@ -43,7 +43,7 @@ #include #include #include -#include "chip/sam_pmc.h" +#include "hardware/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam3x_periphclks.h b/arch/arm/src/sam34/sam3x_periphclks.h index f20a86a0e8..a9f6ac690b 100644 --- a/arch/arm/src/sam34/sam3x_periphclks.h +++ b/arch/arm/src/sam34/sam3x_periphclks.h @@ -43,7 +43,7 @@ #include #include #include -#include "chip/sam_pmc.h" +#include "hardware/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam4cm_cpupause.c b/arch/arm/src/sam34/sam4cm_cpupause.c index f258781127..933509d81f 100644 --- a/arch/arm/src/sam34/sam4cm_cpupause.c +++ b/arch/arm/src/sam34/sam4cm_cpupause.c @@ -52,7 +52,7 @@ #include "up_arch.h" #include "sched/sched.h" #include "up_internal.h" -#include "chip/sam4cm_ipc.h" +#include "hardware/sam4cm_ipc.h" #ifdef CONFIG_SMP diff --git a/arch/arm/src/sam34/sam4cm_cpustart.c b/arch/arm/src/sam34/sam4cm_cpustart.c index 33dd5ef47a..a66e1f5f20 100644 --- a/arch/arm/src/sam34/sam4cm_cpustart.c +++ b/arch/arm/src/sam34/sam4cm_cpustart.c @@ -55,9 +55,9 @@ #include "sched/sched.h" #include "init/init.h" #include "up_internal.h" -#include "chip/sam_pmc.h" -#include "chip/sam_rstc.h" -#include "chip/sam4cm_ipc.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_rstc.h" +#include "hardware/sam4cm_ipc.h" #include "sam4cm_periphclks.h" #ifdef CONFIG_SMP diff --git a/arch/arm/src/sam34/sam4cm_periphclks.h b/arch/arm/src/sam34/sam4cm_periphclks.h index 9584c89170..400c1e9457 100644 --- a/arch/arm/src/sam34/sam4cm_periphclks.h +++ b/arch/arm/src/sam34/sam4cm_periphclks.h @@ -43,7 +43,7 @@ #include #include #include -#include "chip/sam_pmc.h" +#include "hardware/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam4cm_supc.c b/arch/arm/src/sam34/sam4cm_supc.c index 468466b80f..5cb8618150 100644 --- a/arch/arm/src/sam34/sam4cm_supc.c +++ b/arch/arm/src/sam34/sam4cm_supc.c @@ -51,7 +51,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/sam_supc.h" +#include "hardware/sam_supc.h" #include "sam4cm_supc.h" diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c index 79cc61cfdb..760a8a3bd0 100644 --- a/arch/arm/src/sam34/sam4cm_tc.c +++ b/arch/arm/src/sam34/sam4cm_tc.c @@ -63,8 +63,8 @@ #include "up_arch.h" #include "sam_periphclks.h" -#include "chip/sam_pinmap.h" -#include "chip/sam_pmc.h" +#include "hardware/sam_pinmap.h" +#include "hardware/sam_pmc.h" #include "sam_gpio.h" #include "sam4cm_tc.h" diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h index e474f2bc66..46f0f87ccb 100644 --- a/arch/arm/src/sam34/sam4cm_tc.h +++ b/arch/arm/src/sam34/sam4cm_tc.h @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "chip/sam_tc.h" +#include "hardware/sam_tc.h" #if defined(CONFIG_SAM34_TC0) || defined(CONFIG_SAM34_TC1) || defined(CONFIG_SAM34_TC2) diff --git a/arch/arm/src/sam34/sam4e_periphclks.h b/arch/arm/src/sam34/sam4e_periphclks.h index 5f41fee35f..5ed9812ab7 100644 --- a/arch/arm/src/sam34/sam4e_periphclks.h +++ b/arch/arm/src/sam34/sam4e_periphclks.h @@ -43,7 +43,7 @@ #include #include #include -#include "chip/sam_pmc.h" +#include "hardware/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam4l_clockconfig.c b/arch/arm/src/sam34/sam4l_clockconfig.c index 3b6ec2a701..86c90a7b83 100644 --- a/arch/arm/src/sam34/sam4l_clockconfig.c +++ b/arch/arm/src/sam34/sam4l_clockconfig.c @@ -50,11 +50,11 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/sam4l_pm.h" -#include "chip/sam4l_scif.h" -#include "chip/sam4l_bpm.h" -#include "chip/sam4l_bscif.h" -#include "chip/sam4l_flashcalw.h" +#include "hardware/sam4l_pm.h" +#include "hardware/sam4l_scif.h" +#include "hardware/sam4l_bpm.h" +#include "hardware/sam4l_bscif.h" +#include "hardware/sam4l_flashcalw.h" #include "sam4l_periphclks.h" #include "sam_clockconfig.h" diff --git a/arch/arm/src/sam34/sam4l_gpio.c b/arch/arm/src/sam34/sam4l_gpio.c index 02394a543f..140ec42787 100644 --- a/arch/arm/src/sam34/sam4l_gpio.c +++ b/arch/arm/src/sam34/sam4l_gpio.c @@ -53,7 +53,7 @@ #include "chip.h" #include "sam_gpio.h" -#include "chip/sam4l_gpio.h" +#include "hardware/sam4l_gpio.h" /**************************************************************************** * Private Data diff --git a/arch/arm/src/sam34/sam4l_periphclks.c b/arch/arm/src/sam34/sam4l_periphclks.c index 29e9d3cbf3..2a9984b3d9 100644 --- a/arch/arm/src/sam34/sam4l_periphclks.c +++ b/arch/arm/src/sam34/sam4l_periphclks.c @@ -47,7 +47,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/sam4l_pm.h" +#include "hardware/sam4l_pm.h" #include "sam4l_periphclks.h" diff --git a/arch/arm/src/sam34/sam4l_periphclks.h b/arch/arm/src/sam34/sam4l_periphclks.h index c092e243aa..e96704a36c 100644 --- a/arch/arm/src/sam34/sam4l_periphclks.h +++ b/arch/arm/src/sam34/sam4l_periphclks.h @@ -42,7 +42,7 @@ #include -#include "chip/sam4l_pm.h" +#include "hardware/sam4l_pm.h" #ifdef CONFIG_ARCH_CHIP_SAM4L diff --git a/arch/arm/src/sam34/sam4s_periphclks.h b/arch/arm/src/sam34/sam4s_periphclks.h index 1477ef2532..69c02c7037 100644 --- a/arch/arm/src/sam34/sam4s_periphclks.h +++ b/arch/arm/src/sam34/sam4s_periphclks.h @@ -43,7 +43,7 @@ #include #include #include -#include "chip/sam_pmc.h" +#include "hardware/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam_aes.h b/arch/arm/src/sam34/sam_aes.h index e0e6f114e2..428d7f7746 100644 --- a/arch/arm/src/sam34/sam_aes.h +++ b/arch/arm/src/sam34/sam_aes.h @@ -47,7 +47,7 @@ #include "chip.h" #ifdef CONFIG_ARCH_CHIP_SAM4CM -# include "chip/sam4cm_aes.h" +# include "hardware/sam4cm_aes.h" #else # error "Unknown chip for AES" #endif diff --git a/arch/arm/src/sam34/sam_clockconfig.c b/arch/arm/src/sam34/sam_clockconfig.c index 3dce96b02e..60889468f2 100644 --- a/arch/arm/src/sam34/sam_clockconfig.c +++ b/arch/arm/src/sam34/sam_clockconfig.c @@ -49,11 +49,11 @@ #include "up_internal.h" #include "sam_clockconfig.h" -#include "chip/sam_pmc.h" -#include "chip/sam_eefc.h" -#include "chip/sam_wdt.h" -#include "chip/sam_supc.h" -#include "chip/sam_matrix.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_eefc.h" +#include "hardware/sam_wdt.h" +#include "hardware/sam_supc.h" +#include "hardware/sam_matrix.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam_cmcc.c b/arch/arm/src/sam34/sam_cmcc.c index 3ffee69474..676dda4bb0 100644 --- a/arch/arm/src/sam34/sam_cmcc.c +++ b/arch/arm/src/sam34/sam_cmcc.c @@ -44,7 +44,7 @@ #include #include "up_arch.h" -#include "chip/sam_cmcc.h" +#include "hardware/sam_cmcc.h" #include "sam_cmcc.h" #ifdef CONFIG_SAM34_CMCC diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c index 75f0480839..1e06148cfe 100644 --- a/arch/arm/src/sam34/sam_dmac.c +++ b/arch/arm/src/sam34/sam_dmac.c @@ -57,8 +57,8 @@ #include "sam_dmac.h" #include "sam_periphclks.h" -#include "chip/sam_pmc.h" -#include "chip/sam_dmac.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_dmac.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 2c25ed0ea2..1d3f4f6f9c 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -78,7 +78,7 @@ #include "up_internal.h" #include "chip.h" -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" #include "sam_gpio.h" #include "sam_periphclks.h" #include "sam_cmcc.h" diff --git a/arch/arm/src/sam34/sam_emac.h b/arch/arm/src/sam34/sam_emac.h index 80c177bdcf..a61dc539ec 100644 --- a/arch/arm/src/sam34/sam_emac.h +++ b/arch/arm/src/sam34/sam_emac.h @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "chip/sam_emac.h" +#include "hardware/sam_emac.h" #ifdef CONFIG_SAM34_EMAC diff --git a/arch/arm/src/sam34/sam_gpio.c b/arch/arm/src/sam34/sam_gpio.c index d1dc1ef64b..8c8250741d 100644 --- a/arch/arm/src/sam34/sam_gpio.c +++ b/arch/arm/src/sam34/sam_gpio.c @@ -58,11 +58,11 @@ #if defined(CONFIG_ARCH_CHIP_SAM3U) || defined(CONFIG_ARCH_CHIP_SAM3X) || \ defined(CONFIG_ARCH_CHIP_SAM3A) -# include "chip/sam3u_pio.h" +# include "hardware/sam3u_pio.h" #elif defined(CONFIG_ARCH_CHIP_SAM4E) -# include "chip/sam4e_pio.h" +# include "hardware/sam4e_pio.h" #elif defined(CONFIG_ARCH_CHIP_SAM4CM) || defined(CONFIG_ARCH_CHIP_SAM4S) -# include "chip/sam4s_pio.h" +# include "hardware/sam4s_pio.h" #else # error Unrecognized SAM architecture #endif diff --git a/arch/arm/src/sam34/sam_gpioirq.c b/arch/arm/src/sam34/sam_gpioirq.c index e6091ee511..f4936d8584 100644 --- a/arch/arm/src/sam34/sam_gpioirq.c +++ b/arch/arm/src/sam34/sam_gpioirq.c @@ -55,15 +55,15 @@ #include "sam_gpio.h" #include "sam_periphclks.h" -#include "chip/sam_pmc.h" +#include "hardware/sam_pmc.h" #if defined(CONFIG_ARCH_CHIP_SAM3U) || defined(CONFIG_ARCH_CHIP_SAM3X) || \ defined(CONFIG_ARCH_CHIP_SAM3A) -# include "chip/sam3u_pio.h" +# include "hardware/sam3u_pio.h" #elif defined(CONFIG_ARCH_CHIP_SAM4E) -# include "chip/sam4e_pio.h" +# include "hardware/sam4e_pio.h" #elif defined(CONFIG_ARCH_CHIP_SAM4CM) || defined(CONFIG_ARCH_CHIP_SAM4S) -# include "chip/sam4s_pio.h" +# include "hardware/sam4s_pio.h" #else # error Unrecognized SAM architecture #endif diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c index 3e0a727687..7127eaf41e 100644 --- a/arch/arm/src/sam34/sam_hsmci.c +++ b/arch/arm/src/sam34/sam_hsmci.c @@ -70,15 +70,15 @@ # include "sam_dmac.h" #endif -#include "chip/sam_pmc.h" -#include "chip/sam_hsmci.h" -#include "chip/sam_pinmap.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_hsmci.h" +#include "hardware/sam_pinmap.h" #ifdef CONFIG_SAM34_DMAC -# include "chip/sam_dmac.h" +# include "hardware/sam_dmac.h" #endif #ifdef CONFIG_SAM34_PDCA -# include "chip/sam_pdc.h" +# include "hardware/sam_pdc.h" #endif #ifdef CONFIG_SAM34_HSMCI diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c index 13d5046ef0..013901eb38 100644 --- a/arch/arm/src/sam34/sam_lowputc.c +++ b/arch/arm/src/sam34/sam_lowputc.c @@ -53,16 +53,16 @@ #if defined(CONFIG_ARCH_CHIP_SAM3U) || defined(CONFIG_ARCH_CHIP_SAM3X) || \ defined(CONFIG_ARCH_CHIP_SAM3A) || defined(CONFIG_ARCH_CHIP_SAM4CM) || \ defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E) -# include "chip/sam_uart.h" +# include "hardware/sam_uart.h" #elif defined(CONFIG_ARCH_CHIP_SAM4L) -# include "chip/sam4l_usart.h" +# include "hardware/sam4l_usart.h" #else # error Unknown UART #endif /* The board.h file may redefine pin configurations defined in sam_pinmap.h */ -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" #include /**************************************************************************** diff --git a/arch/arm/src/sam34/sam_rtc.h b/arch/arm/src/sam34/sam_rtc.h index 03ab316693..93d6676dec 100644 --- a/arch/arm/src/sam34/sam_rtc.h +++ b/arch/arm/src/sam34/sam_rtc.h @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_rtc.h" +#include "hardware/sam_rtc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam_rtt.h b/arch/arm/src/sam34/sam_rtt.h index 3a00c17fbd..325c25ce8c 100644 --- a/arch/arm/src/sam34/sam_rtt.h +++ b/arch/arm/src/sam34/sam_rtt.h @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_rtt.h" +#include "hardware/sam_rtt.h" #ifdef CONFIG_TIMER diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c index 866fd8cc1e..0fae8f8f6e 100644 --- a/arch/arm/src/sam34/sam_serial.c +++ b/arch/arm/src/sam34/sam_serial.c @@ -67,9 +67,9 @@ #if defined(CONFIG_ARCH_CHIP_SAM3U) || defined(CONFIG_ARCH_CHIP_SAM3X) || \ defined(CONFIG_ARCH_CHIP_SAM3A) || defined(CONFIG_ARCH_CHIP_SAM4CM) || \ defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E) -# include "chip/sam_uart.h" +# include "hardware/sam_uart.h" #elif defined(CONFIG_ARCH_CHIP_SAM4L) -# include "chip/sam4l_usart.h" +# include "hardware/sam4l_usart.h" #else # error Unknown UART #endif diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index df2be89716..76c7f589d3 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -69,10 +69,10 @@ #include "sam_cmcc.h" #include "sam_periphclks.h" #include "sam_spi.h" -#include "chip/sam_pmc.h" -#include "chip/sam_dmac.h" -#include "chip/sam_spi.h" -#include "chip/sam_pinmap.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_dmac.h" +#include "hardware/sam_spi.h" +#include "hardware/sam_pinmap.h" #if defined(CONFIG_SAM34_SPI0) || defined(CONFIG_SAM34_SPI1) diff --git a/arch/arm/src/sam34/sam_spi.h b/arch/arm/src/sam34/sam_spi.h index b9cbcce76d..e31a2ad2b5 100644 --- a/arch/arm/src/sam34/sam_spi.h +++ b/arch/arm/src/sam34/sam_spi.h @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "chip/sam_spi.h" +#include "hardware/sam_spi.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam_tc.h b/arch/arm/src/sam34/sam_tc.h index 3667213d75..7ae228e882 100644 --- a/arch/arm/src/sam34/sam_tc.h +++ b/arch/arm/src/sam34/sam_tc.h @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_tc.h" +#include "hardware/sam_tc.h" #ifdef CONFIG_TIMER diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c index 7f733790f7..086bdd0d8a 100644 --- a/arch/arm/src/sam34/sam_twi.c +++ b/arch/arm/src/sam34/sam_twi.c @@ -64,8 +64,8 @@ #include "up_arch.h" -#include "chip/sam_pmc.h" -#include "chip/sam_pinmap.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_pinmap.h" #include "sam_periphclks.h" #include "sam_gpio.h" diff --git a/arch/arm/src/sam34/sam_twi.h b/arch/arm/src/sam34/sam_twi.h index 06868044b2..3969982a0b 100644 --- a/arch/arm/src/sam34/sam_twi.h +++ b/arch/arm/src/sam34/sam_twi.h @@ -42,7 +42,7 @@ #include #include -#include "chip/sam_twi.h" +#include "hardware/sam_twi.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index c2edada328..1381f39628 100644 --- a/arch/arm/src/sam34/sam_udp.c +++ b/arch/arm/src/sam34/sam_udp.c @@ -72,7 +72,7 @@ #include "up_internal.h" #include "sam_periphclks.h" -#include "chip/sam_udp.h" +#include "hardware/sam_udp.h" #include "sam_udp.h" #if defined(CONFIG_USBDEV) && defined(CONFIG_SAM34_UDP) diff --git a/arch/arm/src/sam34/sam_udp.h b/arch/arm/src/sam34/sam_udp.h index 38b665f865..0284c84405 100644 --- a/arch/arm/src/sam34/sam_udp.h +++ b/arch/arm/src/sam34/sam_udp.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/sam_udp.h" +#include "hardware/sam_udp.h" /************************************************************************************ * Public Functions diff --git a/arch/arm/src/sam34/sam_wdt.h b/arch/arm/src/sam34/sam_wdt.h index 3330cc01e7..ab421e9fd6 100644 --- a/arch/arm/src/sam34/sam_wdt.h +++ b/arch/arm/src/sam34/sam_wdt.h @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/sam_wdt.h" +#include "hardware/sam_wdt.h" #ifdef CONFIG_WATCHDOG diff --git a/configs/arduino-due/src/arduino-due.h b/configs/arduino-due/src/arduino-due.h index 780385dedd..3036c2c8d9 100644 --- a/configs/arduino-due/src/arduino-due.h +++ b/configs/arduino-due/src/arduino-due.h @@ -48,7 +48,7 @@ #include #include -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/configs/arduino-due/src/sam_mmcsd.c b/configs/arduino-due/src/sam_mmcsd.c index e6d461d58f..2d0e0e2155 100644 --- a/configs/arduino-due/src/sam_mmcsd.c +++ b/configs/arduino-due/src/sam_mmcsd.c @@ -49,7 +49,7 @@ #include "up_arch.h" #include "sam_gpio.h" -#include "chip/sam3u_pio.h" +#include "hardware/sam3u_pio.h" #include "arduino-due.h" diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c index 48dae4c162..67d8d7e702 100644 --- a/configs/arduino-due/src/sam_touchscreen.c +++ b/configs/arduino-due/src/sam_touchscreen.c @@ -53,7 +53,7 @@ #include "up_arch.h" #include "sam_gpio.h" -#include "chip/sam3u_pio.h" +#include "hardware/sam3u_pio.h" #include "arduino-due.h" diff --git a/configs/flipnclick-sam3x/src/flipnclick-sam3x.h b/configs/flipnclick-sam3x/src/flipnclick-sam3x.h index 9b6a563d3b..9e3e7e19c6 100644 --- a/configs/flipnclick-sam3x/src/flipnclick-sam3x.h +++ b/configs/flipnclick-sam3x/src/flipnclick-sam3x.h @@ -48,7 +48,7 @@ #include #include -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/configs/sam4cmp-db/src/sam4cmp-db.h b/configs/sam4cmp-db/src/sam4cmp-db.h index ab9a1733c6..6989cc2545 100644 --- a/configs/sam4cmp-db/src/sam4cmp-db.h +++ b/configs/sam4cmp-db/src/sam4cmp-db.h @@ -48,7 +48,7 @@ #include #include -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" /************************************************************************************ * Public Types diff --git a/configs/sam4e-ek/src/sam4e-ek.h b/configs/sam4e-ek/src/sam4e-ek.h index dacbe51098..aa5abaa093 100644 --- a/configs/sam4e-ek/src/sam4e-ek.h +++ b/configs/sam4e-ek/src/sam4e-ek.h @@ -48,7 +48,7 @@ #include #include -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/configs/sam4e-ek/src/sam_ili9325.c b/configs/sam4e-ek/src/sam_ili9325.c index 19c00ebd2d..e073635336 100644 --- a/configs/sam4e-ek/src/sam_ili9325.c +++ b/configs/sam4e-ek/src/sam_ili9325.c @@ -136,8 +136,8 @@ #include "up_arch.h" #include "sam_gpio.h" #include "sam_periphclks.h" -#include "chip/sam_pmc.h" -#include "chip/sam_smc.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_smc.h" #include "sam4e-ek.h" #ifdef CONFIG_LCD diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c index 8b68912389..906384c470 100644 --- a/configs/sam4e-ek/src/sam_ili9341.c +++ b/configs/sam4e-ek/src/sam_ili9341.c @@ -136,8 +136,8 @@ #include "up_arch.h" #include "sam_gpio.h" #include "sam_periphclks.h" -#include "chip/sam_pmc.h" -#include "chip/sam_smc.h" +#include "hardware/sam_pmc.h" +#include "hardware/sam_smc.h" #include "sam4e-ek.h" #ifdef CONFIG_LCD diff --git a/configs/sam4l-xplained/src/sam4l-xplained.h b/configs/sam4l-xplained/src/sam4l-xplained.h index 263b6fc8d1..e4c310a0d8 100644 --- a/configs/sam4l-xplained/src/sam4l-xplained.h +++ b/configs/sam4l-xplained/src/sam4l-xplained.h @@ -48,7 +48,7 @@ #include #include -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c index 41995b8b0f..9275f1f841 100644 --- a/configs/sam4l-xplained/src/sam_slcd.c +++ b/configs/sam4l-xplained/src/sam_slcd.c @@ -61,7 +61,7 @@ #include "up_arch.h" #include "sam_gpio.h" #include "sam4l_periphclks.h" -#include "chip/sam4l_lcdca.h" +#include "hardware/sam4l_lcdca.h" #include "sam4l-xplained.h" diff --git a/configs/sam4s-xplained/src/sam4s-xplained.h b/configs/sam4s-xplained/src/sam4s-xplained.h index 9e96a89072..0ee5a092ab 100644 --- a/configs/sam4s-xplained/src/sam4s-xplained.h +++ b/configs/sam4s-xplained/src/sam4s-xplained.h @@ -48,7 +48,7 @@ #include #include -#include "chip/sam_pinmap.h" +#include "hardware/sam_pinmap.h" /************************************************************************************ * Pre-processor Definitions diff --git a/configs/sam4s-xplained/src/sam_sram.c b/configs/sam4s-xplained/src/sam_sram.c index 28e9ae7ec2..9020979979 100644 --- a/configs/sam4s-xplained/src/sam_sram.c +++ b/configs/sam4s-xplained/src/sam_sram.c @@ -43,7 +43,7 @@ #include "up_arch.h" #include "sam4s_periphclks.h" -#include "chip/sam_smc.h" +#include "hardware/sam_smc.h" #include "sam4s-xplained.h" #ifdef CONFIG_SAM34_EXTSRAM0