cb7842bd16
Added support for encryption and decryption of the packetbuf if macros
...
NETSTACK_ENCRYPT and NETSTACK_DECRYPT are defined. Those are intended
to be called as functions NETSTACK_ENCRYPT() and NETSTACK_DECRYPT() to
encrypt and decrypt the packetbuf, respectively. If needed, an
initialization function by the name NETSTACK_ENCRYPTION_INIT() can
also be defined.
2012-11-25 12:05:00 +01:00
6ee1f72486
Removed old unused TDMA-based MAC and RDC code
2012-11-20 20:48:34 +01:00
ec8c7e9be0
Cleanup of the node-id.h files. The node-id.h file contains
...
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
2012-11-20 19:59:46 +01:00
713c2e5974
DOS EOL and indentation fixes (core/ apps/ cpu/)
...
- Removed some DOS EOLs
- Changed some tabs to spaces
- Removed some trailing whitespaces
Part of Pull Request #6
2012-10-30 13:43:51 +00:00
944537fccf
Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree
2012-10-26 15:54:49 +02:00
076c208b72
avoid gcc optimization bug by extracting struct values
2012-05-30 17:58:45 +02:00
63ea562568
base encounter_time on the time before last strobe, remove unused previous_txtime
2012-03-26 22:49:28 +02:00
7784cf7827
stm32w platforms: use 2 cca and default contikimac guard time
2012-03-20 17:30:05 +01:00
5da4463236
adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La)
2012-03-20 17:29:58 +01:00
e6819effef
Fix compile errors with SDCC
...
Intermingled declarations and code are not yet implemented in sdcc.
2012-03-14 17:52:50 +00:00
07f6e10c1c
Add display options to border router web page, default now uses stack instead of static buffer.
...
Turn radio off until prefix is acquired.
2012-03-02 16:01:12 -05:00
745f071c98
Eliminate unused variable warnings. Dummy test of PT_YIELD_FLAG does not change program size.
2012-02-21 11:23:54 -05:00
24d58edf15
Adjust cycle starts when RTIMER_ARCH_SECOND not a power of two.
2012-01-10 12:48:39 -05:00
65163a9b57
Changed FRAMER to return negative values for error to allow 0 size headers.
2012-01-01 09:10:56 +01:00
d0ebeb409e
Merge remote-tracking branch 'sf/master' into rpl-patch
...
Conflicts:
core/net/tcpip.c
2011-12-08 15:26:11 +01:00
1e57ddb6c7
Disable phase shift correction by default
2011-12-08 14:04:01 +01:00
0a428c9489
style fix; added fas check for cycle_time being a power of two or not.
2011-12-05 16:28:04 +01:00
74aa63de43
Add optional correction for phase drift of receiver.
2011-12-01 10:02:37 -05:00
0e32956a63
Merge remote-tracking branch 'sf/master' into rpl-patch
2011-11-21 14:59:31 +01:00
63e40d195e
Restore packetbuf before mac callback (earlier commit was accidental reverted)
2011-11-15 16:59:12 +01:00
8e47694597
Add RDC_CONF_HARDWARE_CSMA, RDC_CONF_HARDWARE_ACK, RDC_CONF_MCU_SLEEP, CONTIKIMAC_CONF_SHORTEST_PACKET_SIZE for use with hardware having those modes.
...
Default behaviour should be unchanged.
2011-11-14 12:02:47 -05:00
b01cbb996d
Fixed to restore packetbuf before mac callback
2011-10-21 17:52:31 +02:00
8ebd7a65a4
Add missing includes, remove unimplemented function declaration.
2011-10-13 11:23:53 -04:00
a2073db715
Removed ContikiMAC burst dependency to phase optimization
2011-10-04 10:29:40 +02:00
e0ae036a69
added static on the list send functions to get less compiler errors with IAR compiler
2011-10-03 15:17:30 +02:00
222f9bd3af
Include string.h
2011-09-29 15:07:00 +02:00
dd8576830e
Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
...
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
bd951031ef
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:29 +02:00
61ef9b6fc3
Cleanup of the ContikiMAC code; removed the old an unused announcement code
2011-09-02 14:06:27 +02:00
3cb42ceb10
Made the ContikiMAC header configurable from contiki-conf.h
2011-09-02 13:37:46 +02:00
d6508cf3c0
Made the number of phase neighbors configurable
2011-08-31 20:54:21 +02:00
b0907f0344
Cleaning old .h :
...
- Delete unimplemented function and unused structures
- Remove misleading configuration options
- Transfer some comments from 6lowmac to framer-802154
(doc/uip6-doc.txt should be cleaned as well)
2011-07-11 13:20:30 +02:00
28b0479c06
Added optional address filtering
2011-06-15 17:51:57 +02:00
e8a96dc202
Bug fix: update packet attributes in queued packets in CSMA instead of doing a full packetbuf copy after transmissions. The lower layers often add their own headers to packetbuf.
2011-06-15 16:10:07 +02:00
580efaa412
Fix compiler warning for unused variable
2011-05-18 11:22:25 -04:00
4fb433ac1f
'if' statement replaced by a preprocessor directive.
2011-05-12 21:50:47 +02:00
74f1754d88
Bugfix: energy consumption for retransmissions was miscounted
2011-04-13 14:10:39 +02:00
af4ce9ba9e
Bugfix: idle power consumption was sometimes misestimated for transmissions, when a duty cycle rtimer fired in the middle of a transmission
2011-04-13 14:10:02 +02:00
e826ccd3b9
add NULLRDC_CONF_802154_AUTOACK_HW for radios that only pass-up NOACK
...
status but not the actual ack packet.
2011-02-23 15:19:44 -08:00
a8f9119ace
pass up a RADIO_NOACK to the MAC layer.
2011-02-23 15:19:43 -08:00
733aaa546f
Made the number of MAC sequence numbers to remember configurable; fixed bug with power attribution to the idle state.
2011-02-21 14:11:32 +01:00
24af4888bc
Made the number of MAC sequence numbers to remember configurable
2011-02-21 14:11:17 +01:00
5cb49e8b07
Several compiler warning fixes:
...
* msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h;
* sky: fix a couple pointer target signedness warnings;
* core: fix several signed/unsigned comparison warnings;
* framer-802154: "const static" -> "static const" to fix compiler warnings;
* core: comment or remove unused variables and function definitions.
Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
2011-02-20 19:28:14 -05:00
46348d9013
Added the low-power streaming mode where frequent channel checks are performed when streaming is on. Enabling this will (by setting WITH_STREAMING to 1), however, significantly slow down Cooja/MSPsim simulations.
2011-02-08 21:57:46 +01:00
09c223f549
Updated Contiki X-MAC to use hardware acks, which allows for tighter timing and results in a lower duty cycle. Hardware acks also make X-MAC more robust against packet losses, as there is a direct way for the CSMA layer to detect loss of data packets. Before, Contiki X-MAC only detected loss of strobes.
2011-01-25 14:31:09 +00:00
d51e99a3dd
Updated streaming mode to use only about 20% radio. Made guard time more conservative due to problem report by Ricklef Wohlers.
2011-01-25 14:29:46 +00:00
fa524fabd7
Bugfix: q->buf was not tested for NULL, as it should be. Fix by Simon Duquennoy.
2011-01-25 14:24:38 +00:00
808c21fbfa
Bugfix: default should be 3 MAC-level retransmissions if collissions or loss occurs
2011-01-18 16:03:57 +00:00
affba785b5
Enabled phase-lock only for channel check rates of 32 Hz or lower
2011-01-18 16:03:19 +00:00
26e3b6fdc0
Bugfix by Simon Duquennoy: don't transmit packet until previous packet has been sent by the RDC layer.
2011-01-13 19:06:22 +00:00
a0960154ba
Cleaned up parts of the code; added comments
2011-01-09 21:07:01 +00:00
322d835fee
Fix avr-gcc compiler warnings
2010-12-18 22:12:53 +00:00
4a89cc9db3
Rework of the new CSMA in-order code that fixes a number of smalllish bugs in the in-order code.
2010-12-16 22:44:02 +00:00
79f2c25dae
Rework of the phase-lock optimization mechanism. There were several bugs in the existing code, such as the phase-lock would lose synchronization when a packet was lost.
2010-12-16 22:43:07 +00:00
952dfc9384
Rework of the CSMA layer: instead of using one timer per packet, the module now uses one central timer and a queue of outgoing packets. This helps to keep packets in order, which is extremely useful for TCP transfers, and reduces the amount of congestion since consecutive packets now are spaced in time if there is a collision. Based on the observations and ideas of Simon Duquennoy.
2010-12-14 07:57:14 +00:00
af21afa750
Make sure that the cycle timing is exact
2010-12-10 13:36:06 +00:00
c19a967973
Bugfix: with the recent bugfixes, it was no longer possible to turn duty cycling back on after it had been turned off
2010-12-07 23:12:54 +00:00
4c9793f428
Let ContikiMAC remember the state that the radio should have when duty cycling is turned off. This fixes a bug in which the radio was turned on after sending, even when NETSTACK_RDC.off(0) was enabled.
2010-12-06 09:08:22 +00:00
e54d7d6f9c
Fix compiler warnings
2010-12-02 15:55:17 +00:00
6d556d5c13
Fixed bug with link-layer ACKs. Refactored the ACK reception code.
2010-11-25 08:44:34 +00:00
3bd78893e5
Renamed nullrdc to nullrdc-noframer and nullrdc-framer to nullrdc.
...
nullrdc (previously nullrdc-framer) is now a RDC implementation that
does not do any radio duty cycling but supports link layer addresses
and frame format via framer (for example 802.15.4). nullrdc can now be
used in the same way as contikimac, xmac, etc.
nullrdc-noframer (previously nullrdc) is a null RDC implementation
that does not do any radio duty cycling, does not add any header of its
own to the packets, and does not support link layer addresses.
2010-11-23 18:11:00 +00:00
05d78522d3
Added MAC-layer duplicate message suppression when using 802.15.4 auto ack
2010-11-12 12:53:16 +00:00
b7df18a96a
Turned off streaming by default to save code space; made guard time a little more conservative
2010-11-02 11:00:08 +00:00
8fa7bf6c31
Always restore the queuebuf to the packetbuf before calling the upper layers. Reduce the waiting time between successive MAC layer retransmissions.
2010-10-24 21:07:00 +00:00
73f5535754
Made the guard time slightly more conservative - found an occasion where this was needed
2010-10-24 21:06:17 +00:00
9cb830ed37
Timing bugfix in the waiting period between channel samples to check if the coast is clear before sending a packet.
2010-10-20 22:25:24 +00:00
3ffcff0656
Added mechanisms for explicit de-synchronization of synchronized neighbors. Added link-layer ACKs. Fixed bugs with MAC-layer interaction. Now seems to work somewhat (didn't work at all before, in some cases), but there are still problems with packet loss.
2010-10-20 15:23:43 +00:00
e2b4956a7f
Bug fix: release the packet and notify the sender if RDC returned an error
2010-10-14 19:08:39 +00:00
4f3fc1c404
fixed xmac to use new channel check define name
2010-10-03 22:46:53 +00:00
ceebd7020a
Bugfix: the return value sometimes was wrong when a collision was detected.
2010-10-03 20:39:24 +00:00
ae88ed04f1
Moved the definition of the channel check rate used by the radio duty
...
cycling layer. This definition was previously held in net/mac/mac.h,
with the name MAC_CONF_CHANNEL_CHECK_RATE. But since the rate is used
by the radio duty cycling layer, it makes more sense to change its
name to reflect this. Also, the configuration option should be tied to
the netstack configuration instead.
So the new configuration option is called
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE.
2010-10-03 20:37:32 +00:00
eb58968459
Added a timer to each phase structure that keeps track of for how long
...
a particular receiver has not ACKed packets. After some time
(currently 16 seconds), the sender will begin sending full strobe
periods again.
2010-09-13 13:39:05 +00:00
12479c32bc
Fix compiler warnings
2010-08-01 21:18:07 +00:00
21828ad782
Changed the retransmission time to be based on the configured MAC channel check rate when the RDC has no channel check interval.
2010-06-16 10:08:30 +00:00
7647cbd8aa
Use the list_item_next() API
2010-06-15 19:22:25 +00:00
3fa8ffda1a
Moved the modules packetbuf, queuebuf, and packetqueue from net/rime to net/, since they are not Rime-specific
2010-06-14 19:19:16 +00:00
951fd78f6c
ctimer moved from net/rime to sys/
2010-06-14 18:58:45 +00:00
8f8393aadc
Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys
2010-06-14 07:34:36 +00:00
8d1680fed5
Filter duplicate packets
2010-06-14 06:52:41 +00:00
ac9b862cd0
Added configurable support for 802.15.4 autoack
2010-05-26 14:12:33 +00:00
b8a3a4109e
Adjusted the code so as to remove compilation warnings.
2010-04-30 22:18:12 +00:00
0859d4b95f
Avoid turning off the radio in the middle of a packet reception
2010-04-30 07:32:39 +00:00
e606c674c2
Rewrote LPP so that it uses 802.15.4 headers. A number of bugfixes with respect to alignment. Avoid turning off the radio in the middle of packet reception.
2010-04-30 07:31:44 +00:00
3c735fcea4
Added a packetbuf flag that indicates if the link layer acks should be used or not
2010-04-30 07:25:51 +00:00
12b6f35ce7
PRINTF()ed debugging output
2010-04-27 12:56:35 +00:00
85d6f6c514
removed unused variable
2010-04-26 22:41:50 +00:00
b26f45a35b
code cleanup
2010-04-26 17:55:11 +00:00
d761b6e89a
Added MAC header to handle padding
2010-04-26 17:46:21 +00:00
14b1bb9f57
Fixed to only use leds when DEBUG is set
2010-04-20 11:41:16 +00:00
3670fac618
Bugfix: timing fixed
2010-04-08 18:23:24 +00:00
91ff8574ad
Improved handling of duplicate packets
2010-04-08 09:32:56 +00:00
ac4ba199bc
Turn off DEBUG mode by default.
2010-04-06 21:37:54 +00:00
497111bcc9
Added an optional rate limit for broadcast transmissions
2010-04-06 11:57:43 +00:00
e06a30fdb0
Added MAC-layer duplicate message suppression, which is very helpful when running with duty cycling turned off
2010-04-05 19:28:07 +00:00
c68ee6e577
Bugfix: memory from the wrong memb was freed.
2010-04-04 21:02:09 +00:00
a4c328785a
Small timing tweaks
2010-04-04 21:01:24 +00:00
62039a530d
Removed non-existant cooja-debug.h include
2010-04-04 12:31:47 +00:00
7d6ff0289e
Fiddled more with the timing: the phase seems stable now at least. Still bugs left though...
2010-04-04 12:28:29 +00:00
be117afe04
After a lot of tweaking and twiddling with the timing of the ContikiMAC code and the mechanisms in the CC2420 driver, things seem to work somewhat stable now - knock on wood!
2010-04-04 07:49:30 +00:00
121ca946e1
Improved phase lock behaviour when neighbor is not duty cycling: senders notify receivers via the 802.15.4 pending bit that they are not duty cycling. Neighbors then will start sending packets immediately and not wait for neighbors' phase. Tweaking of ContikiMAC timers to make it more reliable.
2010-04-03 13:28:30 +00:00
6ae86d001d
made number of phase neighbors configurable
2010-04-01 17:17:36 +00:00
add426de4b
Bugfixed stream mode: node listens 100% for 0.5 seconds in stream mode. Naming change: is_listening changed is_snooping.
2010-04-01 10:02:04 +00:00
b43f7830b3
Fine-tuned the timing and phase lock optimization
2010-03-31 20:27:15 +00:00
877eb2fbe9
Fiddled with the timing
2010-03-31 11:54:38 +00:00
bcfa80102d
Had previously not included the waiting time that the CC2420 introduces when sending a packet. Also increased the smallest packet size, just to be on the safe side.
2010-03-30 23:01:32 +00:00
226abb8ec3
Removed non-existant include file
2010-03-29 22:10:03 +00:00
9c58768b59
Extend packet size after creating 802.15.4 header; prepare radio chip with packet before waiting for neighbor phase to make phase wait time deterministic
2010-03-29 21:51:36 +00:00
b4b7e942b6
Back off a guard time for every non-ack packet
2010-03-29 21:50:01 +00:00
9508d2c4d7
* Added configurable default number of transmissions for CSMA to use when not specified using packetbuf attributes (CSMA_CONF_MAX_MAC_TRANSMISSIONS).
...
* Renamed packetbuf attribute PACKETBUF_ATTR_MAX_MAC_REXMIT to PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS where value 0 (attribute not set) means that default number of transmissions should be used.
2010-03-26 12:29:29 +00:00
49009e9cbd
Extend the length of announcement packets if they are too short
2010-03-19 13:24:58 +00:00
115b3a7c5c
Minor timing bugfix: the time between channel checks should not include the time required for the channel check itself
2010-03-17 18:24:06 +00:00
efeb9944fa
Increase the required non-activity periods before turning off the radio; remove the strict phase requirement (which messes up things with low-power streaming)
2010-03-17 16:35:52 +00:00
9be1a65211
Don't set the RELIABLE flag on incoming packets with the ack requested flag set, since it is set on most packets even if they aren't reliable
2010-03-16 18:11:58 +00:00
b1feac5a00
Bugfixes in low-power streaming mode, and re-added support for announcements. These now use the low-power streaming mode so that active listening for announcments have a radio duty cycle of 16% rather than 100%
2010-03-16 18:11:13 +00:00
7bab9316da
Two major changes:
...
* Low-power streaming. Experimental support for a low-power mode which
allows rapid exchange of packets with a 16% duty cycle. Does not
seem to function correctly yet though.
* Phase locking. When the phase of a neighbor has been detected, the
sender assumes that the neighbor will keeps it phase and does not
send more strobes than necessary to hit the receiver's channel
check - even if the receiver does not acknowledge the reception of
the strobes when it should have been awake. Instead, the sender
stops strobing and tries again at a later time.
2010-03-14 22:59:23 +00:00
def540e6c0
Avoid newlines in macro expansions as cc65 doesn't support them between the macro name and the open parenthesis of the arguments.
...
There were btw other even longer lines with expansions of the same macro already present.
2010-03-14 12:13:54 +00:00
2cf0fb9cce
Changed to use short address mode with short rime addresses
2010-03-12 14:49:21 +00:00
4b60301727
Don't set the ack flag for broadcast packets
2010-03-09 20:40:11 +00:00
17f6b3a324
Simplified the structure of the code
2010-03-09 20:38:55 +00:00
d0e6436a20
Don't call up the netstack if the transmission was deferred
2010-03-09 20:37:02 +00:00
edda6dd86c
Minor bugfix: don't subtract collisions and deferrals from the number of transmissions
2010-03-09 13:23:58 +00:00
2c3d3e3d73
Bugfix: handle deferred transmissions correctly (don't count them)
2010-03-09 13:20:08 +00:00
79722b4247
Rework of the timing conditions of ContikiMAC: the old timing did not work well on real hardware, the new one seems to work better
2010-03-09 13:19:05 +00:00
96eb20d235
forward arguments even if REXMIT is not set
2010-03-04 14:17:43 +00:00
5e43a6998b
Replaced old framer (framer_get/framer_set) with new NETSTACK style configuration. Added nullrdc-framer that is a nullrdc with framer support.
2010-03-01 13:30:21 +00:00
0c084b8c68
added random init of sequence number
2010-03-01 13:17:01 +00:00
410d860a93
Improved handling of neighbor phase estimation: instead of busy-waiting while waiting for neighbor's phase, the new code schedules a timer just before neighbor wakes up
2010-02-28 20:19:47 +00:00
e6fceb7200
Added MAC-layer return value to indicate that a packet transmission was deferred
2010-02-28 20:18:30 +00:00
e06acc4525
Prod the watchdog if waiting for along time
2010-02-28 14:15:16 +00:00
74da90a06b
Don't count collisions as transmissions
2010-02-28 10:07:17 +00:00
b6b4941871
Made the number of MAC-layer retransmissions configurable on a per-packet basis, via a packet attribute
2010-02-28 08:35:16 +00:00
ed88f487c8
Improved detection of link-layer ACKs; increased the time ContikiMAC waits when it has detected a link-layer ACK; increased the number of silence periods required to detect a CCA false positive
2010-02-28 08:33:21 +00:00
b50d47fb80
added missing function in sicslowmac_driver
2010-02-23 22:45:11 +00:00
1cfcc8a73a
Removed the combined name of CSMA and NETSTACK_RDC. The name of NETSTACK_RDC can be accessed separately if needed.
2010-02-23 20:42:45 +00:00
c20047f657
Changed the network stack to use different structures for the different layers (network_driver, mac_driver, rdc_driver, radio_driver). This helps to avoid incorrect configuration.
2010-02-23 20:09:11 +00:00
bb62749de7
Made debug printfs optional
2010-02-23 18:49:58 +00:00
0ab2ba433f
Bugfix: the wrong callback pointer was passed to higher layers.
2010-02-23 18:49:45 +00:00
ed52586e18
Rework of parts of the ContikiMAC code based on input from experimental results. When channel check is triggered because of a false positive, the new version checks the radio several times to make sure that there really is an incoming packet. Otherwise, the radio is switched off. Cleaned up and removed old unused code. Added a few temporary debugging mechanisms and functions.
2010-02-23 18:49:05 +00:00
0b2b7bcdba
Removed inadvertedly left-over include file
2010-02-18 23:52:34 +00:00
e34eb54960
A work-in-progress rework of the Contiki MAC and radio layers. The
...
main ideas are:
* Separates the Contiki low-layer network stack into four layers:
network (e.g. sicslowpan / rime), Medium Access Control MAC
(e.g. CSMA), Radio Duty Cycling RDC (e.g. ContikiMAC, X-MAC), and
radio (e.g. cc2420).
* Introduces a new way to configure the network stack. Four #defines
that specify what mechanism/protocol/driver to use at the four
layers: NETSTACK_CONF_NETWORK, NETSTACK_CONF_MAC, NETSTACK_CONF_RDC,
NETSTACK_CONF_RADIO.
* Adds a callback mechanism to inform the MAC and network layers about
the fate of a transmitted packet: if the packet was not possible to
transmit, the cause of the failure is reported, and if the packets
was successfully transmitted, the number of tries before it was
finally transmitted is reported.
* NULL-protocols at both the MAC and RDC layers: nullmac and nullrdc,
which can be used when MAC and RDC functionality is not needed.
* Extends the radio API with three new functions that enable more
efficient radio duty cycling protocols: channel check, pending
packet, and receiving packet.
* New initialization mechanism, which takes advantage of the NETSTACK
#defines.
2010-02-18 21:48:39 +00:00
f8c804e28b
ntikiMAC: a new radio duty cycling mechanism that uses a combination
...
of link-layer and MAC-layer mechanisms to achieve a very low power
consumption: during idle listening the radio is switched off between
99.2% and 99.6% of the time. One unicast transmission typically adds
between 0.07% and 1.2% additional radio time, depending on packet
size.
ContikiMAC uses the standard IEEE 802.15.4 message format and adds no
additional headers.
ContikiMAC is simple: it uses periodic two-shot channel sampling
during idle listening to keep the radio on-time down. Transmissions
are done with repeated transmissions until a link-layer ACK is
received.
2010-02-18 21:26:15 +00:00
f5c48751b5
Reworked 802.15.4 header creation and parsing so that it works regardless of the size of the rimeaddr_t typedef
2010-02-18 21:00:28 +00:00
2fbf21b2b3
Refactored the phase optimization functionality into a separate module
2010-02-18 20:58:59 +00:00
75e1c0c8c7
Include contiki-conf.h to let the MAC channel check rate be configurable
2010-02-03 16:45:12 +00:00
06d17c7e1c
Remove unused rtimer code
2010-02-03 16:44:43 +00:00
e419eb3cc5
Retransmit packet if it didn't receive a MAC layer ack
2010-02-03 01:17:54 +00:00
d68af249ec
Added a MAC layer return value that informs the caller that a packet did not receive a MAC layer acknowledgement
2010-02-03 01:17:32 +00:00
181213124b
Added a configuration option for setting the MAC channel check rate (which must be a power of two). The configuration is independent of the MAC protocol.
2010-02-02 23:28:58 +00:00
fcf60e9260
Removed the csma_init declaration in the mac_driver struct since it isn't needed and it breaks sdcc
2010-02-02 20:45:58 +00:00
cc2be0f111
Remove compiler warnings
2010-02-02 16:33:07 +00:00
1a13d25d33
Revised version of the X-MAC implementation that uses a ctimer instead
...
of an rtimer for the periodic radio duty cycling. The benefit of this
implementation is that it leaves an rtimer free for user tasks. The
drawback is a slightly higher idle power consumption. This new version
is based on the current rtimer-based X-MAC.
2010-01-31 18:44:23 +00:00
e4168db633
Bugfix: deallocate queuebuf only if there was no collision
2010-01-31 13:55:36 +00:00
2ae7ed827c
Increase the default X-MAC channel check rate to 4 Hz instead of 2 Hz
2010-01-28 13:40:47 +00:00
8430dab039
Typecast to fix nightly build problem
2010-01-27 07:36:31 +00:00
4f3e8d565c
Added a simple CSMA (Carrier Sense Multiple Access) mechanism that
...
works on top of an underlying duty cycling mechanism. The CSMA layer
retransmits packets that could not be sent because of a collision was
detected.
2010-01-25 11:46:44 +00:00
7ad93e5d18
Added a field to the struct mac interface:
...
channel_check_interval(). This function returns the interval by which
the duty cycling mechanism checks the radio channel for activity. It
is used by higher layer mechanisms to determine suitable timeouts for
retransmissions.
2010-01-25 11:43:32 +00:00
743e93e650
Do not remove encounters - there is no need to, as they are only an optimization
2010-01-14 20:14:03 +00:00
2f105e933a
Variable xmac_is_on was used both in interrupt and non-interrupt contexts and needs to be volatile
2009-12-06 23:29:38 +00:00
53457eb1f0
Fixed compilation warning
2009-12-06 17:10:54 +00:00
8bcc838d8a
Bugfix: don't set the 'we are sending' flag until we are actually sending
2009-12-06 17:05:45 +00:00
6897270289
Bugfix to the Contiki LPP encounter timing code: encounters are now
...
properly timed.
2009-12-06 13:18:32 +00:00
822149f943
Significant improvements to the Contiki X-MAC:
...
* the code is simplified, particularly the duty cycling logic
* old unused code has been removed
* Contiki X-MAC now listens before sending a strobe to avoid MAC-level
collisions
* broadcasts are sent directly, without strobes, reducing the power
consumption of receivers
* turn off radio for 1 ms between sending a strobe and expecting the
strobe ack
2009-12-06 13:16:59 +00:00
cef2e65c9b
Added an error type for signalling a MAC-layer collision
2009-12-05 21:49:51 +00:00
4a1a823a49
Code style fix
2009-12-05 13:29:41 +00:00
a1b4597b95
fixed announcement compilation error
2009-11-27 14:27:50 +00:00
aeefa75304
Fixed alignment problems in announcement packet creation
2009-11-27 12:49:27 +00:00
0034fd7bca
generic return values for sent packet
2009-11-13 10:09:02 +00:00
26bb5ecd21
added radio and MAC generic return values to allow applications finding out whether the packet was transmitted
2009-11-13 08:59:22 +00:00
70fc23ac7e
Enable stream mode by default, remove LED debug mode
2009-11-04 16:02:45 +00:00
5aab2eb77d
A simple addition with significant performance implications:
...
sicslowpan tags TCP packets with the PACKETBUF_ATTR_PACKET_TYPE_STREAM
flag, which makes the underlying power-saving MAC layer keep the radio
on for some time after transmitting the packet. This allows reply
packets to be processed directly, significantly increasing TCP latency
and throughput.
2009-11-02 11:58:56 +00:00
223fa1c8e5
added missing include
2009-10-20 07:42:03 +00:00
7cdfbca973
Alignment problems with announcements fixed
2009-10-19 21:27:02 +00:00
9ec57d61ad
Added MAC layer framing support to X-MAC so that packets now are standard 802.15.4 frames
2009-10-19 20:53:56 +00:00
4de1816e36
Added a new module called "framer" that creates MAC level frames to
...
the packetbuf from packet attributes. Two framer modules are included,
one that creates 802.15.4 frame headers, and one that creates a
minimal "nullmac"-style header that only contains the link-local
addresses.
2009-10-19 18:30:03 +00:00
ae226c5917
* Set sender and receiver packet attributes on incoming packets
...
* Added link layer destination check
2009-10-19 11:25:54 +00:00
10c873018d
Ensure that DEFAULT_PERIOD is != 0, to avoid a modulo with 0
2009-10-19 06:39:29 +00:00
9d26bd663e
A new optimization to X-MAC: senders now keep track of when neighbors
...
last were known to be awake. When sending a packet, a sender does not
start to send strobes until the neighbor is expected to be awake. This
reduces power consumption for senders and decreases the contention in
the network as there are less packets in the air. Additionally, the
ACK optimization was improved so that data/ack exchanges now are
more efficient.
2009-10-18 13:19:25 +00:00
0ad51b8dcc
Moved the link layer destination check to sicslowmac
2009-09-18 16:37:17 +00:00
2181e90f69
Added the possibility to switch lpp off. Fixed sdcc compiler issue
2009-09-09 21:09:23 +00:00
1cafbc6002
sdcc compiler issue fix: compound assignments are not supported, so we use memcpy() instead
2009-09-09 21:08:46 +00:00
4d21a3e203
Don't assume that radio->send turns on the radio automatically.
2009-09-04 10:59:30 +00:00
522f991f14
Set sender and receiver packet attributes on incoming packets: patch by Gidon Ernst
2009-08-20 18:59:17 +00:00
912aba7280
added init function in MAC driver for easier configuration
2009-06-22 11:14:11 +00:00
f39d2bd4c6
Fixed link panid for broadcasts to be standard compliant. Ignore packets addressed to other non-broadcast panids.
2009-05-26 12:08:29 +00:00
fe5a1f1068
Added an optimization option that avoids multiple simultaneous broadcasts from neighbors: when a broadcast is to be sent, a sender does not send until it knows that no other nodes are broadcasting.
2009-05-10 21:09:05 +00:00
0adceb63b4
Code cleanup; made encounter optimization explicit; added optimization for adaptive off-time, but it currently seems to work bad with broadcasts
2009-05-06 15:06:38 +00:00
9fff85757d
Code cleanup; made strobe transmission time longer again (seems to work better in cooja?)
2009-05-06 15:05:28 +00:00
cc44e89415
Reduced default strobe time, which seems to work well. Avoid running the interrupt if the power-save feature is turned off (fixes problems with serial data reception on a gateway mote)
2009-04-29 11:42:13 +00:00
81ef83b856
Added option to wait randomly before sending a packet. A few code cleanups. Avoid switching radio off when sending a packet with end-to-end acks, because an ACK may arrive shortly after the transmission.
2009-04-28 14:00:53 +00:00
84b38de494
removed bitfields for compatibility with cc65
2009-04-09 21:54:09 +00:00
03cd533712
made LISTEN_TIME and OFF_TIME configurable.
2009-04-07 11:29:08 +00:00
5e456aea7d
Added optimization for sending ACKs immediately. Turned optimizations on. Increased listening time to 1/64 s again due to problems with broadcasts with the 1/128 s setting
2009-04-06 22:50:35 +00:00
9f2ff48fda
added 802.15.4 frame packeter
2009-04-06 13:19:03 +00:00
ed1e945e66
Added guard code so that OFF_TIME is never zero
2009-04-03 20:08:05 +00:00
8dbd2b2337
Significant power consumption optimization: LPP now keeps track of encounters with neighbors and uses this information to keep the radio switched off longer.
2009-04-03 19:59:22 +00:00
1d86b01bfb
Made optimizations explicit (and configurable). Added missing initialization of dutycycle protothread. Reduced default listen time and off time.
2009-04-03 11:45:06 +00:00
04101aae36
Fixed alignment problem on the MSP430, where the LPP header may be misaligned
2009-03-31 17:39:54 +00:00
e2cc8b2a3e
send all queued packet once we have the chance.
2009-03-31 14:44:13 +00:00
1d47e2a8da
send immediate probes only if the packet is directed to us.
...
sleep for OFF_TIME if the queue is empty.
restrict double packet lifetime timeouts to unicast packets.
stop ctimer in remove_queued_packet in case the function is not called
via the ctimer callback. it could overwrite a valid packet otherwise.
2009-03-31 14:11:25 +00:00
dd082f7fcf
improvements to lpp based on code from Adam and discussions with Thiemo.
...
* queue multiple packets
* send a strobe back immediately after receiving a data packet
* double the packet lifetime to allow for a missed probe
2009-03-31 12:47:00 +00:00
d8caaca289
listen time and off time parameters configurable from outside because cc1020 needs longer listen time.
2009-03-26 12:50:57 +00:00
ec1677ca6c
Added a function (quick hack) that sets the radio transmission power of outgoing announcement packets in xmac
2009-03-23 21:06:26 +00:00
1cbc0f4ea9
Send announcement packets only if there are any announcements to send
2009-03-23 21:00:25 +00:00
65eb5fd4e8
Renamed the rimebuf module to packetbuf to signal that the module is used outside of a pure Rime context (e.g., the sicslowpan code uses it).
2009-03-12 21:58:20 +00:00
dc7491f810
Bugfix and optimization: X-MAC did not properly switch the radio off after sending a packet, resulting in increased power consumption. For packets that require an ACK, we can let the radio be on in anticipation of the ACK (controlled with an WITH_ACK_OPTIMIZATION option)
2009-03-05 19:37:52 +00:00
d813d343c5
Cleaned up old left-over code
2009-03-01 20:38:57 +00:00
7010eb84b8
Added support for communication power accounting. Energy is attributed to idle listening when the radio is switched off. Enegrgy is attributed to an incoming packet when it is received. Energy is attributed to an outgoing packet when it is transmitted.
2009-03-01 20:37:16 +00:00
e6907a1d8b
Include random.h
2009-02-20 21:22:39 +00:00
aaa8c9d2c9
Construct the X-MAC header on the stack instead of directly in the packet header, because the packet header may be misaligned. A bit of cleanup in the code too.
2009-02-15 22:05:06 +00:00
e4b1ff461e
Added MAC-layer announcement beacons to X-MAC. Configuratble through XMAC_CONF_ANNOUNCEMENTS
2009-02-14 20:35:03 +00:00
585620c102
Reverted the recent change from random_rand() to rand(). It turned out that
...
since libc rand() returns a signed int, there were frequently problems with
timer values wrapping. By reverting to random_rand(), we can provide a
random generator that returns an unsigned and the timer problems are solved.
2009-02-11 11:08:53 +00:00
dd9ffd87c4
Added missing #include announcement.h
2009-02-08 20:14:18 +00:00
085df6b630
Improved version of LPP with support for broadcasts as well as announcement data in the probes
2009-02-08 19:30:18 +00:00
91d280c4c9
Reverted to the old behaviour on broadcasts: send strobes for both unicast and broadcast packets.
2009-02-07 18:45:50 +00:00
e42d572f81
updated for latest mac driver structure
2008-11-12 12:42:41 +00:00
7b238a91af
Don't turn on the radio on after sending a broadcast
2008-09-04 17:44:01 +00:00
c0c26262c4
No need to send strobes for broadcast packets: just send the actual packet instead
2008-07-07 23:25:12 +00:00
05454ce929
Documentation bugfix
2008-07-02 14:10:28 +00:00
1093a8fe28
Added name to mac structure. Do not turn radio on when sending a broadcast packet. Changed default off time to half a second.
2008-06-30 08:10:02 +00:00
247de015b5
added name to mac structure
2008-06-30 08:09:17 +00:00
c9528fb010
Added name, made default listen time shorter
2008-06-30 08:08:59 +00:00
a7dfa95551
Added a 'name' field in the mac structure, which allows boot-up code to print out the name of the currently selected MAC protocol
2008-06-30 08:08:27 +00:00
a5fcfa2787
I seem to remember that we wanted to avoid ignoring gcc warnings that might trigger errors with other compilers ;-)
2008-05-16 21:31:57 +00:00
532692e5a0
Removed reference to non-existant function rimebuf_attr_isset()
2008-05-16 15:04:10 +00:00
8ea461b039
Changed on time to work with the current default tick time on the sky platform
2008-05-15 08:59:48 +00:00
dbab9fbdb5
A quick, initial implementation of the LPP power-saving MAC protocol (Musaloiu-E et al, IPSN 2008)
2008-05-15 08:56:29 +00:00
412facb831
This is an initial commit of an implementation of the Chameleon
...
architecture for the Rime stack for Contiki. The Chameleon
architecture separates the header processing from the Rime protocol
logic. Instead of having each protocol create its own part of the
packet header, protocols use packet attributes. Before sending a
packet, a special Chameleon header processing module creates a packet
header from the packet attributes. The same Chameleon module parses
incoming packets and creates packet attributes from the header.
The details are in our SenSys 2007 paper:
Adam Dunkels, Fredrik Osterlind, Zhitao He. An Adaptive Communication
Architecture for Wireless Sensor Networks. In Proceedings of the Fifth
ACM Conference on Networked Embedded Sensor Systems (SenSys 2007),
Sydney, Australia, November 2007.
http://www.sics.se/~adam/dunkels07adaptive.pdf
This is a rewrite of the code that was developed for the paper.
2008-02-25 02:14:34 +00:00
974870359a
Changed all occurences of u8_t and u16_t to uint8_t and uint16_t
2008-02-24 22:10:30 +00:00
be1dd57cb3
Stopping watchdog before sending packets to allow for wait times longer than 1 second. Reduced default on time to 5 ms. Added option for turning off X-MAC but keeping the radio turned on.
2008-02-24 21:07:28 +00:00
32a3fa5d4a
Added parameter to the mac off() method that specifies whether or not the radio should be turned off when the MAC layer is turned off
2008-02-24 21:05:28 +00:00
bf8b5c093d
Made timetable code optional
2008-01-24 06:17:51 +00:00
8a9b931a4b
Rewrote most of the X-MAC code to make it easier to follow, debug and modify. Also added an optional, experimental time synchronized addition that makes X-MACs on different nodes explicitly de-synchronized
2008-01-23 15:00:54 +00:00
bd125aaac6
Changed the code so that the rtimer is only set from the rtimer (interrupt) code, and not from the non-rtimer code. Removed unused code that was supposed to turn the radio off when a packet for another node was heard (but which didn't really work anyway). Changed default on time to 1/100 seconds, and off time to 1/2 seconds
2008-01-14 09:26:42 +00:00
a9ebc469b8
Avoid usage of POSIX function names even for static functions as some indirectly included system header might declare them.
2007-12-23 14:56:54 +00:00
5c5775e93b
Ensure that receiver_callback is set before calling it
2007-12-16 14:31:43 +00:00
18fd561041
Avoid switching the radio on and off when the MAC layer is turned off. Cleanups.
2007-12-05 13:23:17 +00:00
52a8e8d16b
Fixed to match the Contiki code style
2007-11-26 15:31:32 +00:00
5e7cbff22a
Fixed compiler warnings
2007-11-17 10:12:19 +00:00
1cb3bad088
Multiple bugfixes and updates to xmac code by Niclas
2007-11-12 22:29:37 +00:00
67aa9e8589
Made initialization function return a pointer to the MAC driver structure, to make initialization nicer
2007-10-23 21:27:57 +00:00
f638c628d7
Made initialization function return a pointer to the MAC driver structure, to make initialization nicer
2007-10-23 20:57:37 +00:00
aa99049af0
simple tdma rtimer implemetation
2007-09-18 10:37:17 +00:00
19b3035e36
simple tdma ctimer implementation
2007-09-18 10:36:36 +00:00
25d2514541
xmac ctimer implementation
2007-09-18 10:35:39 +00:00
858e2682e6
platform independent simple slotted tdma mac protocol
...
observe: uses event timers, not real-time timers!
2007-08-31 13:42:22 +00:00
9d4fc0a1a8
Support for z80(sdcc) port.
...
In order to support, some core modules are modified as follows:
core/sys/dsc.h
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
- DSC_HEADER is changed to remove extra semicolon.
core/sys/process.h
- process_data_t is expressed by void* in signatures (known bug on sdcc).
core/sys/autostart.h
- autostart_processes is changed to remove extra semicolon.
core/sys/cc.h
- CC_CONF_ASSIGN_AGGREGATE is introduced.
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/net/hc.c
core/net/uip_arp.c
core/net/uaodv.c
- Aggregation assignments are changed to uip_ipaddr_copy.
core/net/psock.c
core/net/uipbuf.c
core/net/dhcpc.c
apps/shell/shell.c
core/ctk/vnc-server.c
core/ctk/vnc-out.c
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
core/net/uip-over-mesh.c
- An extra semicolon is removed.
apps/dhcp/dhcp-dsc.c
apps/shell/shell-dsc.
apps/ftp/ftp-dsc.c
apps/process-list/process-list-dsc.c
apps/email/email-dsc.c
apps/webserver/webserver-dsc.c
apps/vnc/vnc-dsc.c
apps/vnc/vnc-viewer.h
apps/webbrowser/www-dsc.c
apps/about/about-dsc.c
apps/irc/irc-dsc.c
apps/telnet/telnet-dsc.c
apps/telnetd/telnetd-dsc.c
apps/netconf/netconf-dsc.c
apps/directory/directory-dsc.c
pps/calc/calc-dsc.c
- Modify an extern type to a real declaration, which is static
to prevent a compile error.
core/net/mac/xmac.c
- Variables cannot be defined in a head of block on sdcc.
core/ctk/ctk.h
core/ctk/ctk.c
apps/program-handler/program-handler.c
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
Makefile.include
- Add a set of configuration for an assembler.
- $(CLEAN) variable is introduced for customized cleanup.
apps/process-list/process-list.c
- PROCESSLIST_CONF_HEIGHT is introduced to address smaller screen size.
core/lib/ctk-filedialog.c
- FILES_CONF_HEIGHT is introduced to address smaller screen size.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/vnc/vnc-viewer.c
- A cast is added to prevent a compile error.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/webbrowser/webclient.c
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/loader/elfloader.c
- A cast is added to prevent a compile error.
core/net/rime/rimeaddr.c
- An initialization is added to prevent a compile error.
core/net/rime/rudolph0.c
- NULL is changed to 0, because NULL causes a compile error.
core/net/rime/route-discovery.c
- Add an argument to match the definition of nf_callbacks.
cpu/z80/strcasecmp.h
cpu/z80/strcasecmp.c
cpu/z80/contiki-sdcc-conf.h
cpu/z80/mtarch.c
cpu/z80/mtarch.h
cpu/z80/Makefile.z80
- New files to make compilation availble on sdcc.
- Added support for multithreading.
2007-08-30 14:39:16 +00:00
52eb372890
Modified to use the new MAC layer API
2007-05-25 08:06:44 +00:00
b07cfde31b
Generic API for MAC layers
2007-05-25 06:40:19 +00:00
7904a7e294
Made it compile again.
2007-05-22 22:10:30 +00:00
edd509acf5
Added nicer configuration options. Added hack for optimizing X-MAC for unicast packets. Added statistics gathering. Turn radio off when someone else is receiving a packet. Queueing packets when X-MAC cannot send immediately (since someone else is transmitting).
2007-05-22 20:55:24 +00:00
Adam Dunkels
George Oikonomou
Fredrik Osterlind
simonduq
David Kopf
Joakim Eriksson
Nicolas Tsiftes
Adam Dunkels
Niclas Finne
Vincent Brillault
Salvatore Pitrulli
Mariano Alvira
Lionel Debroux
adamdunkels
dak664
nifi
joxe
nvt-se
fros4943
oliverschmidt
matsutsuka