dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

CAN request order priority 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4292 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-01-11 01:01:44 +00:00
parent 8129fb8f09
commit ede0deaaa8
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nuttx/arch/arm/src/stm32/stm32_can.c
View File

@ -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);

9
nuttx/configs/stm3240g-eval/include/board.h
View File

@ -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.