From a4f602b01d5912b7c00b55edbf4f667c3dc7cf4a Mon Sep 17 00:00:00 2001 From: Wouter Symons Date: Fri, 7 Feb 2020 10:54:17 +0100 Subject: [PATCH 1/4] tests/conn_can: remove feature requirements from Makefile --- tests/conn_can/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/conn_can/Makefile b/tests/conn_can/Makefile index 04b1181d2eb5..01b6cae2026f 100644 --- a/tests/conn_can/Makefile +++ b/tests/conn_can/Makefile @@ -10,9 +10,6 @@ USEMODULE += conn_can_isotp_multi USEMODULE += can_pm USEMODULE += can_trx -FEATURES_REQUIRED += periph_can -FEATURES_REQUIRED += periph_gpio_irq - CFLAGS += -DGNRC_PKTBUF_SIZE=4096 CFLAGS += -DCAN_PKT_BUF_SIZE=64 CFLAGS += -DCAN_ROUTER_MAX_FILTER=32 From e823099fc17c64c42ef01daca2be4378f3861261 Mon Sep 17 00:00:00 2001 From: Wouter Symons Date: Fri, 7 Feb 2020 10:54:30 +0100 Subject: [PATCH 2/4] tests/conn_can: add boards to BOARD_INSUFFICIENT_MEMORY --- tests/conn_can/Makefile.ci | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/conn_can/Makefile.ci b/tests/conn_can/Makefile.ci index 3457a1f06dfb..a4e4b8bf0071 100644 --- a/tests/conn_can/Makefile.ci +++ b/tests/conn_can/Makefile.ci @@ -1,16 +1,21 @@ BOARD_INSUFFICIENT_MEMORY := \ + airfy-beacon \ arduino-duemilanove \ arduino-leonardo \ arduino-mega2560 \ arduino-nano \ arduino-uno \ atmega328p \ + calliope-mini \ chronos \ hifive1 \ hifive1b \ i-nucleo-lrwan1 \ + microbit \ msb-430 \ msb-430h \ + nrf51dongle \ + nrf6310 \ nucleo-f030r8 \ nucleo-f031k6 \ nucleo-f042k6 \ @@ -25,10 +30,12 @@ BOARD_INSUFFICIENT_MEMORY := \ saml10-xpro \ saml11-xpro \ stm32f0discovery \ + stm32f030f4-demo \ stm32l0538-disco \ telosb \ waspmote-pro \ wsn430-v1_3b \ wsn430-v1_4 \ + yunjia-nrf51822 \ z1 \ # From ae947d5c81d10d842d372545499f7244f8d6f43b Mon Sep 17 00:00:00 2001 From: Wouter Symons Date: Fri, 7 Feb 2020 10:51:34 +0100 Subject: [PATCH 3/4] sys/can/conn: Fixup unused code --- sys/can/conn/isotp.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/can/conn/isotp.c b/sys/can/conn/isotp.c index c719731909f6..119d99ebed6f 100644 --- a/sys/can/conn/isotp.c +++ b/sys/can/conn/isotp.c @@ -69,15 +69,6 @@ static inline void get_msg(conn_can_isotp_t *conn, msg_t *msg) #endif } -static inline int try_get_msg(conn_can_isotp_t *conn, msg_t *msg) -{ -#ifdef MODULE_CONN_CAN_ISOTP_MULTI - return mbox_try_get(&conn->master->mbox, msg); -#else - return mbox_try_get(&conn->mbox, msg); -#endif -} - int conn_can_isotp_create(conn_can_isotp_t *conn, struct isotp_options *options, int ifnum) { assert(conn != NULL); @@ -366,7 +357,7 @@ int conn_can_isotp_close(conn_can_isotp_t *conn) } } #else - while (try_get_msg(conn, &msg)) { + while (mbox_try_get(&conn->mbox, &msg)) { if (msg.type == CAN_MSG_RX_INDICATION) { DEBUG("conn_can_isotp_close: freeing %p\n", msg.content.ptr); isotp_free_rx(msg.content.ptr); From 7f4ce0b63d8a2efc9c6f177cc14bea07e4bfc473 Mon Sep 17 00:00:00 2001 From: Wouter Symons Date: Fri, 7 Feb 2020 13:44:38 +0100 Subject: [PATCH 4/4] test/conn_can: blacklist arch_msp430 --- tests/conn_can/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/conn_can/Makefile b/tests/conn_can/Makefile index 01b6cae2026f..cd3b4ef94516 100644 --- a/tests/conn_can/Makefile +++ b/tests/conn_can/Makefile @@ -1,5 +1,7 @@ include ../Makefile.tests_common +FEATURES_BLACKLIST += arch_msp430 + USEMODULE += shell USEMODULE += shell_commands USEMODULE += ps