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

Implement the new CAN txready method for STM32 

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

4
nuttx/arch/arm/src/lpc17xx/lpc17_can.c
View File

@ -849,7 +849,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
* dev - An instance of the "upper half" can driver state structure.
*
* Returned Value:
* True is the CAN hardware is ready to accept another TX message.
* True if the CAN hardware is ready to accept another TX message.
*
****************************************************************************/
@ -874,7 +874,7 @@ static bool can_txready(FAR struct can_dev_s *dev)
* dev - An instance of the "upper half" can driver state structure.
*
* Returned Value:
* True is there are no pending TX transfers in the CAN hardware.
* True if there are no pending TX transfers in the CAN hardware.
*
****************************************************************************/

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

@ -130,6 +130,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable);
static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg);
static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id);
static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg);
static bool can_txready(FAR struct can_dev_s *dev);
static bool can_txempty(FAR struct can_dev_s *dev);
/* CAN interrupt handling */
@ -156,6 +157,7 @@ static const struct can_ops_s g_canops =
.co_ioctl = can_ioctl,
.co_remoterequest = can_remoterequest,
.co_send = can_send,
.co_txready = can_txready,
.co_txempty = can_txempty,
};
@ -868,6 +870,45 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
return OK;
}
/****************************************************************************
* Name: can_txready
*
* Description:
* Return true if the CAN hardware can accept another TX message.
*
* Input Parameters:
* dev - An instance of the "upper half" can driver state structure.
*
* Returned Value:
* True if the CAN hardware is ready to accept another TX message.
*
****************************************************************************/
static bool can_txready(FAR struct can_dev_s *dev)
{
FAR struct stm32_can_s *priv = dev->cd_priv;
uint32_t regval;
/* Return true if any mailbox is available */
regval = can_getreg(priv, STM32_CAN_TSR_OFFSET);
canllvdbg("CAN%d TSR: %08x\n", priv->port, regval);
if ((regval & CAN_TSR_TME0) != 0)
{
return true;
}
else if ((regval & CAN_TSR_TME1) != 0)
{
return true;
}
else if ((regval & CAN_TSR_TME2) != 0)
{
return true;
}
return false;
}
/****************************************************************************
* Name: can_txempty
*
@ -882,7 +923,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
* dev - An instance of the "upper half" can driver state structure.
*
* Returned Value:
* Zero on success; a negated errno on failure
* True if there are no pending TX transfers in the CAN hardware.
*
****************************************************************************/
@ -1240,7 +1281,7 @@ static int can_cellinit(struct stm32_can_s *priv)
regval &= ~CAN_MCR_INRQ;
can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
/* Wait until initialization mode is acknowledged */
/* Wait until the initialization mode exit is acknowledged */
for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
{

2
nuttx/configs/stm3240g-eval/README.txt
View File

@ -252,7 +252,7 @@ Configuration Options:
CONFIG_STM32_CAN1 - Enable support for CAN1
CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined.
CONFIG_STM32_CAN2 - Enable support for CAN1
CONFIG_STM32_CAN2 - Enable support for CAN2
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
dump of all CAN registers.