diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-11 01:01:44 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-11 01:01:44 +0000 |
| commit | dadcb8540ae070f09279d9dcebb7ed7b3ce55a6f (patch) | |
| tree | 182ca16d90cdddae7c517aa9719d549cd8ef1466 /nuttx | |
| parent | 7c4f2d571c68db93f4ed9a5f9e0d0ed15a9fdadf (diff) | |
| download | px4-nuttx-dadcb8540ae070f09279d9dcebb7ed7b3ce55a6f.tar.gz px4-nuttx-dadcb8540ae070f09279d9dcebb7ed7b3ce55a6f.tar.bz2 px4-nuttx-dadcb8540ae070f09279d9dcebb7ed7b3ce55a6f.zip | |
CAN request order priority
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4292 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_can.c | 6 | ||||
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/include/board.h | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_can.c b/nuttx/arch/arm/src/stm32/stm32_can.c index bf83773a9..5365601f7 100755 --- a/nuttx/arch/arm/src/stm32/stm32_can.c +++ b/nuttx/arch/arm/src/stm32/stm32_can.c @@ -1225,9 +1225,13 @@ static int can_cellinit(struct stm32_can_s *priv) regval &= ~CAN_MCR_SLEEP; can_putreg(priv, STM32_CAN_MCR_OFFSET, regval); + /* Configure CAN behavior. Priority driven request order, not message ID. */ + + regval |= CAN_MCR_TXFP; + can_putreg(priv, STM32_CAN_MCR_OFFSET, regval); + /* Enter initialization mode */ - regval = can_getreg(priv, STM32_CAN_MCR_OFFSET); regval |= CAN_MCR_INRQ; can_putreg(priv, STM32_CAN_MCR_OFFSET, regval); diff --git a/nuttx/configs/stm3240g-eval/include/board.h b/nuttx/configs/stm3240g-eval/include/board.h index f5a1ed2d5..bc11866f3 100755 --- a/nuttx/configs/stm3240g-eval/include/board.h +++ b/nuttx/configs/stm3240g-eval/include/board.h @@ -350,8 +350,8 @@ * TIM8_CH3OUT: PC8 MicroSDCard_D0 & MC * Daughterboard Extension Connector, CN3, pin 18 * - * TIM8_CH4OUT: PC9 MicroSDCard_D1 & I2S_CKIN (JP16) - * Daughterboard Extension Connector, CN3, pin 15 + * TIM8_CH4OUT: PC9 MicroSDCard_D1 & I2S_CKIN (Need JP16 open) + * Daughterboard Extension Connector, CN3, pin 17 * * Others * @@ -377,10 +377,13 @@ # define GPIO_TIM8_CH1OUT GPIO_TIM8_CH1OUT_1 # if !defined(CONFIG_STM32_SDIO) # define GPIO_TIM8_CH3OUT GPIO_TIM8_CH3OUT_1 -# define GPIO_TIM8_CH4OUT GPIO_TIM8_CH4OUT_1 # endif #endif +#if !defined(CONFIG_STM32_SDIO) +# define GPIO_TIM8_CH4OUT GPIO_TIM8_CH4OUT_1 +#endif + /* CAN * * Connector 10 (CN10) is DB-9 male connector that can be used with CAN1 or CAN2. |