Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updates for STM3240 timers

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4113 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-11-21 21:46:46 +00:00
parent bfadd106a0
commit fdc1c4e8bb
3 changed files with 362 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/chip.h
+18 -21
View File
@@ -66,7 +66,6 @@
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 1 /* One advanced timer TIM1 */ # define STM32_NATIM 1 /* One advanced timer TIM1 */
# define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */ # define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */
# define STM32_NGTIM32 0 /* No 32-bit General timers */
# define STM32 NBTIM 0 /* No basic timers */ # define STM32 NBTIM 0 /* No basic timers */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
# define STM32_NSPI 2 /* SPI1-2 */ # define STM32_NSPI 2 /* SPI1-2 */
@@ -95,7 +94,6 @@
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and TIM8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and TIM8 */
# define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */ # define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */
# define STM32_NGTIM32 0 /* No 32-bit General timers */
# define STM32_NBTIM 2 /* Two basic timers TIM6 and TIM7 */ # define STM32_NBTIM 2 /* Two basic timers TIM6 and TIM7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
# define STM32_NSPI 3 /* SPI1-3 */ # define STM32_NSPI 3 /* SPI1-3 */
@@ -124,7 +122,6 @@
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 1 /* One advanced timers TIM1 */ # define STM32_NATIM 1 /* One advanced timers TIM1 */
# define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */ # define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */
# define STM32_NGTIM32 0 /* No 32-bit General timers */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
# define STM32_NSPI 3 /* SPI1-3 */ # define STM32_NSPI 3 /* SPI1-3 */
@@ -152,8 +149,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 0 /* No FSMC */ # define STM32_NFSMC 0 /* No FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -182,8 +179,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -212,8 +209,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -242,8 +239,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -272,8 +269,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -302,8 +299,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -332,8 +329,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -362,8 +359,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
@@ -392,8 +389,8 @@
# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */ # define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
# define STM32_NFSMC 1 /* FSMC */ # define STM32_NFSMC 1 /* FSMC */
# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */ # define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
# define STM32_NGTIM 2 /* 16-bit general timers TIM3 and 4 with DMA */ # define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
# define STM32_NGTIM32 2 /* 32-bit general timers TIM2 and 5 with DMA */ * 32-bit general timers TIM2 and 5 with DMA */
# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */ # define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
# define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */ # define STM32 NBTIM 2 /* Two basic timers, TIM6-7 */
# define STM32_NDMA 2 /* DMA1-2 */ # define STM32_NDMA 2 /* DMA1-2 */
arch/arm/src/stm32/chip/stm32_spi.h
+1 -1
View File
@@ -167,7 +167,7 @@
/* I2S configuration register */ /* I2S configuration register */
#fdef CONFIG_STM32_STM32F40XX #ifdef CONFIG_STM32_STM32F40XX
# define SPI_I2SCFGR_CHLEN (1 << 0) /* Bit 0: Channel length (number of bits per audio channel) */ # define SPI_I2SCFGR_CHLEN (1 << 0) /* Bit 0: Channel length (number of bits per audio channel) */
# define SPI_I2SCFGR_DATLEN_SHIFT (1) /* Bit 1-2: Data length to be transferred */ # define SPI_I2SCFGR_DATLEN_SHIFT (1) /* Bit 1-2: Data length to be transferred */
# define SPI_I2SCFGR_DATLEN_MASK (3 << SPI_I2SCFGR_DATLEN_SHIFT) # define SPI_I2SCFGR_DATLEN_MASK (3 << SPI_I2SCFGR_DATLEN_SHIFT)
arch/arm/src/stm32/chip/stm32_tim.h
+343 -130
View File
File diff suppressed because it is too large Load Diff