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

169 Commits

Author SHA1 Message Date
Oleg Hahm
c3dcaa05a7 Merge pull request #146 from LudwigOrtmann/nativenet_osx_hack
Preliminary OSX support hack
2013-08-15 10:46:13 -07:00
Oleg Hahm
2d4de90a9c added missing header guards 2013-08-15 19:39:29 +02:00
Ludwig Ortmann
1bed4e459a Preliminary OSX support hack 2013-08-15 17:04:03 +02:00
Ludwig Ortmann
708ece68cc cc1100 -> nativenet 2013-08-15 14:05:26 +02:00
Ludwig Ortmann
a634709c00 native cc1100x_ng network
not properly passing received data to transceiver atm
2013-08-15 14:05:26 +02:00
Oleg Hahm
38ae187b61 added prototype for msp430_cpu_init() 2013-08-15 10:31:54 +02:00
authmillenon
e2c201f2e0 Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns
Conflicts:
	sys/net/destiny/in.h
	sys/net/destiny/socket.h
	sys/net/destiny/tcp.h
	sys/net/destiny/tcp_hc.c
	sys/net/destiny/tcp_hc.h
	sys/net/destiny/tcp_timer.c
	sys/net/destiny/udp.c
	sys/net/destiny/udp.h
2013-08-15 10:30:02 +02:00
authmillenon
a3b754b662 Remove carriage returns
Git for windows handles those by itself
2013-08-15 10:17:15 +02:00
Oleg Hahm
ec1d7b9bdf Merge pull request #139 from OlegHahm/default_stacksize
Default stacksize
2013-08-14 15:21:48 -07:00
Oleg Hahm
3ad55cce8b changed default stacksize
* the default stacksize no longer set for a thread using printf
* the stacksize for the main thread therefore adds the necessary space
2013-08-14 18:04:25 +02:00
Ludwig Ortmann
f3bbede59b fix printfs in hwtimer_cpu.c 2013-08-14 17:16:50 +02:00
Oleg Hahm
366d25ae38 Merge pull request #112 from OlegHahm/msb430_uart0
Changes according to the pull requests from dc5e7d7e1f introducnig uart for MSB430 and changing the name of the terminal variable.
2013-08-13 08:57:59 -07:00
Oleg Hahm
88b8ccf3e8 Merge pull request #108 from OlegHahm/unmaintained_libs
removed unmaintained code
2013-08-13 00:44:25 -07:00
Oleg Hahm
540515bd98 removed unmaintained tracelog library 2013-08-12 22:38:18 +02:00
Oleg Hahm
5bf958ce20 removed unmaintained syslog library 2013-08-12 22:38:18 +02:00
Oleg Hahm
31646237b1 removed unmaintained code for LPC214x MCU 2013-08-12 22:37:59 +02:00
Oleg Hahm
6239ea2a0b minor changes according to 7a2cc4ae09 2013-08-09 15:57:34 +02:00
Martin
63146190b3 fix changed prototype parameter 1 of thread_stack_init from void* to void(*)(void) 2013-08-09 12:19:03 +02:00
Oleg Hahm
39a4dc684e fixes for #62: eliminate unused parameter warnings
NOTE: this commit introduces a kernel API change for mutex_unlock
2013-08-04 04:10:33 +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
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
3adb6fa217 removed senseless include of debug.h in a header 2013-07-25 21:56:09 +02:00
Oleg Hahm
6297516371 restructured and fixed arm architecutre files 2013-07-24 23:53:38 +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
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
Thomas Eichinger
4bc89bd458 added fixes for compilation for mc1322x 2013-07-24 15:50:16 +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
222d34d8a5 added missing include to cc110x_ng 2013-07-24 00:00:03 +02:00
Oleg Hahm
33423cdadb redefining default stack sizes dependent on the use of printf 2013-07-23 13:42:58 +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
Christian Mehlis
837bad38eb rename kernel_intern.h
german "intern" to english "internal"
2013-07-16 16:36:37 +02:00
Christian Mehlis
b8176f4488 fixed printf patterns 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
33dde8aba8 use proper native board include 2013-07-15 20:52:53 +02:00
Oliver Hahm
57cc002c67 Merge branch 'wsn430'
Conflicts:
	core/include/queue.h
	core/queue.c
	cpu/msp430-common/hwtimer_cpu.c
	cpu/msp430x16x/hwtimer_msp430.c
	sys/lib/hashtable.c
	sys/net/ieee802154/ieee802154_frame.c
	sys/shell/commands/sc_cc110x_ng.c
	sys/transceiver/transceiver.c
	sys/vtimer/vtimer.c
2013-06-25 15:33:40 +02:00
Oliver Hahm
c8bee9e554 fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
Oliver Hahm
5d70656343 fixed coding conventions (mostly by astyle) 2013-06-21 03:52:57 +02:00
Oliver Hahm
b571286574 * fixed typo 2013-06-18 17:26:53 +02:00
Oliver Hahm
ac10da4509 Merge branch 'fixes-06-14' of git://github.com/mehlis/RIOT into mehlis-fixes-06-14 2013-06-18 17:25:44 +02:00
Oliver Hahm
0d6d8390c0 * updated copyright and license headers in various files 2013-06-18 17:21:38 +02:00
Martin
d32b785816 fix inserted explicit typecasting to ucontext_t* at assignment 2013-06-14 20:21:22 +02:00
Martin
0dd314afbb fix multiple definition of TRANSCEIVER_STACK_SIZE for using with native cpu 2013-06-14 20:21:22 +02:00
Oliver Hahm
fdd1d21e8d Merge branch 'master' into wsn430 2013-06-14 19:41:23 +02:00
Christian Mehlis
57e70a659c Remove undefined variables from Makefiles
The following variables are included in various Makefiles but never
defined.

    $(BOARDINCLUDE)
    $(PROJECTINCLUDE)
    $(CPUINCLUDE)
2013-06-13 21:41:24 +02:00
Ludwig Ortmann
cad585e9dd remove context switch in native lpm_sleep
quick fix for now
2013-06-13 18:14:21 +02:00
Oliver Hahm
b8f674f5b6 fix context switch in lpm_sleep 2013-06-12 16:18:32 +02:00
Oleg Hahm
545c786375 Merge branch 'master' of git://github.com/overflowed/RIOT into overflowed-master 2013-06-07 17:28:46 +02:00