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

drivers: encx24j600: switch to xtimer

Browse Source
This commit is contained in:
Kaspar Schleiser 2015-08-14 00:46:42 +02:00
parent 80e038045d
commit 21dfa698bc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.dep
View File

@ -335,8 +335,7 @@ ifneq (,$(filter hih6130,$(USEMODULE)))
endif endif
ifneq (,$(filter encx24j600,$(USEMODULE))) ifneq (,$(filter encx24j600,$(USEMODULE)))
USEMODULE += timex USEMODULE += xtimer
USEMODULE += vtimer
endif endif
ifneq (,$(filter srf02,$(USEMODULE))) ifneq (,$(filter srf02,$(USEMODULE)))

8
drivers/encx24j600/encx24j600.c
View File

@ -26,7 +26,7 @@
#include "encx24j600.h" #include "encx24j600.h"
#include "encx24j600_internal.h" #include "encx24j600_internal.h"
#include "encx24j600_defines.h" #include "encx24j600_defines.h"
#include "vtimer.h" #include "xtimer.h"
#include "net/netdev2.h" #include "net/netdev2.h"
#include "net/eui64.h" #include "net/eui64.h"
@ -264,9 +264,9 @@ static int _init(netdev2_t *encdev)
/* initialization procedure as described in data sheet (39935c.pdf) */ /* initialization procedure as described in data sheet (39935c.pdf) */
do { do {
do { do {
vtimer_usleep(ENCX24J600_INIT_DELAY); xtimer_usleep(ENCX24J600_INIT_DELAY);
reg_set(dev, EUDAST, 0x1234); reg_set(dev, EUDAST, 0x1234);
vtimer_usleep(ENCX24J600_INIT_DELAY); xtimer_usleep(ENCX24J600_INIT_DELAY);
} while (reg_get(dev, EUDAST) != 0x1234); } while (reg_get(dev, EUDAST) != 0x1234);
while (!(reg_get(dev, ESTAT) & CLKRDY)); while (!(reg_get(dev, ESTAT) & CLKRDY));
@ -275,7 +275,7 @@ static int _init(netdev2_t *encdev)
cmd(dev, SETETHRST); cmd(dev, SETETHRST);
/* make sure initialization finalizes */ /* make sure initialization finalizes */
vtimer_usleep(1000); xtimer_usleep(1000);
} while (!(reg_get(dev, EUDAST) == 0x0000)); } while (!(reg_get(dev, EUDAST) == 0x0000));
/* configure flow control */ /* configure flow control */