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

857 Commits

Author SHA1 Message Date
Oleg Hahm
fa83bb4fd1 sed parameters for additional style checks 2013-07-30 11:08:28 +02:00
Oleg Hahm
22c668529d Merge branch 'oleg-master' into mymaster
Conflicts:
	cpu/Makefile.include
	cpu/arm_common/arm_cpu.c
2013-07-29 01:36:24 +02:00
Oleg Hahm
f7ecc704a4 fixed includes and include pathes 2013-07-29 01:24:02 +02:00
Oleg Hahm
a2dff456f7 rebased from origin/master 2013-07-29 01:22:03 +02:00
Oleg Hahm
6d48859269 Merge branch 'master' of github.com:OlegHahm/RIOT 2013-07-29 01:11:42 +02:00
Oleg Hahm
0bd81f14a4 remove header guard from debug.h and repaired debugging on a per file base 2013-07-25 21:56:37 +02:00
Oleg Hahm
3adb6fa217 removed senseless include of debug.h in a header 2013-07-25 21:56:09 +02:00
Oleg Hahm
ca53d9231d disabled DEBUG in auto_init 2013-07-25 21:55:49 +02:00
Oleg Hahm
6297516371 restructured and fixed arm architecutre files 2013-07-24 23:53:38 +02:00
Oleg Hahm
f12d5628eb fixed transceiver for mc1322x 2013-07-24 23:53:23 +02:00
Oleg Hahm
19e4034ace Merge branch 'thomas-mc1322x'
Conflicts:
	Makefile.modules
	core/kernel_init.c
	core/thread.c
	cpu/arm_common/arm_cpu.c
	cpu/arm_common/syscalls.c
	cpu/lpc_common/hwtimer_cpu.c
	cpu/lpc_common/iap.c
	sys/include/transceiver.h
	sys/net/sixlowpan/sixlowip.c
	sys/net/sixlowpan/sixlowmac.c
	sys/net/sixlowpan/sixlowmac.h
	sys/net/sixlowpan/sixlowpan.c
	sys/transceiver/Makefile
	sys/transceiver/transceiver.c
2013-07-24 23:22:11 +02:00
Oleg Hahm
cce8f46e49 experimental sixlowpan fixes to eliminate multiple definitions 2013-07-24 22:23:21 +02:00
Oleg Hahm
e9cee715a1 Use basic CFLAGS for ARM bootloader code 2013-07-24 22:22:34 +02:00
Oleg Hahm
42001d8ddb dummy lpm_set implementation 2013-07-24 22:22:08 +02:00
Oleg Hahm
319f48c137 Revert "* added testfile"
This reverts commit 0432a3eaf2.
2013-07-24 15:58:04 +02:00
Oleg Hahm
d3477fd747 Merge branch 'master' of github.com:OlegHahm/RIOT 2013-07-24 15:54:42 +02:00
Oliver Hahm
0432a3eaf2 * added testfile 2013-07-24 15:54:03 +02:00
Thomas Eichinger
4bc89bd458 added fixes for compilation for mc1322x 2013-07-24 15:50:16 +02:00
Oleg Hahm
4665207b6f Merge pull request #75 from benpicco/external_modules
Allow external modules to be added to a RIOT project
2013-07-24 01:32:08 -07:00
Oleg Hahm
0ff8973ae7 Merge pull request #76 from benpicco/posix_compat
add typedefs to socket.h to improve POSIX compatibility
2013-07-24 01:31:40 -07:00
Benjamin Valentin
18ef96422f add typedefs to socket.h to improve POSIX compliance 2013-07-24 02:52:24 +02:00
Oleg Hahm
ca75d3c36c fixed some includes 2013-07-24 00:44:28 +02:00
Oleg Hahm
599e266b55 Revert "removed redefined ENABLE_DEBUG"
This reverts commit 69c526f44d.

Instead of removing ENABLE_DEBUG, define it as zero and replacing the
ifdef preprocessor commands by a simple #if
2013-07-24 00:38:43 +02:00
Oleg Hahm
615ddb1eaa some buffer adjustments 2013-07-24 00:02:44 +02:00
Oleg Hahm
222d34d8a5 added missing include to cc110x_ng 2013-07-24 00:00:03 +02:00
Benjamin Valentin
248267834d allow external modules to be added to a project 2013-07-23 18:50:26 +02:00
Thomas Eichinger
585f4f3698 embedded mc1322x radio API into transceiver.{c,h} 2013-07-23 15:27:12 +02:00
Oleg Hahm
33423cdadb redefining default stack sizes dependent on the use of printf 2013-07-23 13:42:58 +02:00
Oleg Hahm
37467de0d2 fixed printf formatter 2013-07-23 13:39:50 +02:00
Thomas Eichinger
92adb3e401 * added proper "struct TMR_struct*" in hwtimer_cpu.c
* removed dublicate definition of the UART structure in mc1322x.h
2013-07-23 10:36:16 +02:00
LudwigOrtmann
4d84098b23 Merge pull request #70 from LudwigOrtmann/issue_58
fix #58, fix comments, printf/puts to DEBUG
2013-07-17 11:56:07 -07:00
LudwigOrtmann
9246461c82 Merge pull request #71 from mehlis/master
rename kernel_intern.h
2013-07-17 11:55:29 -07:00
Christian Mehlis
837bad38eb rename kernel_intern.h
german "intern" to english "internal"
2013-07-16 16:36:37 +02:00
LudwigOrtmann
f1474e4d59 Merge pull request #67 from mehlis/master
Fixups: build with debug enabled
2013-07-16 07:16:27 -07:00
Christian Mehlis
b8176f4488 fixed printf patterns 2013-07-16 15:27:19 +02:00
Christian Mehlis
c5e62e238b add missing include 2013-07-16 15:27:19 +02:00
Christian Mehlis
6652ecc87a remove static flag, it's not static 2013-07-16 15:27:19 +02:00
Christian Mehlis
69c526f44d removed redefined ENABLE_DEBUG 2013-07-16 15:27:19 +02:00
Ludwig Ortmann
b29dcc7e89 remove superfluous, commented out puts 2013-07-16 13:50:41 +02:00
Ludwig Ortmann
5c93ff4f65 change puts/printf to DEBUG 2013-07-16 13:50:11 +02:00
Ludwig Ortmann
71ca139be4 translate/fix comments 2013-07-16 13:41:23 +02:00
LudwigOrtmann
c5295357dd Merge pull request #69 from LudwigOrtmann/fix_python_shebang
fix python shebang
2013-07-15 14:57:57 -07:00
Ludwig Ortmann
5efa2eea8a fix python shebang 2013-07-15 21:17:09 +02:00
LudwigOrtmann
74d755f271 Merge pull request #68 from LudwigOrtmann/master
use proper native board include
2013-07-15 12:14:11 -07:00
Ludwig Ortmann
33dde8aba8 use proper native board include 2013-07-15 20:52:53 +02:00
LudwigOrtmann
603036208b Merge pull request #65 from mehlis/master
Add msg_try_receive
2013-07-15 10:58:26 -07:00
Christian Mehlis
190e24116d use int explicitly 2013-07-09 13:41:08 +02:00
Christian Mehlis
96cbf4019e make internal function static 2013-07-09 13:40:52 +02:00
Ludwig Ortmann
7dd9ac6be0 Add msg_try_receive 2013-07-05 23:32:07 +02:00
Oleg Hahm
c989d2147e collected all ICMP type definitions in one header 2013-07-05 09:38:38 +02:00