Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests/conn_can: fix build error on native #13270

Merged
merged 4 commits into from
Feb 24, 2020
Merged

tests/conn_can: fix build error on native #13270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4f602b
tests/conn_can: remove feature requirements from Makefile
wosym Feb 7, 2020
e823099
tests/conn_can: add boards to BOARD_INSUFFICIENT_MEMORY
wosym Feb 7, 2020
ae947d5
sys/can/conn: Fixup unused code
wosym Feb 7, 2020
7f4ce0b
test/conn_can: blacklist arch_msp430
wosym Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions sys/can/conn/isotp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
benpicco marked this conversation as resolved.
Show resolved Hide resolved

int conn_can_isotp_create(conn_can_isotp_t *conn, struct isotp_options *options, int ifnum)
{
assert(conn != NULL);
Expand Down Expand Up @@ -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)) {
wosym marked this conversation as resolved.
Show resolved Hide resolved
if (msg.type == CAN_MSG_RX_INDICATION) {
DEBUG("conn_can_isotp_close: freeing %p\n", msg.content.ptr);
isotp_free_rx(msg.content.ptr);
Expand Down
5 changes: 2 additions & 3 deletions tests/conn_can/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
include ../Makefile.tests_common

FEATURES_BLACKLIST += arch_msp430

USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += ps
Expand All @@ -10,9 +12,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
Expand Down
7 changes: 7 additions & 0 deletions tests/conn_can/Makefile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
#