deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Browse source
This commit is contained in:
Joakim Eriksson 2011-04-06 20:15:44 +02:00
commit f603c965c1
49 changed files with 109 additions and 6105 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cpu/arm/at91sam7s/Makefile.at91sam7s
View file

@ -168,7 +168,8 @@ else
endif
empty-symbols.c:
@${CONTIKI}/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
upload_ocd_%: %.bin

3
cpu/arm/stm32f103/Makefile.stm32f103
View file

@ -153,7 +153,8 @@ else
endif
empty-symbols.c:
@${CONTIKI}/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h

9
cpu/avr/Makefile.avr
View file

@ -146,7 +146,8 @@ endif
# Add a namelist to the kernel
%.out: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
$(CONTIKI)/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBC) symbols.c
ifdef SYMBOLS
$(CONTIKI)/tools/avr-make-symbols $@
@ -176,7 +177,8 @@ endif
# $(STRIP) --strip-unneeded -g -x $@
%.co: %.c
$(CONTIKI)/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
$(CC) $(CFLAGS) -DAUTOSTART_ENABLE -c $< -o $@
%-stripped.o: %.o
@ -193,4 +195,5 @@ endif
avrdude ${AVRDUDE_OPTIONS} -P ${AVRDUDE_PORT} -c ${AVRDUDE_PROGRAMMER} -p ${MCU} -U flash:w:$<
symbols.c:
@${CONTIKI}/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h

3
cpu/mc1322x/Makefile.mc1322x
View file

@ -108,7 +108,8 @@ CUSTOM_RULE_C_TO_CO=yes
$(OBJCOPY) -O binary $< $@
symbols.c:
@${CONTIKI}/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
%.$(TARGET): %_$(TARGET).bin
@

8
cpu/mc1322x/src/default_lowlevel.c
View file

@ -51,6 +51,14 @@ void uart1_init(uint16_t inc, uint16_t mod, uint8_t samp) {
*UART1_UCON = 0;
*UART1_UBRCNT = ( inc << 16 ) | mod;
/* TX and CTS as outputs */
GPIO->PAD_DIR_SET.GPIO_14 = 1;
GPIO->PAD_DIR_SET.GPIO_16 = 1;
/* RX and RTS as inputs */
GPIO->PAD_DIR_RESET.GPIO_15 = 1;
GPIO->PAD_DIR_RESET.GPIO_17 = 1;
/* see Section 11.5.1.2 Alternate Modes */
/* you must enable the peripheral first BEFORE setting the function in GPIO_FUNC_SEL */
/* From the datasheet: "The peripheral function will control operation of the pad IF */

4
cpu/msp430/Makefile.msp430
View file

@ -132,9 +132,9 @@ loader-init.o: ${CONTIKI_TARGET}/loader/loader-init.S
.PHONY: symbols.c symbols.h
ifdef CORE
symbols.c:
# @${CONTIKI}/tools/msp430-make-symbols $(CORE)
$(NM) $(CORE) | awk -f $(CONTIKI)/tools/mknmlist > symbols.c
else
symbols.c symbols.h:
@${CONTIKI}/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
endif

4
cpu/native/Makefile.native
View file

@ -25,10 +25,10 @@ ifdef CORE
.PHONY: symbols.c symbols.h
symbols.c symbols.h:
$(NM) -C $(CORE) | grep -v @ | grep -v dll_crt0 | awk -f $(CONTIKI)/tools/mknmlist > symbols.c
# @${CONTIKI}/tools/make-symbols $(CORE)
else
symbols.c symbols.h:
@${CONTIKI}/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
endif
contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}

38
cpu/native/mtarch.c
View file

