From 95634a3b3433f669e510b32c37d2ae8d818a39c7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 17 Aug 2015 10:53:49 -0600 Subject: [PATCH] CAN IOCTLs: Should support standard CAN filtering in extended ID mode --- arch | 2 +- include/nuttx/can.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch b/arch index a7a7a7c6dd..b86c14f379 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit a7a7a7c6dd4f36f690139bc457064e6b24d009eb +Subproject commit b86c14f379e704186664ddfaff5fd26c7fe89711 diff --git a/include/nuttx/can.h b/include/nuttx/can.h index 3235b9de54..68945c5e1e 100644 --- a/include/nuttx/can.h +++ b/include/nuttx/can.h @@ -378,7 +378,8 @@ struct canioc_extfilter_s uint8_t xf_type; /* See CAN_FILTER_* definitions */ uint8_t xf_prio; /* See CAN_MSGPRIO_* definitions */ }; -#else +#endif + struct canioc_stdfilter_s { uint16_t sf_id1; /* 11-bit ID. For dual match or for the @@ -388,7 +389,6 @@ struct canioc_stdfilter_s uint8_t sf_type; /* See CAN_FILTER_* definitions */ uint8_t sf_prio; /* See CAN_MSGPRIO_* definitions */ }; -#endif /************************************************************************************ * Public Data