sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm/kinetis: Still moving register header files to kinetis/chip directory; still incorporating K64 differences.

Browse Source
This commit is contained in:
Gregory Nutt 2016-07-01 11:55:15 -06:00
parent 91dd3306c8
commit 62a9b10b3d
12 changed files with 98 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/src/kinetis/kinetis_cmp.h → arch/arm/src/kinetis/chip/kinetis_cmp.h
View File

@ -1,7 +1,7 @@
/********************************************************************************************
* arch/arm/src/kinetis/kinetis_cmp.h
* arch/arm/src/kinetis/chip/kinetis_cmp.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_CMP_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_CMP_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H
/********************************************************************************************
* Included Files
@ -172,7 +172,9 @@
# define CMP_MUXCR_PSEL_IN5 (5 << CMP_MUXCR_PSEL_SHIFT)
# define CMP_MUXCR_PSEL_IN6 (6 << CMP_MUXCR_PSEL_SHIFT)
# define CMP_MUXCR_PSEL_IN7 (7 << CMP_MUXCR_PSEL_SHIFT)
#define CMP_MUXCR_MEN (1 << 6) /* Bit 6: MMUX Enable */
#ifndef KINETIS_K64
# define CMP_MUXCR_MEN (1 << 6) /* Bit 6: MMUX Enable */
#endif
#define CMP_MUXCR_PEN (1 << 7) /* Bit 7: PMUX Enable */
/********************************************************************************************
@ -187,4 +189,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_CMP_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H */

10
arch/arm/src/kinetis/kinetis_cmt.h → arch/arm/src/kinetis/chip/kinetis_cmt.h
View File

@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/kinetis/kinetis_cmt.h
* arch/arm/src/kinetis/chip/kinetis_cmt.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_CMT_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_CMT_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H
/************************************************************************************
* Included Files
@ -135,4 +135,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_CMT_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H */

30
arch/arm/src/kinetis/kinetis_crc.h → arch/arm/src/kinetis/chip/kinetis_crc.h
View File

@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/kinetis/kinetis_crc.h
* arch/arm/src/kinetis/chip/kinetis_crc.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_CRC_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_CRC_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H
/************************************************************************************
* Included Files
@ -52,13 +52,13 @@
/* Register Offsets *****************************************************************/
#define KINETIS_CRC_CRC_OFFSET 0x0000 /* CRC Data Register */
#define KINETIS_CRC_DATA_OFFSET 0x0000 /* CRC Data Register */
#define KINETIS_CRC_GPOLY_OFFSET 0x0004 /* CRC Polynomial Register */
#define KINETIS_CRC_CTRL_OFFSET 0x0008 /* CRC Control Register */
/* Register Addresses ***************************************************************/
#define KINETIS_CRC_CRC (KINETIS_CRC_BASE+KINETIS_CRC_CRC_OFFSET)
#define KINETIS_CRC_DATA (KINETIS_CRC_BASE+KINETIS_CRC_DATA_OFFSET)
#define KINETIS_CRC_GPOLY (KINETIS_CRC_BASE+KINETIS_CRC_GPOLY_OFFSET)
#define KINETIS_CRC_CTRL (KINETIS_CRC_BASE+KINETIS_CRC_CTRL_OFFSET)
@ -66,14 +66,14 @@
/* CRC Data Register (32-bit) */
#define CRC_CRC_LL_SHIFT (0) /* Bits 0-7: CRC Low Lower Byte */
#define CRC_CRC_LL_MASK (0xff << CRC_CRC_LL_SHIFT)
#define CRC_CRC_LU_SHIFT (8) /* Bits 8-15: CRC Low Upper Byte */
#define CRC_CRC_LU_MASK (0xff << CRC_CRC_LU_SHIFT)
#define CRC_CRC_HL_SHIFT (16) /* Bits 16-23: CRC High Lower Byte */
#define CRC_CRC_HL_MASK (0xff << CRC_CRC_HL_SHIFT)
#define CRC_CRC_HU_SHIFT (24) /* Bits 24-31: CRC High Upper Byte */
#define CRC_CRC_HU_MASK (0xff << CRC_CRC_HU_SHIFT)
#define CRC_DATA_LL_SHIFT (0) /* Bits 0-7: CRC Low Lower Byte */
#define CRC_DATA_LL_MASK (0xff << CRC_DATA_LL_SHIFT)
#define CRC_DATA_LU_SHIFT (8) /* Bits 8-15: CRC Low Upper Byte */
#define CRC_DATA_LU_MASK (0xff << CRC_DATA_LU_SHIFT)
#define CRC_DATA_HL_SHIFT (16) /* Bits 16-23: CRC High Lower Byte */
#define CRC_DATA_HL_MASK (0xff << CRC_DATA_HL_SHIFT)
#define CRC_DATA_HU_SHIFT (24) /* Bits 24-31: CRC High Upper Byte */
#define CRC_DATA_HU_MASK (0xff << CRC_DATA_HU_SHIFT)
/* CRC Polynomial Register */
@ -114,4 +114,4 @@
************************************************************************************/
#endif /* KINETIS_NCRC && KINETIS_NCRC > 0 */
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_CRC_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H */

