From 8ed76ffa96cd942542e5a39c7512ee1e94936f36 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 18 Feb 2007 23:46:29 +0000 Subject: [PATCH] Preparing to test on the C5471 git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@7 42af7a65-404d-4744-a932-0658087f49c3 --- arch/c5471/defconfig | 8 +++ arch/c5471/src/Makefile | 3 +- arch/c5471/src/up_lowputc.S | 127 ++++++++++++++++++++++++++++++++++++ arch/sim/defconfig | 8 +++ 4 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 arch/c5471/src/up_lowputc.S diff --git a/arch/c5471/defconfig b/arch/c5471/defconfig index c48d0b8379..efb0d7cc6d 100644 --- a/arch/c5471/defconfig +++ b/arch/c5471/defconfig @@ -98,12 +98,20 @@ CONFIG_ARCH_KMALLOC=n CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n +# # General Compile environment setup # # CONFIG_HAVE_LONG_LONG - enable if your architecture supports # long long types and if you plan to use them CONFIG_HAVE_LONG_LONG=n +# +# General build options +# +# CONFIG_RRLOAD_BINY - make the rrload binary format used with +# BSPs from www.ridgerun.com +CONFIG_RRLOAD_BINARY=y + # # Sizes of configurable things (0 disables) # diff --git a/arch/c5471/src/Makefile b/arch/c5471/src/Makefile index d5dc016e1e..a9c0fb117d 100644 --- a/arch/c5471/src/Makefile +++ b/arch/c5471/src/Makefile @@ -38,7 +38,8 @@ MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -I$(TOPDIR)/sched -ASRCS = up_vectors.S up_saveusercontext.S up_fullcontextrestore.S +ASRCS = up_vectors.S up_saveusercontext.S up_fullcontextrestore.S \ + up_lowputc.S AOBJS = $(ASRCS:.S=.o) CSRCS = up_initialize.c up_initialstate.c up_idle.c \ diff --git a/arch/c5471/src/up_lowputc.S b/arch/c5471/src/up_lowputc.S new file mode 100644 index 0000000000..24bf551feb --- /dev/null +++ b/arch/c5471/src/up_lowputc.S @@ -0,0 +1,127 @@ +/************************************************************************** + * up_lowputc.S + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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. Neither the name Gregory Nutt nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT OWNER 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. + * + **************************************************************************/ + +/************************************************************************** + * Included Files + **************************************************************************/ + +#include +#include "up_internal.h" +#include "c5471.h" + +/************************************************************************** + * Private Definitions + **************************************************************************/ + +/************************************************************************** + * Private Types + **************************************************************************/ + +/************************************************************************** + * Private Function Prototypes + **************************************************************************/ + +/************************************************************************** + * Global Variables + **************************************************************************/ + +/************************************************************************** + * Private Variables + **************************************************************************/ + +/************************************************************************** + * Private Functions + **************************************************************************/ + +/************************************************************************** + * Public Functions + **************************************************************************/ + +/************************************************************************** + * Name: up_lowputc + **************************************************************************/ + +/* This assembly language version has the advantage that it can does not + * require a C stack and uses only r0-r1. Hence it can be used during + * early boot phases. + */ + + .text + .global up_putc + .type up_lowputc, function +up_lowputc: + /* On entry, r0 holds the character to be printed */ + +#ifdef CONFIG_SERIAL_IRDA_CONSOLE + ldr r2, =UART_IRDA_BASE /* r2=IRDA UART base */ +#else + ldr r2, =UART_MODEM_BASE /* r2=Modem UART base */ +#endif + + /* Poll bit 0 of the UART_SSR register. When the bit + * is clear, the TX FIFO is no longer full + */ + +1: ldr r1, [r2, #UART_SSR_OFFS] + tst r1, #UART_SSR_TXFULL + bne 1b + + /* Send the character by writing it into the UART_THR + * register. + */ + + str r0, [r2, #UART_THR_OFFS] + + /* Wait for the tranmsit holding regiser (THR) to be + * emptied. This is detemined when bit 6 of the LSR + * is set. + */ + +2: ldr r1, [r2, #UART_LSR_OFFS] + tst r1, #0x00000020 + beq 2b + + /* If the character that we just sent was a linefeed, + * then send a carriage return as well. + */ + + teq r0, #'\n' + moveq r0, #'\r' + beq 1b + + /* And return */ + + mov pc, lr + diff --git a/arch/sim/defconfig b/arch/sim/defconfig index 60656fce38..ab62eb4525 100644 --- a/arch/sim/defconfig +++ b/arch/sim/defconfig @@ -96,12 +96,20 @@ CONFIG_ARCH_KMALLOC=n CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n +# # General Compile environment setup # # CONFIG_HAVE_LONG_LONG - enable if your architecture supports # long long types and if you plan to use them CONFIG_HAVE_LONG_LONG=n +# +# General build options +# +# CONFIG_RRLOAD_BINY - make the rrload binary format used with +# BSPs from www.ridgerun.com +CONFIG_RRLOAD_BINARY=n + # # Sizes of configurable things (0 disables) #