Nicolas Tsiftes
4d67a48d3d
Merge pull request #1625 from kkrentz/llsec-fix
...
Fix for "LLSEC802154_CONF_ENABLED undefined"
2016-04-28 12:01:15 +02:00
Antonio Lignan
4251539237
Merge pull request #1579 from bkozak-scanimetrics/fix_csma_backoff
...
Use collisions for csma backoff and retry
2016-04-28 10:24:55 +02:00
Antonio Lignan
a4dfb0b660
Merge pull request #1618 from simonduq/pr/tcpip-code-style
...
Fixes indent in tcpip.c and uip6.c
2016-04-28 00:12:23 +02:00
Antonio Lignan
a70b9bc277
Merge pull request #1447 from alignan/pull/cc1200-sensniff
...
Added sensniff support for the CC1200
2016-04-27 23:59:45 +02:00
Antonio Lignan
6afd56e0ee
Merge pull request #1634 from simonduq/pr/daoack-fix
...
DAO ACK fix
2016-04-27 23:47:07 +02:00
Yasuyuki Tanaka
763c63f428
Handle the case when log->link is NULL in tsch_log_process_pending
2016-04-27 20:35:05 +02:00
Joakim Eriksson
19120788c0
made a text-based version of the MessageList for headless execution
2016-04-27 19:32:14 +02:00
Simon Duquennoy
24449e9cba
Merge pull request #1637 from simonduq/pr/rpl-default-lifetime
...
RPL default lifetime
2016-04-27 18:18:47 +02:00
Simon Duquennoy
ace607a32d
Fix RPL default lifetime
2016-04-27 17:04:29 +02:00
Simon Duquennoy
87e06af5c5
Merge pull request #1620 from simonduq/pr/tsch-remove-log
...
TSCH: remove 'not for us' log
2016-04-27 15:41:24 +02:00
Simon Duquennoy
4392507019
RPL: do not add K flag to no-path DAO as we discard the ACK anyway
2016-04-27 14:20:39 +02:00
Simon Duquennoy
bb5e5d5c6b
TSCH: use RTIMER_CLOCK_DIFF to compute estimated drift, fixing a bug that would occur on 16-bit rtimer platforms
2016-04-27 14:13:33 +02:00
Simon Duquennoy
0379398d7c
RPL DAO ACK: increment DAO seqno before storing it to my_dao_seqno
2016-04-27 14:05:16 +02:00
Simon Duquennoy
f47c0f579d
RPL DAO ACK: improve logging
2016-04-27 14:05:08 +02:00
Frank Freihube
7ba5b0d150
Trailing zeros in file leading to unexpected file length get set in destination buffer
2016-04-27 10:39:05 +02:00
Simon Duquennoy
abf08a7167
Added net-debug.[ch] to provide debug functions even in the non-IP case
2016-04-26 16:08:10 +02:00
Nicolas Tsiftes
37f0931c02
Merge pull request #1613 from nvt/remove-deluge
...
Remove Deluge and associated test files.
2016-04-26 11:40:28 +02:00
Simon Duquennoy
90b886aa71
Csma: comply with IEEE 802.15.4
2016-04-25 08:52:48 -06:00
Billy Kozak
ca0f32f45b
Use collisions for csma backoff and retry
...
The collision count is now used in the calculation fot the CSMA
backoff and transmission will fail after a certain number of
collisisons.
2016-04-25 08:00:56 -06:00
kkrentz
39921f1231
rdc.h: Read LLSEC802154_ENABLED instead of LLSEC802154_CONF_ENABLED
2016-04-25 03:10:42 -07:00
Simon Duquennoy
e1ea4955c7
TSCH: remove 'not for us' log
2016-04-25 11:51:43 +02:00
Simon Duquennoy
f0f13fa58b
Indent uip6.c
2016-04-25 11:50:14 +02:00
Simon Duquennoy
0296e6aba0
Indent tcpip.c
2016-04-25 11:50:14 +02:00
Simon Duquennoy
5b5f07ba52
Merge pull request #1621 from simonduq/pr/fix-travis-output
...
Fix output of RPL tests
2016-04-25 11:40:36 +02:00
Simon Duquennoy
c17e2f7010
Merge pull request #1622 from simonduq/pr/disable-dao-ack
...
Fixing 04-rpl-large-network
2016-04-25 11:40:25 +02:00
Pere Tuset
70d94133ea
Updated OpenMote example and platform.
2016-04-25 01:50:23 +02:00
Simon Duquennoy
03ae4c91fa
Fix output of RPL tests
2016-04-23 08:06:36 +02:00
Simon Duquennoy
753a557903
Travis: use a single random seed rather than two. As a result, a single failed simulation results in overall failure
2016-04-23 07:58:06 +02:00
Simon Duquennoy
f8c4d1155f
Disable RPL DAO ACK by default
2016-04-23 07:54:32 +02:00
Michael LeMay
73774def6b
x86, galileo: Add sample non-driver protection domain
...
This patch adds a simple non-driver protection domain sample to serve
as an example for defining other non-driver protection domains. It
simply performs a ping-pong test of protection domain switching
latency during boot, including optional accesses to a private metadata
region, and prints out the results.
2016-04-22 08:16:43 -07:00
Michael LeMay
e0aefd11d9
x86: Add support for SW-switched segment-based protection domains
...
This patch extends the protection domain framework with a third plugin
that is a hybrid of the previous two. The hardware task switching
mechanism has a strictly-defined format for TSS data structures that
causes more space to be consumed than would otherwise be required.
This patch defines a smaller data structure that is allocated for each
protection domain, only requiring 32 bytes instead of 128 bytes. It
uses the same multi-segment memory layout as the TSS-based plugin and
leaves paging disabled. However, it uses a similar mechanism as the
paging plugin to perform system call dispatches and returns.
For additional information, please refer to cpu/x86/mm/README.md.
2016-04-22 08:16:43 -07:00
Michael LeMay
4cdb7ba9b6
x86: Add TSS-based protection domain support
...
This patch extends the protection domain framework with an additional
plugin to use Task-State Segment (TSS) structures to offload much of
the work of switching protection domains to the CPU. This can save
space compared to paging, since paging requires two 4KiB page tables
and one 32-byte page table plus one whole-system TSS and an additional
32-byte data structure for each protection domain, whereas the
approach implemented by this patch just requires a 128-byte data
structure for each protection domain. Only a small number of
protection domains will typically be used, so
n * 128 < 8328 + (n * 32).
For additional information, please refer to cpu/x86/mm/README.md.
GCC 6 is introducing named address spaces for the FS and GS segments
[1]. LLVM Clang also provides address spaces for the FS and GS
segments [2]. This patch also adds support to the multi-segment X86
memory management subsystem for using these features instead of inline
assembly blocks, which enables type checking to detect some address
space mismatches.
[1] https://gcc.gnu.org/onlinedocs/gcc/Named-Address-Spaces.html
[2] http://llvm.org/releases/3.3/tools/clang/docs/LanguageExtensions.html#target-specific-extensions
2016-04-22 08:16:39 -07:00
Joakim Eriksson
186138f6af
added error check for extraction of aligned llao
2016-04-22 15:03:03 +02:00
Nicolas Tsiftes
6ae1b4ab66
Merge pull request #1463 from MichaelKlemm/FixUsingAtmega128RFA1
...
Fixed using target AVR ATmega128RFA1
2016-04-21 14:30:35 +02:00
Nicolas Tsiftes
fb5f0f66dd
Removed Deluge and associated test files.
2016-04-21 13:24:16 +02:00
Nicolas Tsiftes
417c76e965
Merge pull request #1611 from nvt/coffee-update-comments
...
Coffee: improve comments and code formatting
2016-04-21 12:14:43 +02:00
Nicolas Tsiftes
86733e8702
Clarified and cleaned up Coffee's documentation and the debug statements. Formatted some source code for easier reading.
2016-04-20 14:34:17 +02:00
Nicolas Tsiftes
7586195b79
Merge pull request #1608 from nvt/coffee-remove-protected-mem
...
Remove protected memory from Coffee
2016-04-20 13:36:28 +02:00
Nicolas Tsiftes
be13fc7d23
Merge pull request #1605 from tonnenpinguin/pr_fix_slip_config
...
Add typecast to native border router switch statement
2016-04-20 12:51:43 +02:00
Nicolas Tsiftes
7f700c9564
Remove the protected memory code associated with sensornet checkpointing because this functionality has been removed from Contiki.
2016-04-20 12:47:37 +02:00
Nicolas Tsiftes
204dcb9bbc
Merge pull request #1332 from tsparber/collect-view-add-osx
...
collect-view gui: Add support for OS X serialdump and motelist
2016-04-20 11:57:12 +02:00
Bernhard Hackl
2ad3d85d41
Fix slip config switch statement
2016-04-20 08:14:08 +00:00
Pere Tuset
d9f4d97a41
Adapted OpenMote-CC2538 sensor drivers to Contiki sensor API.
2016-04-19 22:41:40 +02:00
Simon Duquennoy
d828557563
Merge pull request #1425 from kkrentz/llsec-fixes
...
random LLSEC fixes
2016-04-19 17:29:00 +02:00
Simon Duquennoy
de51dd5c30
Merge pull request #1598 from mguc/jn516x_llsecinit_ccm-star
...
JN516x NETSTACK_LLSEC.init and ccm-star fix
2016-04-19 17:27:15 +02:00
Simon Duquennoy
ba72f0a131
Merge pull request #1422 from kkrentz/packetbuf-cleanup
...
packetbuf cleanup
2016-04-19 17:23:47 +02:00
Joakim Eriksson
e9e31e9fd1
replaced add/remove ds6-nbr with an nbr-module controlled update of lladdress to avoid loss of other state information
2016-04-19 13:41:13 +02:00
Joakim Eriksson
2e852f758b
added a null check on the lladdr before the memcmp.
2016-04-19 13:36:43 +02:00
Joakim Eriksson
223f002676
fixed the case when the lladdr did not change but the LLAO is there and it is not an override.
2016-04-19 13:36:43 +02:00
Joakim Eriksson
6f271bf853
fixed so that the comparison of old lladdr and llao lladdr is compared instead of two llaos - and improved code style on surrounding code
2016-04-19 13:36:43 +02:00