From e5882cb0e6f65b4c34b39fd95608888dc74e5ef7 Mon Sep 17 00:00:00 2001 From: Kelvin Lawson Date: Thu, 28 Feb 2013 15:55:34 +0000 Subject: [PATCH] Support stack-check builds. Fix line endings. Remove deprecated Makefile. --- ports/arm/Makefile | 17 -------- ports/arm/atomport-tests.h | 86 +++++++++++++++++++------------------- ports/arm/tests-main.c | 2 +- 3 files changed, 44 insertions(+), 61 deletions(-) delete mode 100644 ports/arm/Makefile diff --git a/ports/arm/Makefile b/ports/arm/Makefile deleted file mode 100644 index 8689772..0000000 --- a/ports/arm/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -ATOMTHREADS_PORT = $(ATOMTHREADS)/ports/arm -ATOMTHREADS_KERNEL = $(ATOMTHREADS)/kernel - -INCLUDES := $(INCLUDES) \ - -I$(ATOMTHREADS_KERNEL) \ - -I$(ATOMTHREADS_PORT) - -SRCS := $(SRCS) \ - $(ATOMTHREADS_KERNEL)/atomkernel.c \ - $(ATOMTHREADS_KERNEL)/atommutex.c \ - $(ATOMTHREADS_KERNEL)/atomqueue.c \ - $(ATOMTHREADS_KERNEL)/atomsem.c \ - $(ATOMTHREADS_KERNEL)/atomtimer.c \ - $(ATOMTHREADS_PORT)/atomport.c - -ASMS := $(ASMS) \ - $(ATOMTHREADS_PORT)/atomport-asm.s diff --git a/ports/arm/atomport-tests.h b/ports/arm/atomport-tests.h index f6a37dd..5df864b 100644 --- a/ports/arm/atomport-tests.h +++ b/ports/arm/atomport-tests.h @@ -1,59 +1,59 @@ -/* - * Copyright (c) 2012, Natie van Rooyen. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. No personal names or organizations' names associated with the - * Atomthreads project may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE ATOMTHREADS PROJECT AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - +/* + * Copyright (c) 2012, Natie van Rooyen. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. No personal names or organizations' names associated with the + * Atomthreads project may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE ATOMTHREADS PROJECT AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #ifndef __ATOM_PORT_TESTS_H #define __ATOM_PORT_TESTS_H - -/* Include Atomthreads kernel API */ -#include "atom.h" - + +/* Include Atomthreads kernel API */ +#include "atom.h" + /* Prerequisite for ATOMLOG() macro (via dbg_format_msg) */ -extern void dbg_format_msg (char *format, ...) ; - - +extern void dbg_format_msg (char *format, ...) ; + + /* Logger macro for viewing test results */ -#define ATOMLOG dbg_format_msg - +#define ATOMLOG dbg_format_msg + /* * String location macro: for platforms which need to place strings in * alternative locations, e.g. on avr-gcc strings can be placed in * program space, saving SRAM. On most platforms this can expand to * empty. */ -#define _STR(x) x - +#define _STR(x) x + /* Default thread stack size (in bytes) */ #define TEST_THREAD_STACK_SIZE 1024 - + /* Uncomment to enable logging of stack usage to UART */ -/* #define TESTS_LOG_STACK_USAGE */ - +/* #define TESTS_LOG_STACK_USAGE */ + #endif /* __ATOM_PORT_TESTS_H */ diff --git a/ports/arm/tests-main.c b/ports/arm/tests-main.c index f79bb10..f345321 100644 --- a/ports/arm/tests-main.c +++ b/ports/arm/tests-main.c @@ -178,7 +178,7 @@ static void main_thread_func (uint32_t data) /* Log the stack usage */ #ifdef TESTS_LOG_STACK_USAGE - printf ("MainUse:%d\n", used_bytes); + printf ("MainUse:%d\n", (int)used_bytes); #endif }