forked from RIOT-OS/RIOT
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge with Riot Master #1
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sys/include: include stdint in uart_stdio.h
netdev2_test: initial import
pkg: add jsmn minimal JSON parser
drivers: ethos: fix compile errors
core: thread_flags: optimize thread_flags_wait_one, fix doxygen
lwIP: Initial import
core: make messaging optional
microcoap_server: make app fully work with Copper
drivers: ethos: misc fixes
uart0 functionality is removed by #3164. This patch implements periph/uart, rather than deprecated uart0, using /dev/tty. To use with netdev2_tap simultaneously, this patch adds asynchronus read system and modifies netdev2_tap to use it. A TTY device is specified on command line with -c (COM) option, since -t was used by the old implementation. This patch also implements empty GPIO driver needed by the xbee driver.
On OS X, `netdev2_tap` suspends monitoring file descriptor until `_recv` is called. If no spaces in left in pktbuf, `gnrc_netdev2_eth` does not call `_recv` that results in deadlock. With this commit, `gnrc_netdev2_eth` calls `_recv` with NULL buffer and non-zero length parameter, that indicates the driver to drop frame and resume working.
sys/newlib: Fix function definitions to match newlib prototypes
gnrc_sixlowpan: enable NHC by default
SAMD21/GPIO driver: Add missing interrupts
Rationale: the netdev2_tap Ethernet driver for native requires to temporarily store at least a maximum sized Ethernet frame.
The workaround for the pktbuf size is not longer needed, since native itself assures a big enough buffer. Using a neighbor cache size of 1 is mandatory for all platforms when compiling pedantically.
…gnage gnrc_sixlowpan_iphc: fix comparison signage
This is a temporary quick-fix for #5122 to not have GUAs removed on an interface. It solves the issue by both not letting the registration run out on the router and by not letting the lifetime of an auto-configured address expire.
cpu/samd21: fix ISR mapping for PB27
gnrc_ipv6: Revert #5179
gnrc_ndp: don't let addresses timeout
netdev ethernet: deal with too small packet buffer
…ning cpu/cc2538/spi: Fix compiler warning of possible uninitialized variable
tools: ethos: allow `start_network.sh` script to run from anywhere
core: allow DEBUG in mutex.c to run without DEVELHELP
…ation gnrc_netdev: add deprecation note
at86rf2xx: fix option setting
add encryption to drivers fix new line at the end of file add shell command for enable encryption and set encryption key on a given device modify _net_if_set_encrypt_key to support any key length modify _net_if_set_encrypt_key to support any key length of the key modify blank line fix ace before tab in indent fix ace before tab indent fix ace before tab indent an error fix trailing white space drivers/xbee: encryption support add encryption to drivers fix new line at the end of file add shell command for enable encryption and set encryption key on a given device modify _net_if_set_encrypt_key to support any key length modify _net_if_set_encrypt_key to support any key length of the key modify blank line fix ace before tab in indent fix ace before tab indent fix ace before tab indent an error fix trailing white space modify drivers/xbee/xbee.c fix white spaces on xbee.c Update xbee encryption driver white line at end xbee.h fix error fix sc_netif.c fix rebase master interactive drivers/xbee: encryption support add encryption to drivers fix new line at the end of file add shell command for enable encryption and set encryption key on a given device modify _net_if_set_encrypt_key to support any key length modify _net_if_set_encrypt_key to support any key length of the key modify blank line fix ace before tab in indent fix ace before tab indent fix ace before tab indent an error fix trailing white space drivers/xbee: encryption support add encryption to drivers fix new line at the end of file add shell command for enable encryption and set encryption key on a given device modify _net_if_set_encrypt_key to support any key length modify _net_if_set_encrypt_key to support any key length of the key modify blank line fix ace before tab in indent fix ace before tab indent fix ace before tab indent an error fix trailing white space modify drivers/xbee/xbee.c fix white spaces on xbee.c Update xbee encryption driver white line at end xbee.h fix error fix rebase conflict 4 fix same missing in patches changes fix ascii to hex index parser fix syntax rules fix syntax issue 2 add _netopt_strmap NETOPT_ENCRYPTION e NETOPT_ENCRYPTION_KEY fix trailng white spaces
boards/mulle: mulle boards' serial port is derived from its serial nr
If we use `rm -r(f)` then we should make sure that we don't delete random directory trees because there was a whitespace in the path.
make: bail out if there are spaces in the path
drivers/xbee: add optional AES encryption support
make: disable NHC
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge with Riot Master