deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9933 commits 6 branches 13 tags 80 MiB
Commit graph

9933 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoît Thébaudeau 42c287f363 cc2538: lpm: Fix build for LPM_CONF_ENABLE == 0 
lpm.c needs to #include lpm.h in order to get the definition of
lpm_periph_permit_pm1_func_t, which made the replacement macros conflict with
the function definitions for the LPM_CONF_ENABLE == 0 case. This change fixes
this issue by #if-ing out the code in lpm.c in that case. Also, the replacement
macro for lpm_register_peripheral() was missing in that case, which is fixed
here.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-01-28 20:21:06 +01:00
Oliver Schmidt e10d462931 Merge pull request #545 from ADVANSEE/cc2538-lib-link 
cc2538: Fix library linkage
 2014-01-28 06:37:49 -08:00
Benoît Thébaudeau a562acb160 cc2538: Fix library linkage 
If a project needs to use some libraries at link stage, then the corresponding
linker options (e.g. '-lm') have to be passed after any .o file depending on
these libraries. Hence, LDFLAGS cannot be used to add such options when invoking
$(LD) in Makefile.cc2538, or it should be moved to the correct location.
Instead, this change adds TARGET_LIBFILES to the correct location, like most
other Contiki targets.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
 2014-01-28 14:32:30 +01:00
Mariano Alvira 4738a4b340 Merge pull request #540 from hexluthor/rl78-fixes2 
More fixes for the RL78 / EVAL-ADF7xxxMB4Z platform
 2014-01-27 08:06:46 -08:00
Fredrik Österlind f6c6ef9b54 Merge pull request #532 from darki2002/Plugin_sim 
Stopped to load plugins depending on simulations if there is no simulation
 2014-01-27 07:31:19 -08:00
Fredrik Österlind a369611fe7 Merge pull request #544 from drakkar-lig/cooja-compile-error 
Cooja compile error
 2014-01-27 07:14:14 -08:00
Martin Heusse 9eabbe02ad Adds encoding attribute utf-8 arg to cooja compile command 2014-01-27 15:14:34 +01:00
Ian Martin f3cc607101 eval-adf7xxxmb4z: Use the nullrdc driver instead of sicslowmac. 2014-01-26 17:40:31 -05:00
Adam Dunkels b6c4f50bea Merge pull request #538 from cskiraly/collect-fixes 
collect: making some protocol parameters configurable by COLLECT_CONF_
 2014-01-26 14:23:08 -08:00