10
arch/arm/src/kinetis/kinetis_dac.h → arch/arm/src/kinetis/chip/kinetis_dac.h
View File

@ -1,7 +1,7 @@
/********************************************************************************************
* arch/arm/src/kinetis/kinetis_dac.h
* arch/arm/src/kinetis/chip/kinetis_dac.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DACE_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_DACE_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H
/********************************************************************************************
* Included Files
@ -232,4 +232,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DACE_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H */

62
arch/arm/src/kinetis/kinetis_dma.h → arch/arm/src/kinetis/chip/kinetis_dma.h
View File

@ -1,7 +1,7 @@
/****************************************************************************************************
* arch/arm/src/kinetis/kinetis_dma.h
* arch/arm/src/kinetis/chip/kinetis_dma.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DMA_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_DMA_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H
/****************************************************************************************************
* Included Files
@ -83,18 +83,20 @@
#define KINETIS_DMA_DCHPRI13_OFFSET 0x010e /* Channel 13 Priority Register */
#define KINETIS_DMA_DCHPRI12_OFFSET 0x010f /* Channel 12 Priority Register */
#define KINETIS_DMA_TCD_OFFSET(n) (0x0000+((n) << 5))
#define KINETIS_DMA_TCD_SADDR_OFFSET 0x0000 /* TCD Source Address */
#define KINETIS_DMA_TCD_SOFF_OFFSET 0x0004 /* TCD Signed Source Address Offset */
#define KINETIS_DMA_TCD_ATTR_OFFSET 0x0006 /* TCD Transfer Attributes */
#define KINETIS_DMA_TCD_NBYTES_OFFSET 0x0008 /* TCD Minor Byte Count */
#define KINETIS_DMA_TCD_SLAST_OFFSET 0x000c /* TCD Last Source Address Adjustment */
#define KINETIS_DMA_TCD_DADDR_OFFSET 0x0010 /* TCD Destination Address */
#define KINETIS_DMA_TCD_DOFF_OFFSET 0x0014 /* TCD Signed Destination Address Offset */
#define KINETIS_DMA_TCD_CITER_OFFSET 0x0016 /* TCD Current Minor Loop Link, Major Loop Count */
#define KINETIS_DMA_TCD_DLASTSGA_OFFSET 0x0018 /* TCD Last Destination Address Adjustment/Scatter Gather Address */
#define KINETIS_DMA_TCD_CSR_OFFSET 0x001c /* TCD Control and Status */
#define KINETIS_DMA_TCD_BITER_OFFSET 0x001e /* TCD Beginning Minor Loop Link, Major Loop Count */
#ifndef KINETIS_K64
# define KINETIS_DMA_TCD_OFFSET(n) (0x0000+((n) << 5))
# define KINETIS_DMA_TCD_SADDR_OFFSET 0x0000 /* TCD Source Address */
# define KINETIS_DMA_TCD_SOFF_OFFSET 0x0004 /* TCD Signed Source Address Offset */
# define KINETIS_DMA_TCD_ATTR_OFFSET 0x0006 /* TCD Transfer Attributes */
# define KINETIS_DMA_TCD_NBYTES_OFFSET 0x0008 /* TCD Minor Byte Count */
# define KINETIS_DMA_TCD_SLAST_OFFSET 0x000c /* TCD Last Source Address Adjustment */
# define KINETIS_DMA_TCD_DADDR_OFFSET 0x0010 /* TCD Destination Address */
# define KINETIS_DMA_TCD_DOFF_OFFSET 0x0014 /* TCD Signed Destination Address Offset */
# define KINETIS_DMA_TCD_CITER_OFFSET 0x0016 /* TCD Current Minor Loop Link, Major Loop Count */
# define KINETIS_DMA_TCD_DLASTSGA_OFFSET 0x0018 /* TCD Last Destination Address Adjustment/Scatter Gather Address */
# define KINETIS_DMA_TCD_CSR_OFFSET 0x001c /* TCD Control and Status */
# define KINETIS_DMA_TCD_BITER_OFFSET 0x001e /* TCD Beginning Minor Loop Link, Major Loop Count */
#endif
#define KINETIS_DMA_TCD0_SADDR_OFFSET 0x0000 /* TCD Source Address */
#define KINETIS_DMA_TCD0_SOFF_OFFSET 0x0004 /* TCD Signed Source Address Offset */
@ -323,19 +325,21 @@
#define KINETIS_DMA_DCHPRI13 (KINETIS_DMAC_BASE+KINETIS_DMA_DCHPRI13_OFFSET)
#define KINETIS_DMA_DCHPRI12 (KINETIS_DMAC_BASE+KINETIS_DMA_DCHPRI12_OFFSET)
#define KINETIS_DMA_TCD_BASE(n) (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD_OFFSET(n))
#ifndef KINETIS_K64
# define KINETIS_DMA_TCD_BASE(n) (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD_OFFSET(n))
#define KINETIS_DMA_TCD_SADDR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SADDR_OFFSET)
#define KINETIS_DMA_TCD_SOFF(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SOFF_OFFSET)
#define KINETIS_DMA_TCD_ATTR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_ATTR_OFFSET)
#define KINETIS_DMA_TCD_NBYTES(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_NBYTES_OFFSET)
#define KINETIS_DMA_TCD_SLAST(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SLAST_OFFSET)
#define KINETIS_DMA_TCD_DADDR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DADDR_OFFSET)
#define KINETIS_DMA_TCD_DOFF(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DOFF_OFFSET)
#define KINETIS_DMA_TCD_CITER(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CITER_OFFSET)
#define KINETIS_DMA_TCD_DLASTSGA(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DLASTSGA_OFFSET)
#define KINETIS_DMA_TCD_CSR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CSR_OFFSET)
#define KINETIS_DMA_TCD_BITER(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_BITER_OFFSET)
# define KINETIS_DMA_TCD_SADDR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SADDR_OFFSET)
# define KINETIS_DMA_TCD_SOFF(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SOFF_OFFSET)
# define KINETIS_DMA_TCD_ATTR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_ATTR_OFFSET)
# define KINETIS_DMA_TCD_NBYTES(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_NBYTES_OFFSET)
# define KINETIS_DMA_TCD_SLAST(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SLAST_OFFSET)
# define KINETIS_DMA_TCD_DADDR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DADDR_OFFSET)
# define KINETIS_DMA_TCD_DOFF(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DOFF_OFFSET)
# define KINETIS_DMA_TCD_CITER(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CITER_OFFSET)
# define KINETIS_DMA_TCD_DLASTSGA(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DLASTSGA_OFFSET)
# define KINETIS_DMA_TCD_CSR(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CSR_OFFSET)
# define KINETIS_DMA_TCD_BITER(n) (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_BITER_OFFSET)
#endif
#define KINETIS_DMA_TCD0_SADDR (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD0_SADDR_OFFSET)
#define KINETIS_DMA_TCD0_SOFF (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD0_SOFF_OFFSET)
@ -772,4 +776,4 @@
* Public Functions
****************************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DMA_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H */

