diff --git a/ChangeLog b/ChangeLog index 3653cd3ec47..7c4a4b00981 100755 --- a/ChangeLog +++ b/ChangeLog @@ -2004,9 +2004,9 @@ (TWR-K60N512). * drivers/can.c: Fixed a semaphore overflow problem in the CAN driver (reported by Li Zhouy (Lzyy)). - * 8/18/2011: The basic port to the FreeScale Kinetics TWR-K60N512 board is + * 8/18/2011: The basic port to the FreeScale Kinetis TWR-K60N512 board is now functional. - * configs/twr-k60n512: Add Kinetics TWR-K60N512 NSH configuration. + * configs/twr-k60n512: Add Kinetis TWR-K60N512 NSH configuration. * drivers/analog and include/nuttx/analog: Add ADC driver infrastructure and TI ADS1255 driver developed and submitted by Li Zhouy (Lzyy)). * arch/arm/stm32/stm32_sdio.h and drivers/mmcsd/mmcsd.c: Add logic to diff --git a/arch/arm/include/kinetis/chip.h b/arch/arm/include/kinetis/chip.h index 5e784f43634..6ecaf9b88fd 100644 --- a/arch/arm/include/kinetis/chip.h +++ b/arch/arm/include/kinetis/chip.h @@ -69,8 +69,8 @@ defined(CONFIG_ARCH_CHIP_MK20DN128VLH5) || \ defined(CONFIG_ARCH_CHIP_MK20DX128VLH5) -# define KINETIS_K20 1 /* Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# define KINETIS_K20 1 /* Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ @@ -151,8 +151,8 @@ defined(CONFIG_ARCH_CHIP_MK20DX128VLH7) || \ defined(CONFIG_ARCH_CHIP_MK20DX256VLH7) -# define KINETIS_K20 1 /* Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# define KINETIS_K20 1 /* Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ @@ -207,7 +207,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK40X64VFX50) || defined(CONFIG_ARCH_CHIP_MK40X64VLH50) || \ defined(CONFIG_ARCH_CHIP_MK40X64VLK50) || defined(CONFIG_ARCH_CHIP_MK40X64VMB50) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# define KINETIS_K40 1 /* Kinetics K40 family */ +# define KINETIS_K40 1 /* Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (64*1024) /* 64Kb */ @@ -258,7 +258,7 @@ defined(CONFIG_ARCH_CHIP_MK40X128VLK72) || defined(CONFIG_ARCH_CHIP_MK40X128VMB72) || \ defined(CONFIG_ARCH_CHIP_MK40X128VLL72) || defined(CONFIG_ARCH_CHIP_MK40X128VML72) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# define KINETIS_K40 1 /* Kinetics K40 family */ +# define KINETIS_K40 1 /* Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (128*1024) /* 128Kb */ @@ -301,7 +301,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK40X256VLK72) || defined(CONFIG_ARCH_CHIP_MK40X256VMB72) || \ defined(CONFIG_ARCH_CHIP_MK40X256VLL72) || defined(CONFIG_ARCH_CHIP_MK40X256VML72) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# define KINETIS_K40 1 /* Kinetics K40 family */ +# define KINETIS_K40 1 /* Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -343,7 +343,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK40X128VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X128VMD100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# define KINETIS_K40 1 /* Kinetics K40 family */ +# define KINETIS_K40 1 /* Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (128*1024) /* 128Kb */ @@ -385,7 +385,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK40X256VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X256VMD100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# define KINETIS_K40 1 /* Kinetics K40 family */ +# define KINETIS_K40 1 /* Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -429,7 +429,7 @@ defined(CONFIG_ARCH_CHIP_MK40N512VLL100) || defined(CONFIG_ARCH_CHIP_MK40N512VML100) || \ defined(CONFIG_ARCH_CHIP_MK40N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK40N512VMD100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# define KINETIS_K40 1 /* Kinetics K40 family */ +# define KINETIS_K40 1 /* Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (512*1024) /* 512Kb */ @@ -471,7 +471,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N256VLL100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -516,7 +516,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60X256VLL100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -561,7 +561,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N512VLL100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (512*1024) /* 256Kb */ @@ -607,7 +607,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N256VML100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -652,7 +652,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60X256VML100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -697,7 +697,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N512VML100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (512*1024) /* 256Kb */ @@ -742,7 +742,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N256VLQ100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -787,7 +787,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60X256VLQ100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -832,7 +832,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N512VLQ100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (512*1024) /* 512Kb */ @@ -877,7 +877,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N256VMD100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -922,7 +922,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60X256VMD100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (256*1024) /* 256Kb */ @@ -967,7 +967,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60N512VMD100) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # undef KINETIS_K64 /* Not Kinetis K64 family */ # define KINETIS_FLASH_SIZE (512*1024) /* 512Kb */ @@ -1012,7 +1012,7 @@ #elif defined(CONFIG_ARCH_CHIP_MK60FN1M0VLQ12) # undef KINETIS_K20 /* Not Kinetis K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # define KINETIS_K60 1 /* Kinetis K60 family */ # define KINETIS_NEW_MCG 1 /* Kinetis New MCG - different VDIV */ # undef KINETIS_K64 /* Not Kinetis K64 family */ @@ -1052,8 +1052,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VLL12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ @@ -1086,8 +1086,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FX512VLL12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ @@ -1120,8 +1120,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FX512VDC12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ @@ -1154,8 +1154,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VDC12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ @@ -1188,8 +1188,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FX512VLQ12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ @@ -1222,8 +1222,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VLQ12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ @@ -1256,8 +1256,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FX512VMD12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ @@ -1290,8 +1290,8 @@ # define KINETIS_NCRC 1 /* CRC */ #elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VMD12) -# undef KINETIS_K20 /* Not Kinetics K20 family */ -# undef KINETIS_K40 /* Not Kinetics K40 family */ +# undef KINETIS_K20 /* Not Kinetis K20 family */ +# undef KINETIS_K40 /* Not Kinetis K40 family */ # undef KINETIS_K60 /* Not Kinetis K60 family */ # define KINETIS_K64 1 /* Kinetis K64 family */ # define KINETIS_FLASH_SIZE (1024*1024) /* 1Mb */ diff --git a/arch/arm/include/kl/chip.h b/arch/arm/include/kl/chip.h index df1029eecb4..8be3b2029fd 100644 --- a/arch/arm/include/kl/chip.h +++ b/arch/arm/include/kl/chip.h @@ -50,7 +50,7 @@ #if defined(CONFIG_ARCH_CHIP_MKL25Z64) -# define KL_Z64 1 /* Kinetics KL25Z128 family */ +# define KL_Z64 1 /* Kinetis KL25Z128 family */ # define KL_FLASH_SIZE (64*1024) /* 64Kb */ # define KL_SRAM_SIZE (8*1024) /* 8Kb */ # undef KL_MPU /* No memory protection unit */ @@ -88,7 +88,7 @@ #elif defined(CONFIG_ARCH_CHIP_MKL25Z128) -# define KL_Z128 1 /* Kinetics KL25Z128 family */ +# define KL_Z128 1 /* Kinetis KL25Z128 family */ # define KL_FLASH_SIZE (128*1024) /* 64Kb */ # define KL_SRAM_SIZE (16*1024) /* 16Kb */ # undef KL_MPU /* No memory protection unit */ @@ -127,7 +127,7 @@ #elif defined(CONFIG_ARCH_CHIP_MKL26Z128) -# define KL_Z128 1 /* Kinetics KL25Z128 family */ +# define KL_Z128 1 /* Kinetis KL25Z128 family */ # define KL_FLASH_SIZE (128*1024) /* 64Kb */ # define KL_SRAM_SIZE (16*1024) /* 16Kb */ # undef KL_MPU /* No memory protection unit */ diff --git a/arch/arm/src/kinetis/chip/kinetis_dspi.h b/arch/arm/src/kinetis/chip/kinetis_dspi.h index 99507cb9e85..e41674494fb 100644 --- a/arch/arm/src/kinetis/chip/kinetis_dspi.h +++ b/arch/arm/src/kinetis/chip/kinetis_dspi.h @@ -50,75 +50,75 @@ /* Register Offsets *************************************************************************/ -#define KINETICS_SPI_MCR_OFFSET 0x0000 /* DSPI Module Configuration Register */ -#define KINETICS_SPI_TCR_OFFSET 0x0008 /* DSPI Transfer Count Register */ -#define KINETICS_SPI_CTAR0_OFFSET 0x000c /* DSPI Clock and Transfer Attributes Register */ -#define KINETICS_SPI_CTAR1_OFFSET 0x0010 /* DSPI Clock and Transfer Attributes Register */ -#define KINETICS_SPI_SR_OFFSET 0x002c /* DSPI Status Register */ -#define KINETICS_SPI_RSER_OFFSET 0x0030 /* DSPI DMA/Interrupt Request Select and Enable Register */ -#define KINETICS_SPI_PUSHR_OFFSET 0x0034 /* DSPI PUSH TX FIFO Register */ -#define KINETICS_SPI_POPR_OFFSET 0x0038 /* DSPI POP RX FIFO Register */ -#define KINETICS_SPI_TXFR0_OFFSET 0x003c /* DSPI Transmit FIFO Registers */ -#define KINETICS_SPI_TXFR1_OFFSET 0x0040 /* DSPI Transmit FIFO Registers */ -#define KINETICS_SPI_TXFR2_OFFSET 0x0044 /* DSPI Transmit FIFO Registers */ -#define KINETICS_SPI_TXFR3_OFFSET 0x0048 /* DSPI Transmit FIFO Registers */ -#define KINETICS_SPI_RXFR0_OFFSET 0x007c /* DSPI Receive FIFO Registers */ -#define KINETICS_SPI_RXFR1_OFFSET 0x0080 /* DSPI Receive FIFO Registers */ -#define KINETICS_SPI_RXFR2_OFFSET 0x0084 /* DSPI Receive FIFO Registers */ -#define KINETICS_SPI_RXFR3_OFFSET 0x0088 /* DSPI Receive FIFO Registers */ +#define KINETIS_SPI_MCR_OFFSET 0x0000 /* DSPI Module Configuration Register */ +#define KINETIS_SPI_TCR_OFFSET 0x0008 /* DSPI Transfer Count Register */ +#define KINETIS_SPI_CTAR0_OFFSET 0x000c /* DSPI Clock and Transfer Attributes Register */ +#define KINETIS_SPI_CTAR1_OFFSET 0x0010 /* DSPI Clock and Transfer Attributes Register */ +#define KINETIS_SPI_SR_OFFSET 0x002c /* DSPI Status Register */ +#define KINETIS_SPI_RSER_OFFSET 0x0030 /* DSPI DMA/Interrupt Request Select and Enable Register */ +#define KINETIS_SPI_PUSHR_OFFSET 0x0034 /* DSPI PUSH TX FIFO Register */ +#define KINETIS_SPI_POPR_OFFSET 0x0038 /* DSPI POP RX FIFO Register */ +#define KINETIS_SPI_TXFR0_OFFSET 0x003c /* DSPI Transmit FIFO Registers */ +#define KINETIS_SPI_TXFR1_OFFSET 0x0040 /* DSPI Transmit FIFO Registers */ +#define KINETIS_SPI_TXFR2_OFFSET 0x0044 /* DSPI Transmit FIFO Registers */ +#define KINETIS_SPI_TXFR3_OFFSET 0x0048 /* DSPI Transmit FIFO Registers */ +#define KINETIS_SPI_RXFR0_OFFSET 0x007c /* DSPI Receive FIFO Registers */ +#define KINETIS_SPI_RXFR1_OFFSET 0x0080 /* DSPI Receive FIFO Registers */ +#define KINETIS_SPI_RXFR2_OFFSET 0x0084 /* DSPI Receive FIFO Registers */ +#define KINETIS_SPI_RXFR3_OFFSET 0x0088 /* DSPI Receive FIFO Registers */ /* Register Addresses ***********************************************************************/ -#define KINETICS_SPI0_MCR (KINETIS_SPI0_BASE+KINETICS_SPI_MCR_OFFSET) -#define KINETICS_SPI0_TCR (KINETIS_SPI0_BASE+KINETICS_SPI_TCR_OFFSET) -#define KINETICS_SPI0_CTAR0 (KINETIS_SPI0_BASE+KINETICS_SPI_CTAR0_OFFSET) -#define KINETICS_SPI0_CTAR1 (KINETIS_SPI0_BASE+KINETICS_SPI_CTAR1_OFFSET) -#define KINETICS_SPI0_SR (KINETIS_SPI0_BASE+KINETICS_SPI_SR_OFFSET) -#define KINETICS_SPI0_RSER (KINETIS_SPI0_BASE+KINETICS_SPI_RSER_OFFSET) -#define KINETICS_SPI0_PUSHR (KINETIS_SPI0_BASE+KINETICS_SPI_PUSHR_OFFSET) -#define KINETICS_SPI0_POPR (KINETIS_SPI0_BASE+KINETICS_SPI_POPR_OFFSET) -#define KINETICS_SPI0_TXFR0 (KINETIS_SPI0_BASE+KINETICS_SPI_TXFR0_OFFSET) -#define KINETICS_SPI0_TXFR1 (KINETIS_SPI0_BASE+KINETICS_SPI_TXFR1_OFFSET) -#define KINETICS_SPI0_TXFR2 (KINETIS_SPI0_BASE+KINETICS_SPI_TXFR2_OFFSET) -#define KINETICS_SPI0_TXFR3 (KINETIS_SPI0_BASE+KINETICS_SPI_TXFR3_OFFSET) -#define KINETICS_SPI0_RXFR0 (KINETIS_SPI0_BASE+KINETICS_SPI_RXFR0_OFFSET) -#define KINETICS_SPI0_RXFR1 (KINETIS_SPI0_BASE+KINETICS_SPI_RXFR1_OFFSET) -#define KINETICS_SPI0_RXFR2 (KINETIS_SPI0_BASE+KINETICS_SPI_RXFR2_OFFSET) -#define KINETICS_SPI0_RXFR3 (KINETIS_SPI0_BASE+KINETICS_SPI_RXFR3_OFFSET) +#define KINETIS_SPI0_MCR (KINETIS_SPI0_BASE+KINETIS_SPI_MCR_OFFSET) +#define KINETIS_SPI0_TCR (KINETIS_SPI0_BASE+KINETIS_SPI_TCR_OFFSET) +#define KINETIS_SPI0_CTAR0 (KINETIS_SPI0_BASE+KINETIS_SPI_CTAR0_OFFSET) +#define KINETIS_SPI0_CTAR1 (KINETIS_SPI0_BASE+KINETIS_SPI_CTAR1_OFFSET) +#define KINETIS_SPI0_SR (KINETIS_SPI0_BASE+KINETIS_SPI_SR_OFFSET) +#define KINETIS_SPI0_RSER (KINETIS_SPI0_BASE+KINETIS_SPI_RSER_OFFSET) +#define KINETIS_SPI0_PUSHR (KINETIS_SPI0_BASE+KINETIS_SPI_PUSHR_OFFSET) +#define KINETIS_SPI0_POPR (KINETIS_SPI0_BASE+KINETIS_SPI_POPR_OFFSET) +#define KINETIS_SPI0_TXFR0 (KINETIS_SPI0_BASE+KINETIS_SPI_TXFR0_OFFSET) +#define KINETIS_SPI0_TXFR1 (KINETIS_SPI0_BASE+KINETIS_SPI_TXFR1_OFFSET) +#define KINETIS_SPI0_TXFR2 (KINETIS_SPI0_BASE+KINETIS_SPI_TXFR2_OFFSET) +#define KINETIS_SPI0_TXFR3 (KINETIS_SPI0_BASE+KINETIS_SPI_TXFR3_OFFSET) +#define KINETIS_SPI0_RXFR0 (KINETIS_SPI0_BASE+KINETIS_SPI_RXFR0_OFFSET) +#define KINETIS_SPI0_RXFR1 (KINETIS_SPI0_BASE+KINETIS_SPI_RXFR1_OFFSET) +#define KINETIS_SPI0_RXFR2 (KINETIS_SPI0_BASE+KINETIS_SPI_RXFR2_OFFSET) +#define KINETIS_SPI0_RXFR3 (KINETIS_SPI0_BASE+KINETIS_SPI_RXFR3_OFFSET) -#define KINETICS_SPI1_MCR (KINETIS_SPI1_BASE+KINETICS_SPI_MCR_OFFSET) -#define KINETICS_SPI1_TCR (KINETIS_SPI1_BASE+KINETICS_SPI_TCR_OFFSET) -#define KINETICS_SPI1_CTAR0 (KINETIS_SPI1_BASE+KINETICS_SPI_CTAR0_OFFSET) -#define KINETICS_SPI1_CTAR1 (KINETIS_SPI1_BASE+KINETICS_SPI_CTAR1_OFFSET) -#define KINETICS_SPI1_SR (KINETIS_SPI1_BASE+KINETICS_SPI_SR_OFFSET) -#define KINETICS_SPI1_RSER (KINETIS_SPI1_BASE+KINETICS_SPI_RSER_OFFSET) -#define KINETICS_SPI1_PUSHR (KINETIS_SPI1_BASE+KINETICS_SPI_PUSHR_OFFSET) -#define KINETICS_SPI1_POPR (KINETIS_SPI1_BASE+KINETICS_SPI_POPR_OFFSET) -#define KINETICS_SPI1_TXFR0 (KINETIS_SPI1_BASE+KINETICS_SPI_TXFR0_OFFSET) -#define KINETICS_SPI1_TXFR1 (KINETIS_SPI1_BASE+KINETICS_SPI_TXFR1_OFFSET) -#define KINETICS_SPI1_TXFR2 (KINETIS_SPI1_BASE+KINETICS_SPI_TXFR2_OFFSET) -#define KINETICS_SPI1_TXFR3 (KINETIS_SPI1_BASE+KINETICS_SPI_TXFR3_OFFSET) -#define KINETICS_SPI1_RXFR0 (KINETIS_SPI1_BASE+KINETICS_SPI_RXFR0_OFFSET) -#define KINETICS_SPI1_RXFR1 (KINETIS_SPI1_BASE+KINETICS_SPI_RXFR1_OFFSET) -#define KINETICS_SPI1_RXFR2 (KINETIS_SPI1_BASE+KINETICS_SPI_RXFR2_OFFSET) -#define KINETICS_SPI1_RXFR3 (KINETIS_SPI1_BASE+KINETICS_SPI_RXFR3_OFFSET) +#define KINETIS_SPI1_MCR (KINETIS_SPI1_BASE+KINETIS_SPI_MCR_OFFSET) +#define KINETIS_SPI1_TCR (KINETIS_SPI1_BASE+KINETIS_SPI_TCR_OFFSET) +#define KINETIS_SPI1_CTAR0 (KINETIS_SPI1_BASE+KINETIS_SPI_CTAR0_OFFSET) +#define KINETIS_SPI1_CTAR1 (KINETIS_SPI1_BASE+KINETIS_SPI_CTAR1_OFFSET) +#define KINETIS_SPI1_SR (KINETIS_SPI1_BASE+KINETIS_SPI_SR_OFFSET) +#define KINETIS_SPI1_RSER (KINETIS_SPI1_BASE+KINETIS_SPI_RSER_OFFSET) +#define KINETIS_SPI1_PUSHR (KINETIS_SPI1_BASE+KINETIS_SPI_PUSHR_OFFSET) +#define KINETIS_SPI1_POPR (KINETIS_SPI1_BASE+KINETIS_SPI_POPR_OFFSET) +#define KINETIS_SPI1_TXFR0 (KINETIS_SPI1_BASE+KINETIS_SPI_TXFR0_OFFSET) +#define KINETIS_SPI1_TXFR1 (KINETIS_SPI1_BASE+KINETIS_SPI_TXFR1_OFFSET) +#define KINETIS_SPI1_TXFR2 (KINETIS_SPI1_BASE+KINETIS_SPI_TXFR2_OFFSET) +#define KINETIS_SPI1_TXFR3 (KINETIS_SPI1_BASE+KINETIS_SPI_TXFR3_OFFSET) +#define KINETIS_SPI1_RXFR0 (KINETIS_SPI1_BASE+KINETIS_SPI_RXFR0_OFFSET) +#define KINETIS_SPI1_RXFR1 (KINETIS_SPI1_BASE+KINETIS_SPI_RXFR1_OFFSET) +#define KINETIS_SPI1_RXFR2 (KINETIS_SPI1_BASE+KINETIS_SPI_RXFR2_OFFSET) +#define KINETIS_SPI1_RXFR3 (KINETIS_SPI1_BASE+KINETIS_SPI_RXFR3_OFFSET) -#define KINETICS_SPI2_MCR (KINETIS_SPI2_BASE+KINETICS_SPI_MCR_OFFSET) -#define KINETICS_SPI2_TCR (KINETIS_SPI2_BASE+KINETICS_SPI_TCR_OFFSET) -#define KINETICS_SPI2_CTAR0 (KINETIS_SPI2_BASE+KINETICS_SPI_CTAR0_OFFSET) -#define KINETICS_SPI2_CTAR1 (KINETIS_SPI2_BASE+KINETICS_SPI_CTAR1_OFFSET) -#define KINETICS_SPI2_SR (KINETIS_SPI2_BASE+KINETICS_SPI_SR_OFFSET) -#define KINETICS_SPI2_RSER (KINETIS_SPI2_BASE+KINETICS_SPI_RSER_OFFSET) -#define KINETICS_SPI2_PUSHR (KINETIS_SPI2_BASE+KINETICS_SPI_PUSHR_OFFSET) -#define KINETICS_SPI2_POPR (KINETIS_SPI2_BASE+KINETICS_SPI_POPR_OFFSET) -#define KINETICS_SPI2_TXFR0 (KINETIS_SPI2_BASE+KINETICS_SPI_TXFR0_OFFSET) -#define KINETICS_SPI2_TXFR1 (KINETIS_SPI2_BASE+KINETICS_SPI_TXFR1_OFFSET) -#define KINETICS_SPI2_TXFR2 (KINETIS_SPI2_BASE+KINETICS_SPI_TXFR2_OFFSET) -#define KINETICS_SPI2_TXFR3 (KINETIS_SPI2_BASE+KINETICS_SPI_TXFR3_OFFSET) -#define KINETICS_SPI2_RXFR0 (KINETIS_SPI2_BASE+KINETICS_SPI_RXFR0_OFFSET) -#define KINETICS_SPI2_RXFR1 (KINETIS_SPI2_BASE+KINETICS_SPI_RXFR1_OFFSET) -#define KINETICS_SPI2_RXFR2 (KINETIS_SPI2_BASE+KINETICS_SPI_RXFR2_OFFSET) -#define KINETICS_SPI2_RXFR3 (KINETIS_SPI2_BASE+KINETICS_SPI_RXFR3_OFFSET) +#define KINETIS_SPI2_MCR (KINETIS_SPI2_BASE+KINETIS_SPI_MCR_OFFSET) +#define KINETIS_SPI2_TCR (KINETIS_SPI2_BASE+KINETIS_SPI_TCR_OFFSET) +#define KINETIS_SPI2_CTAR0 (KINETIS_SPI2_BASE+KINETIS_SPI_CTAR0_OFFSET) +#define KINETIS_SPI2_CTAR1 (KINETIS_SPI2_BASE+KINETIS_SPI_CTAR1_OFFSET) +#define KINETIS_SPI2_SR (KINETIS_SPI2_BASE+KINETIS_SPI_SR_OFFSET) +#define KINETIS_SPI2_RSER (KINETIS_SPI2_BASE+KINETIS_SPI_RSER_OFFSET) +#define KINETIS_SPI2_PUSHR (KINETIS_SPI2_BASE+KINETIS_SPI_PUSHR_OFFSET) +#define KINETIS_SPI2_POPR (KINETIS_SPI2_BASE+KINETIS_SPI_POPR_OFFSET) +#define KINETIS_SPI2_TXFR0 (KINETIS_SPI2_BASE+KINETIS_SPI_TXFR0_OFFSET) +#define KINETIS_SPI2_TXFR1 (KINETIS_SPI2_BASE+KINETIS_SPI_TXFR1_OFFSET) +#define KINETIS_SPI2_TXFR2 (KINETIS_SPI2_BASE+KINETIS_SPI_TXFR2_OFFSET) +#define KINETIS_SPI2_TXFR3 (KINETIS_SPI2_BASE+KINETIS_SPI_TXFR3_OFFSET) +#define KINETIS_SPI2_RXFR0 (KINETIS_SPI2_BASE+KINETIS_SPI_RXFR0_OFFSET) +#define KINETIS_SPI2_RXFR1 (KINETIS_SPI2_BASE+KINETIS_SPI_RXFR1_OFFSET) +#define KINETIS_SPI2_RXFR2 (KINETIS_SPI2_BASE+KINETIS_SPI_RXFR2_OFFSET) +#define KINETIS_SPI2_RXFR3 (KINETIS_SPI2_BASE+KINETIS_SPI_RXFR3_OFFSET) /* Register Bit Definitions *****************************************************************/ diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 30707e47ac1..0bd4f5c1143 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -264,7 +264,7 @@ static inline uint16_t kinesis_swap16(uint16_t value); /* Common TX logic */ -static bool kinetics_txringfull(FAR struct kinetis_driver_s *priv); +static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv); static int kinetis_transmit(FAR struct kinetis_driver_s *priv); static int kinetis_txpoll(struct net_driver_s *dev); @@ -366,7 +366,7 @@ static inline uint16_t kinesis_swap16(uint16_t value) #endif /**************************************************************************** - * Function: kinetics_txringfull + * Function: kinetis_txringfull * * Description: * Check if all of the TX descriptors are in use. @@ -380,7 +380,7 @@ static inline uint16_t kinesis_swap16(uint16_t value) * ****************************************************************************/ -static bool kinetics_txringfull(FAR struct kinetis_driver_s *priv) +static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv) { uint8_t txnext; @@ -429,7 +429,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv) * case, the outgoing packet will be dropped (e.g. an ARP reply) */ - if (kinetics_txringfull(priv)) + if (kinetis_txringfull(priv)) { return -EBUSY; } @@ -565,7 +565,7 @@ static int kinetis_txpoll(struct net_driver_s *dev) * return a non-zero value to terminate the poll. */ - if (kinetics_txringfull(priv)) + if (kinetis_txringfull(priv)) { return -EBUSY; } @@ -1055,7 +1055,7 @@ static void kinetis_poll_work(FAR void *arg) */ net_lock(); - if (!kinetics_txringfull(priv)) + if (!kinetis_txringfull(priv)) { /* If so, update TCP timing states and poll the network for new XMIT data. Hmmm.. * might be bug here. Does this mean if there is a transmit in progress, @@ -1328,7 +1328,7 @@ static void kinetis_txavail_work(FAR void *arg) * packet. */ - if (!kinetics_txringfull(priv)) + if (!kinetis_txringfull(priv)) { /* No, there is space for another transfer. Poll the network for new * XMIT data.