Adam Dunkels 4f498e2eac Updated the include paths to point to the new places 2014-01-26 23:20:47 +01:00
Adam Dunkels 2ec176891f Added the necessary modules to make the eval-adf7xxxmb4z port compile 2014-01-26 23:20:47 +01:00
Adam Dunkels 824d2047da Add the explicit list of modules, since we cannot do auto-dependency management of them 2014-01-26 23:20:47 +01:00
Adam Dunkels 24155ee0ae Moved the custom strncasecmp code into a separate module, since it cannot be compiled on all platforms 2014-01-26 23:20:46 +01:00
Adam Dunkels b244f30480 Moved the ctk files from core/lib into core/lib/ and core/lib/libconio 2014-01-26 23:20:46 +01:00
Adam Dunkels bddd96d5c8 Removed all module makefiles. Instead, all .c files in a module directory are compiled. 2014-01-26 23:20:46 +01:00
Adam Dunkels fce84c178c Removed unused rime-udp code 2014-01-26 23:20:45 +01:00
Adam Dunkels 8eace27f9b Moved net/rime.h to net/rime/rime.h 2014-01-26 23:20:45 +01:00
Adam Dunkels b36fba76bd Updated with the new modularized uip paths 2014-01-26 23:20:44 +01:00
Adam Dunkels a40a73db9a Made a module out of the core/ctk code 2014-01-26 23:20:44 +01:00
Adam Dunkels dc2f415a70 Removed the PLATFORMAPPS definition - this is now handled by the modules mechanism 2014-01-26 23:20:44 +01:00
Adam Dunkels 4df80276dc Removed old definitions of source files - thiis is now handled by the modules mechanism 2014-01-26 23:20:43 +01:00
Adam Dunkels 84d552445e Don't include core/net/mac in the default modules 2014-01-26 23:20:43 +01:00
Adam Dunkels 89e07a97a2 Need to explicitly include the sicslowmac module and the fakeuip.c file. 2014-01-26 23:20:42 +01:00
Adam Dunkels 1be10f026a Handle the CONTIKI_NO_NET case so that the ravenusbstick example builds 2014-01-26 23:20:42 +01:00
Adam Dunkels 6594873753 Updated the path to uip-debug.h 2014-01-26 23:20:41 +01:00
Adam Dunkels 4c2bd9f120 A set of default modules for the cc253x platform 2014-01-26 23:20:41 +01:00
Adam Dunkels dee654cfe5 Put the cc253x custom makerules in its own customrules file 2014-01-26 23:20:41 +01:00
Adam Dunkels 7846eb2e2f Split the cc2430 custom rules into its own file 2014-01-26 23:20:40 +01:00
Adam Dunkels 36a5aadc9e Moved the 6502 custom rules into its own Makefile.customrules-6502 file 2014-01-26 23:20:40 +01:00
Fredrik Osterlind cf32063c0b introduced optional Makefile.customrules-$(TARGET), to contain custom platform make rules 2014-01-26 23:20:39 +01:00
Adam Dunkels 112e0d6855 Removed reliance on the core/net/ipv4 module 2014-01-26 23:20:37 +01:00
Adam Dunkels 7a740b382f Moved the individual MODULE definitions from the top-level Makefile.include into the individual platforms' Makefiles 2014-01-26 23:20:36 +01:00
Adam Dunkels 0fe08205e1 Moved the rimeaddr.[ch] code from the core/net/rime module to the core/net module, as it is used not only by rime code 2014-01-26 23:20:36 +01:00
Adam Dunkels b02104e4c4 Add the sht11 device driver module to the z1 platform 2014-01-26 23:20:36 +01:00
Adam Dunkels aaf0f83120 Add cxmac module to the sky platform 2014-01-26 23:20:35 +01:00
Adam Dunkels 9851ff85dd Add a sensible set of modules for the sensinode platform 2014-01-26 23:20:35 +01:00
Adam Dunkels b40f1210e6 Don't use the sicslowmac code, use nullrdc instead 2014-01-26 23:20:34 +01:00
Adam Dunkels e556ecbc25 Don't use the sicslowmac code, use nullrdc instead 2014-01-26 23:20:34 +01:00
Adam Dunkels d7013524f9 Add a sensible set of modules for the micaz platform 2014-01-26 23:20:34 +01:00
Adam Dunkels ee5299fe6e Add a sensible set of modules for the exp5438 platform 2014-01-26 23:20:33 +01:00
Adam Dunkels 51efdd952a Define MODULES for the avr-raven and the avr-ravenusb platforms 2014-01-26 23:20:33 +01:00
Adam Dunkels 460da08a37 Filter out multiple definitions of the same module 2014-01-26 23:20:33 +01:00
Adam Dunkels 13f8837422 Made core/lib into a module 2014-01-26 23:20:32 +01:00
Adam Dunkels 34d46fa533 Include driver modules 2014-01-26 23:20:32 +01:00
Adam Dunkels 25367fb08c Moved the ds2411 driver into a dev/ds2411 module 2014-01-26 23:20:31 +01:00
Adam Dunkels c9efe3c3c4 Moved the cc2520 driver into its own dev/cc2520 module 2014-01-26 23:20:31 +01:00
Adam Dunkels 837a697dc8 Include the top-level Contiki directory in the include file search path to make it possible for modules to include their header files via their module path 2014-01-26 23:20:31 +01:00
Adam Dunkels 4cfe6c4a5e Moved the sht11 driver to its own module 2014-01-26 23:20:30 +01:00
Adam Dunkels 8bb4860138 core/net/rpl is a module, so don't include its file in the top-level Makefile.include 2014-01-26 23:20:30 +01:00
Adam Dunkels 0a7733c1ab IPv6 module should also include the core/net/rpl module 2014-01-26 23:20:30 +01:00