sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32 CAN: More fixes for compilation errors due to blind leverage of STM32L4 CAN filter IOCTLs to STM32

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-27 15:15:41 -06:00
parent e5f623e1d2
commit 8e26d4c8e0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/src/stm32/stm32_can.c
View File

@ -127,10 +127,12 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
/* Filtering (todo) */ /* Filtering (todo) */
#ifdef CONFIG_CAN_EXTID
static int stm32can_addextfilter(FAR struct stm32_can_s *priv, static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
FAR struct canioc_extfilter_s *arg); FAR struct canioc_extfilter_s *arg);
static int stm32can_delextfilter(FAR struct stm32_can_s *priv, static int stm32can_delextfilter(FAR struct stm32_can_s *priv,
int arg); int arg);
#endif
static int stm32can_addstdfilter(FAR struct stm32_can_s *priv, static int stm32can_addstdfilter(FAR struct stm32_can_s *priv,
FAR struct canioc_stdfilter_s *arg); FAR struct canioc_stdfilter_s *arg);
static int stm32can_delstdfilter(FAR struct stm32_can_s *priv, static int stm32can_delstdfilter(FAR struct stm32_can_s *priv,
@ -1987,11 +1989,13 @@ static int stm32can_filterinit(FAR struct stm32_can_s *priv)
* *
****************************************************************************/ ****************************************************************************/
static int stm32can_addextfilter(FAR struct stm32_can_s *priv, #ifdef CONFIG_CAN_EXTID
FAR struct canioc_extfilter_s *arg) static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
FAR struct canioc_extfilter_s *arg)
{ {
return -ENOTTY; return -ENOTTY;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: stm32can_delextfilter * Name: stm32can_delextfilter
@ -2011,13 +2015,15 @@ static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_CAN_EXTID
static int stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg) static int stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
{ {
return -ENOTTY; return -ENOTTY;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: stm32can_addextfilter * Name: stm32can_addstdfilter
* *
* Description: * Description:
* Add a filter for standard CAN IDs * Add a filter for standard CAN IDs
@ -2033,8 +2039,8 @@ static int stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
* *
****************************************************************************/ ****************************************************************************/
static int stm32can_addstdfilter(FAR struct stm32_can_s *priv, static int stm32can_addstdfilter(FAR struct stm32_can_s *priv,
FAR struct canioc_stdfilter_s *arg) FAR struct canioc_stdfilter_s *arg)
{ {
return -ENOTTY; return -ENOTTY;
} }