@ -33,14 +33,14 @@
* $Id: mtarch.c,v 1.2 2007/04/03 18:37:15 oliverschmidt Exp $
*/
#ifdef __CYGWIN__
#if defined(_WIN32) || defined(__CYGWIN__)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
static void *main_fiber;
#else /* __CYGWIN__ */
#else /* _WIN32 || __CYGWIN__ */
#include <stdlib.h>
#include <signal.h>
@ -54,7 +54,7 @@ struct mtarch_t {
static ucontext_t main_context;
static ucontext_t *running_context;
#endif /* __CYGWIN__ */
#endif /* _WIN32 || __CYGWIN__ */
#include "mtarch.h"
@ -62,21 +62,21 @@ static ucontext_t *running_context;
void
mtarch_init(void)
{
#ifdef __CYGWIN__
#if defined(_WIN32) || defined(__CYGWIN__)
main_fiber = ConvertThreadToFiber(NULL);
#endif /* __CYGWIN__ */
#endif /* _WIN32 || __CYGWIN__ */
}
/*--------------------------------------------------------------------------*/
void
mtarch_remove(void)
{
#ifdef __CYGWIN__
#if defined(_WIN32) || defined(__CYGWIN__)
ConvertFiberToThread();
#endif /* __CYGWIN__ */
#endif /* _WIN32 || __CYGWIN__ */
}
/*--------------------------------------------------------------------------*/
void
@ -84,11 +84,11 @@ mtarch_start(struct mtarch_thread *thread,
void (* function)(void *data),
void *data)
{
#ifdef __CYGWIN__
#if defined(_WIN32) || defined(__CYGWIN__)
thread->mt_thread = CreateFiber(0, (LPFIBER_START_ROUTINE)function, data);
#else /* __CYGWIN__ */
#else /* _WIN32 || __CYGWIN__ */
thread->mt_thread = malloc(sizeof(struct mtarch_t));
@ -118,51 +118,51 @@ mtarch_start(struct mtarch_thread *thread,
makecontext(&((struct mtarch_t *)thread->mt_thread)->context,
(void (*)(void))function, 1, data);
#endif /* __CYGWIN__ */
#endif /* _WIN32 || __CYGWIN__ */
}
/*--------------------------------------------------------------------------*/
void
mtarch_yield(void)
{
#ifdef __CYGWIN__
#if defined(_WIN32) || defined(__CYGWIN__)
SwitchToFiber(main_fiber);
#else /* __CYGWIN__ */
#else /* _WIN32 || __CYGWIN__ */
swapcontext(running_context, &main_context);
#endif /* __CYGWIN__ */
#endif /* _WIN32 || __CYGWIN__ */
}
/*--------------------------------------------------------------------------*/
void
mtarch_exec(struct mtarch_thread *thread)
{
#ifdef __CYGWIN__
#if defined(_WIN32) || defined(__CYGWIN__)
SwitchToFiber(thread->mt_thread);
#else /* __CYGWIN__ */
#else /* _WIN32 || __CYGWIN__ */
running_context = &((struct mtarch_t *)thread->mt_thread)->context;
swapcontext(&main_context, running_context);
running_context = NULL;
#endif /* __CYGWIN__ */
#endif /* _WIN32 || __CYGWIN__ */
}
/*--------------------------------------------------------------------------*/
void
mtarch_stop(struct mtarch_thread *thread)
{
#ifdef __CYGWIN__
#if defined(_WIN32) || defined(__CYGWIN__)
DeleteFiber(thread->mt_thread);
#else /* __CYGWIN__ */
#else /* _WIN32 || __CYGWIN__ */
free(thread->mt_thread);
#endif /* __CYGWIN__ */
#endif /* _WIN32 || __CYGWIN__ */
}
/*--------------------------------------------------------------------------*/
void

6
cpu/native/rtimer-arch.c
View file

@ -39,7 +39,9 @@
*/
#include <signal.h>
#ifndef _WIN32
#include <sys/time.h>
#endif /* !_WIN32 */
#include <stddef.h>
#include "sys/rtimer.h"
@ -64,12 +66,15 @@ interrupt(int sig)
void
rtimer_arch_init(void)
{
#ifndef _WIN32
signal(SIGALRM, interrupt);
#endif /* !_WIN32 */
}
/*---------------------------------------------------------------------------*/
void
rtimer_arch_schedule(rtimer_clock_t t)
{
#ifndef _WIN32
struct itimerval val;
rtimer_clock_t c;
@ -83,5 +88,6 @@ rtimer_arch_schedule(rtimer_clock_t t)
val.it_interval.tv_sec = val.it_interval.tv_usec = 0;
setitimer(ITIMER_REAL, &val, NULL);
#endif /* !_WIN32 */
}
/*---------------------------------------------------------------------------*/

3
cpu/stm32w108/Makefile.stm32w108
View file

@ -236,7 +236,8 @@ symbols.c:
$(NM) $(CORE) | awk -f $(CONTIKI)/tools/mknmlist > symbols.c
else
symbols.c symbols.h:
@$(CONTIKI)/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
endif
%.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(OBJECTDIR)/symbols.o

4
cpu/x86/Makefile.x86
View file

@ -21,8 +21,8 @@ LDFLAGS = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
ifdef CORE
symbols.c symbols.h:
$(NM) $(CORE) | awk -f $(CONTIKI)/tools/mknmlist > symbols.c
# @${CONTIKI}/tools/make-symbols $(CORE)
else
symbols.c symbols.h:
@${CONTIKI}/tools/make-empty-symbols
cp ${CONTIKI}/tools/empty-symbols.c symbols.c
cp ${CONTIKI}/tools/empty-symbols.h symbols.h
endif