10
arch/arm/src/kinetis/kinetis_dmamux.h → arch/arm/src/kinetis/chip/kinetis_dmamux.h
View File

@ -1,7 +1,7 @@
/********************************************************************************************
* arch/arm/src/kinetis/kinetis_dmamux.h
* arch/arm/src/kinetis/chip/kinetis_dmamux.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DMAMUX_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_DMAMUX_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H
/********************************************************************************************
* Included Files
@ -108,4 +108,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DMAMUX_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H */

10
arch/arm/src/kinetis/kinetis_dspi.h → arch/arm/src/kinetis/chip/kinetis_dspi.h
View File

@ -1,7 +1,7 @@
/********************************************************************************************
* arch/arm/src/kinetis/kinetis_dspi.h
* arch/arm/src/kinetis/chip/kinetis_dspi.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DSPI_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_DSPI_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H
/********************************************************************************************
* Included Files
@ -318,4 +318,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DSPI_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H */

10
arch/arm/src/kinetis/kinetis_enet.h → arch/arm/src/kinetis/chip/kinetis_enet.h
View File

@ -1,7 +1,7 @@
/********************************************************************************************
* arch/arm/src/kinetis/kinetis_enet.h
* arch/arm/src/kinetis/chip/kinetis_enet.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_ENET_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_ENET_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H
/********************************************************************************************
* Included Files
@ -649,4 +649,4 @@ struct enet_desc_s
********************************************************************************************/
#endif /* KINETIS_NENET && KINETIS_NENET > 0 */
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_ENET_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H */

