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

151 Commits

Author SHA1 Message Date
Zakaria Kasmi
c7351493b5 full abstracted i2c driver for LPC2387 2013-08-07 16:54:10 +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
Oleg Hahm
5a4211598c Merge branch 'master' of github.com:RIOT-OS/RIOT 2013-06-07 17:24:04 +02:00
Oleg Hahm
59de680e26 * function to check for enabled interrupts on ARM 2013-06-07 17:21:11 +02:00
Milan Babel
df13d9e0fc Merge branch 'master' of github.com:overflowed/RIOT
Conflicts:
	drivers/cc110x_ng/Makefile
2013-06-06 08:41:30 +02:00
Milan Babel
edb34b73c0 fixes for the wsn430
fixed vtimer for the msp430
added spi module for the wsn430 v1.3b
changed some variables to uintXX_t, fixes overflow on msp430
2013-06-06 08:35:17 +02:00
Ludwig Ortmann
49228c8353 fix signal handler, ringbuffer for native FreeBSD 2013-06-03 13:23:57 +02:00
Ludwig Ortmann
4f0e4dec90 fix ucontext.h include for OSX, FreeBSD 2013-06-03 13:10:42 +02:00
Martin
d0ea87524c fixed missing include 2013-06-01 08:28:47 -07:00
Ludwig Ortmann
42f897fc4a use NSIG macro from signal.h for number of signals 2013-05-21 10:53:59 +02:00
Ludwig Ortmann
8f377cd9f5 Merge remote-tracking branch 'upstream/master' 2013-05-17 11:10:48 +02:00
Oleg Hahm
f1044c5ccd Merge branch 'master' of github.com:RIOT-OS/RIOT 2013-05-16 17:12:01 +02:00
Oleg Hahm
cdad71d6e3 * fixed a bug in sbrk() by changing the counter variable from local to global 2013-05-16 17:10:14 +02:00
Ludwig Ortmann
35f9062e37 inital OSX support for native port 2013-05-15 17:45:43 +02:00
Oliver Hahm
2c6b406d2d * renamed msp430_common module name 2013-05-15 15:54:21 +02:00
Ludwig Ortmann
7bf9fa0314 increase MINIMUM_STACK_SIZE to allow for DEBUG 2013-05-15 10:46:09 +02:00
Ludwig Ortmann
b36ddd7fd7 Merge remote-tracking branch 'upstream/master' 2013-05-15 10:18:08 +02:00
Ludwig Ortmann
c6553f6492 interrupt handling rewrite
(including uart0 integration, rt-extension removal)
2013-05-14 18:31:47 +02:00
Thomas Eichinger
ee6d1e1604 implemented hwtimer_arch_(enable|disable)_interrupt() and added ITC definitions 2013-04-25 14:56:32 +02:00
Thomas Eichinger
cc49d42f99 added implementations for hwtimer_arch_unset() and hwtimer_arch_now() 2013-04-25 13:38:55 +02:00