STM32 CAN fixes need to be backported to STM32L4 as well

This commit is contained in:
Gregory Nutt 2016-06-27 15:18:45 -06:00
parent 8e26d4c8e0
commit d4408264ec

View File

@ -130,10 +130,12 @@ static void stm32l4can_dumpfiltregs(FAR struct stm32l4_can_s *priv,
/* Filtering (todo) */
#ifdef CONFIG_CAN_EXTID
static int stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
FAR struct canioc_extfilter_s *arg);
static int stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
int arg);
#endif
static int stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
FAR struct canioc_stdfilter_s *arg);
static int stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
@ -1928,11 +1930,13 @@ static int stm32l4can_filterinit(FAR struct stm32l4_can_s *priv)
*
****************************************************************************/
static int stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
FAR struct canioc_extfilter_s *arg)
#ifdef CONFIG_CAN_EXTID
static int stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
FAR struct canioc_extfilter_s *arg)
{
return -ENOTTY;
}
#endif
/****************************************************************************
* Name: stm32l4can_delextfilter
@ -1952,13 +1956,15 @@ static int stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
*
****************************************************************************/
static int stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv, int arg)
#ifdef CONFIG_CAN_EXTID
static int stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv, int arg)
{
return -ENOTTY;
}
#endif
/****************************************************************************
* Name: stm32l4can_addextfilter
* Name: stm32l4can_addstdfilter
*
* Description:
* Add a filter for standard CAN IDs
@ -1974,8 +1980,8 @@ static int stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv, int arg)
*
****************************************************************************/
static int stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
FAR struct canioc_stdfilter_s *arg)
static int stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
FAR struct canioc_stdfilter_s *arg)
{
return -ENOTTY;
}
@ -1998,7 +2004,7 @@ static int stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
*
****************************************************************************/
static int stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg)
static int stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg)
{
return -ENOTTY;
}