10
arch/arm/src/kinetis/kinetis_ewm.h → arch/arm/src/kinetis/chip/kinetis_ewm.h
View File

@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/kinetis/kinetis_ewm.h
* arch/arm/src/kinetis/chip/kinetis_ewm.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_EWM_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_EWM_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H
/************************************************************************************
* Included Files
@ -87,4 +87,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_EWM_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H */

10
arch/arm/src/kinetis/kinetis_flexbus.h → arch/arm/src/kinetis/chip/kinetis_flexbus.h
View File

@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/kinetis/kinetis_flexbus.h
* arch/arm/src/kinetis/chip/kinetis_flexbus.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXBUS_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXBUS_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H
/************************************************************************************
* Included Files
@ -210,4 +210,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXBUS_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H */

10
arch/arm/src/kinetis/kinetis_flexcan.h → arch/arm/src/kinetis/chip/kinetis_flexcan.h
View File

@ -1,7 +1,7 @@
/****************************************************************************************************
* arch/arm/src/kinetis/kinetis_flexcan.h
* arch/arm/src/kinetis/chip/kinetis_flexcan.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXCAN_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXCAN_H
#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H
#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H
/****************************************************************************************************
* Included Files
@ -315,4 +315,4 @@
* Public Functions
****************************************************************************************************/
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXCAN_H */
#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H */

4
arch/arm/src/kinetis/kinetis_enet.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* drivers/net/kinetis_enet.c
* arch/arm/src/kinetis/kinetis_enet.c
*
* Copyright (C) 2011-2012, 2014-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -68,7 +68,7 @@
#include "chip/kinetis_pinmux.h"
#include "kinetis_sim.h"
#include "kinetis_mpu.h"
#include "kinetis_enet.h"
#include "chip/kinetis_enet.h"
#if defined(KINETIS_NENET) && KINETIS_NENET > 0