RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #1754 from OlegHahm/timex_makefile_order

Browse Source 
make: fix the order of Makefile.dep for timex
This commit is contained in:
Ludwig Ortmann 2014-10-07 05:52:43 -07:00
commit 5be28f49f6
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.dep
View File

@ -47,17 +47,16 @@ ifneq (,$(filter sixlowpan,$(USEMODULE)))
USEMODULE += vtimer
endif
ifneq (,$(filter posix,$(USEMODULE)))
USEMODULE += uart0
USEMODULE += timex
USEMODULE += vtimer
endif
ifneq (,$(filter uart0,$(USEMODULE)))
USEMODULE += lib
USEMODULE += posix
endif
ifneq (,$(filter posix,$(USEMODULE)))
USEMODULE += timex
USEMODULE += vtimer
endif
ifneq (,$(filter cbor,$(USEMODULE)))
USEMODULE += net_help
endif

2
examples/ccn-lite-client/Makefile
View File

@ -33,7 +33,7 @@ BOARD_INSUFFICIENT_RAM := chronos msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1 re
USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += posix
USEMODULE += uart0
USEMODULE += ps
USEMODULE += random
USEMODULE += defaulttransceiver

2
examples/default/Makefile
View File

@ -29,7 +29,7 @@ QUIET ?= 1
# Modules to include:
USEMODULE += posix
USEMODULE += uart0
USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += ps

1
examples/rpl_udp/Makefile
View File

@ -43,6 +43,7 @@ BOARD_BLACKLIST := arduino-mega2560
USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += uart0
USEMODULE += ps
USEMODULE += vtimer
USEMODULE += defaulttransceiver

4
sys/posix/fd.c
View File

@ -21,7 +21,9 @@
#include <string.h>
#include "posix_io.h"
#ifdef MODULE_UART0
#include "board_uart0.h"
#endif
#include "unistd.h"
#include "fd.h"
@ -38,6 +40,7 @@ int fd_init(void)
{
memset(fd_table, 0, sizeof(fd_t) * FD_MAX);
#ifdef MODULE_UART0
posix_open(uart0_handler_pid, 0);
fd_t fd = {
.__active = 1,
@ -49,6 +52,7 @@ int fd_init(void)
memcpy(&fd_table[STDIN_FILENO], &fd, sizeof(fd_t));
memcpy(&fd_table[STDOUT_FILENO], &fd, sizeof(fd_t));
memcpy(&fd_table[STDERR_FILENO], &fd, sizeof(fd_t));
#endif
return FD_MAX;
}

2
tests/shell/Makefile
View File

@ -4,7 +4,7 @@ include ../Makefile.tests_common
USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += ps
USEMODULE += posix
USEMODULE += uart0
DISABLE_MODULE += auto_init

2
tests/struct_tm_utility/Makefile
View File

@ -6,7 +6,7 @@ BOARD_INSUFFICIENT_RAM := stm32f0discovery
DISABLE_MODULE += auto_init
USEMODULE += shell
USEMODULE += posix
USEMODULE += uart0
USEMODULE += timex
# The MSP-430 toolchain lacks sscanf: