riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: fix netdev_test test for gnrc_netif2

Browse Source
This commit is contained in:
Martine Lenders 2017-11-13 12:27:58 +01:00
parent be00f5bfb6
commit 7a833f81c5
No known key found for this signature in database
GPG Key ID: 8E97A9FE55F25D62
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/netdev_test/Makefile
View File

@ -9,8 +9,8 @@ FEATURES_REQUIRED += periph_timer # xtimer required for this application
USEMODULE += gnrc USEMODULE += gnrc
USEMODULE += gnrc_neterr USEMODULE += gnrc_neterr
USEMODULE += gnrc_netif USEMODULE += gnrc_netif2
USEMODULE += gnrc_netdev USEMODULE += netdev_eth
USEMODULE += netdev_test USEMODULE += netdev_test
USEMODULE += od USEMODULE += od

12
tests/netdev_test/main.c
View File

@ -22,7 +22,7 @@
#include "msg.h" #include "msg.h"
#include "net/ethernet.h" #include "net/ethernet.h"
#include "net/gnrc.h" #include "net/gnrc.h"
#include "net/gnrc/netdev/eth.h" #include "net/gnrc/netif2/ethernet.h"
#include "net/netdev_test.h" #include "net/netdev_test.h"
#include "od.h" #include "od.h"
#include "thread.h" #include "thread.h"
@ -53,7 +53,6 @@ static const uint8_t _test_dst[] = { 0xf5, 0x19, 0x9a, 0x1d, 0xd8, 0x8f };
static const uint8_t _test_src[] = { 0x41, 0x9b, 0x9f, 0x56, 0x36, 0x46 }; static const uint8_t _test_src[] = { 0x41, 0x9b, 0x9f, 0x56, 0x36, 0x46 };
static char _mac_stack[_MAC_STACKSIZE]; static char _mac_stack[_MAC_STACKSIZE];
static gnrc_netdev_t _gnrc_dev;
static netdev_test_t _dev; static netdev_test_t _dev;
static msg_t _main_msg_queue[_MAIN_MSG_QUEUE_SIZE]; static msg_t _main_msg_queue[_MAIN_MSG_QUEUE_SIZE];
static uint8_t _tmp[_EXP_LENGTH]; static uint8_t _tmp[_EXP_LENGTH];
@ -259,13 +258,8 @@ int main(void)
netdev_test_set_send_cb(&_dev, _dev_send); netdev_test_set_send_cb(&_dev, _dev_send);
netdev_test_set_get_cb(&_dev, NETOPT_ADDRESS, _dev_get_addr); netdev_test_set_get_cb(&_dev, NETOPT_ADDRESS, _dev_get_addr);
netdev_test_set_set_cb(&_dev, NETOPT_ADDRESS, _dev_set_addr); netdev_test_set_set_cb(&_dev, NETOPT_ADDRESS, _dev_set_addr);
gnrc_netdev_eth_init(&_gnrc_dev, (netdev_t *)(&_dev)); _mac_pid = gnrc_netif2_ethernet_create(_mac_stack, _MAC_STACKSIZE, _MAC_PRIO,
_mac_pid = gnrc_netdev_init(_mac_stack, _MAC_STACKSIZE, _MAC_PRIO, "netdev_test", (netdev_t *)&_dev)->pid;
"gnrc_netdev_eth_test", &_gnrc_dev);
if (_mac_pid <= KERNEL_PID_UNDEF) {
puts("Could not start MAC thread\n");
return 1;
}
/* test execution */ /* test execution */
EXECUTE(test_get_addr); EXECUTE(test_get_addr);