From bc2cf8affdacea22f7fd9f337a7cba94a9507954 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 18 Aug 2015 13:25:30 -0600 Subject: [PATCH] apps/examples/can: Remove can_devinit(). Replace with boardctl(BOARDIOC_CAN_INITIAILIZE,0) --- examples/can/Kconfig | 2 ++ examples/can/can.h | 11 ----------- examples/can/can_main.c | 5 +++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/examples/can/Kconfig b/examples/can/Kconfig index dfef83c53..b0afb0dad 100644 --- a/examples/can/Kconfig +++ b/examples/can/Kconfig @@ -6,6 +6,8 @@ config EXAMPLES_CAN bool "CAN example" default n + depends on CAN && LIB_BOARDCTL + select BOARDCTL_CANINIT ---help--- Enable the CAN example diff --git a/examples/can/can.h b/examples/can/can.h index 794a84b33..b3d14a3d3 100644 --- a/examples/can/can.h +++ b/examples/can/can.h @@ -97,15 +97,4 @@ * Public Function Prototypes ****************************************************************************/ -/**************************************************************************** - * Name: can_devinit() - * - * Description: - * Perform architecuture-specific initialization of the CAN hardware. This - * interface must be provided by all configurations using apps/examples/can - * - ****************************************************************************/ - -int can_devinit(void); - #endif /* __APPS_EXAMPLES_CAN_CAN_H */ diff --git a/examples/can/can_main.c b/examples/can/can_main.c index efe6d3a42..b25269d5c 100644 --- a/examples/can/can_main.c +++ b/examples/can/can_main.c @@ -41,6 +41,7 @@ #include #include +#include #include #include @@ -276,10 +277,10 @@ int can_main(int argc, char *argv[]) * this test. */ - ret = can_devinit(); + ret = boardctl(BOARDIOC_CAN_INITIALIZE, 0); if (ret != OK) { - printf("ERROR: can_devinit failed: %d\n", ret); + printf("ERROR: BOARDIOC_CAN_INITIALIZE failed: %d\n", ret); errval = 1; goto errout; }