RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #15407 from leandrolanzieri/pr/native/periph/remove_unused_can

Browse Source 
cpu/native: remove unused can_linux module
This commit is contained in:
Alexandre Abadie 2020-11-13 11:27:15 +01:00 committed by GitHub
commit d91a135b69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/native/Makefile.dep
View File

@ -8,7 +8,6 @@ endif
ifneq (,$(filter periph_can,$(FEATURES_USED))) ifneq (,$(filter periph_can,$(FEATURES_USED)))
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
USEMODULE += can_linux
CFLAGS += -DCAN_DLL_NUMOF=2 CFLAGS += -DCAN_DLL_NUMOF=2
endif endif
endif endif

3
cpu/native/Makefile
View File

@ -26,9 +26,6 @@ ifneq (,$(filter mtd_native,$(USEMODULE)))
DIRS += mtd DIRS += mtd
endif endif
ifneq (,$(filter can_linux,$(USEMODULE)))
DIRS += can
endif
ifneq (,$(filter backtrace,$(USEMODULE))) ifneq (,$(filter backtrace,$(USEMODULE)))
DIRS += backtrace DIRS += backtrace
endif endif

2
cpu/native/Makefile.include
View File

@ -5,7 +5,7 @@ ifeq ($(BUILDOSXNATIVE),1)
NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
endif endif
ifneq (,$(filter can_linux,$(USEMODULE))) ifneq (,$(filter periph_can,$(USEMODULE)))
LINKFLAGS += -lsocketcan LINKFLAGS += -lsocketcan
endif endif

3
cpu/native/can/Makefile
View File

@ -1,3 +0,0 @@
MODULE = can_linux
include $(RIOTBASE)/Makefile.base

3
cpu/native/periph/can.c
View File

@ -20,7 +20,8 @@
*/ */
#if !defined(__linux__) #if !defined(__linux__)
#error "MODULE can_linux is only available on Linux" #error "Usage of periph_can on RIOT native requires libsocketcan. Currently \
this is only available on Linux"
#else #else
#include <string.h> #include <string.h>

10
cpu/native/startup.c
View File

@ -75,7 +75,7 @@ netdev_tap_params_t netdev_tap_params[NETDEV_TAP_MAX];
#include "board.h" #include "board.h"
#include "mtd_native.h" #include "mtd_native.h"
#endif #endif
#ifdef MODULE_CAN_LINUX #ifdef MODULE_PERIPH_CAN
#include "candev_linux.h" #include "candev_linux.h"
#endif #endif
#ifdef MODULE_PERIPH_SPIDEV_LINUX #ifdef MODULE_PERIPH_SPIDEV_LINUX
@ -101,7 +101,7 @@ static const char short_opts[] = ":hi:s:deEoc:"
#ifdef MODULE_MTD_NATIVE #ifdef MODULE_MTD_NATIVE
"m:" "m:"
#endif #endif
#ifdef MODULE_CAN_LINUX #ifdef MODULE_PERIPH_CAN
"n:" "n:"
#endif #endif
#ifdef MODULE_SOCKET_ZEP #ifdef MODULE_SOCKET_ZEP
@ -127,7 +127,7 @@ static const struct option long_opts[] = {
#ifdef MODULE_MTD_NATIVE #ifdef MODULE_MTD_NATIVE
{ "mtd", required_argument, NULL, 'm' }, { "mtd", required_argument, NULL, 'm' },
#endif #endif
#ifdef MODULE_CAN_LINUX #ifdef MODULE_PERIPH_CAN
{ "can", required_argument, NULL, 'n' }, { "can", required_argument, NULL, 'n' },
#endif #endif
#ifdef MODULE_SOCKET_ZEP #ifdef MODULE_SOCKET_ZEP
@ -327,7 +327,7 @@ void usage_exit(int status)
" -m <mtd>, --mtd=<mtd>\n" " -m <mtd>, --mtd=<mtd>\n"
" specify the file name of mtd emulated device\n"); " specify the file name of mtd emulated device\n");
#endif #endif
#if defined(MODULE_CAN_LINUX) #if defined(MODULE_PERIPH_CAN)
real_printf( real_printf(
" -n <ifnum>:<ifname>, --can <ifnum>:<ifname>\n" " -n <ifnum>:<ifname>, --can <ifnum>:<ifname>\n"
" specify CAN interface <ifname> to use for CAN device #<ifnum>\n" " specify CAN interface <ifname> to use for CAN device #<ifnum>\n"
@ -504,7 +504,7 @@ __attribute__((constructor)) static void startup(int argc, char **argv, char **e
((mtd_native_dev_t *)mtd0)->fname = strndup(optarg, PATH_MAX - 1); ((mtd_native_dev_t *)mtd0)->fname = strndup(optarg, PATH_MAX - 1);
break; break;
#endif #endif
#if defined(MODULE_CAN_LINUX) #if defined(MODULE_PERIPH_CAN)
case 'n':{ case 'n':{
int i; int i;
i = atol(optarg); i = atol(optarg);