diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-02 23:05:53 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-02 23:05:53 +0000 |
commit | 5dc79030987a04233b672933793c1d0182854160 (patch) | |
tree | 668a67f0a5fbd10824aee2f92174906e797c3279 /nuttx/arch/arm/src/c5471 | |
parent | 8543ac1d6bb8568cba8a31a66f3c7d31a4323657 (diff) | |
download | px4-nuttx-5dc79030987a04233b672933793c1d0182854160.tar.gz px4-nuttx-5dc79030987a04233b672933793c1d0182854160.tar.bz2 px4-nuttx-5dc79030987a04233b672933793c1d0182854160.zip |
Changes for clean compile of DM90x0 driver on Neuros OSD
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@365 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/c5471')
-rw-r--r-- | nuttx/arch/arm/src/c5471/Make.defs | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_serial.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/c5471/Make.defs b/nuttx/arch/arm/src/c5471/Make.defs index ea04d6b81..540edc053 100644 --- a/nuttx/arch/arm/src/c5471/Make.defs +++ b/nuttx/arch/arm/src/c5471/Make.defs @@ -37,7 +37,7 @@ HEAD_ASRC = up_nommuhead.S CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \ - up_createstack.c up_dataabort.c up_delay.c up_doirq.c \ + up_createstack.c up_dataabort.c up_mdelay.c up_udealy.c up_doirq.c \ up_exit.c up_idle.c up_initialize.c up_initialstate.c \ up_interruptcontext.c up_prefetchabort.c up_releasepending.c \ up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c \ diff --git a/nuttx/arch/arm/src/c5471/c5471_serial.c b/nuttx/arch/arm/src/c5471/c5471_serial.c index 13197816b..ceeba8a36 100644 --- a/nuttx/arch/arm/src/c5471/c5471_serial.c +++ b/nuttx/arch/arm/src/c5471/c5471_serial.c @@ -1,5 +1,5 @@ /************************************************************ - * c5471/c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471c5471_serial.c + * c5471/c5471_serial.c * * Copyright (C) 2007 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -38,16 +38,19 @@ ************************************************************/ #include <nuttx/config.h> + #include <sys/types.h> #include <unistd.h> #include <semaphore.h> #include <string.h> #include <errno.h> #include <debug.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/serial.h> #include <arch/serial.h> + #include "up_arch.h" #include "os_internal.h" #include "up_internal.h" @@ -381,9 +384,9 @@ static int up_setup(struct uart_dev_s *dev) /* Both the IrDA and MODEM UARTs support RESET and UART mode. */ up_serialout(priv, UART_MDR_OFFS, MDR_RESET_MODE); - up_delay(5); + up_mdelay(5); up_serialout(priv, UART_MDR_OFFS, MDR_UART_MODE); - up_delay(5); + up_mdelay(5); priv->regs.ier = up_inserial(priv, UART_IER_OFFS); priv->regs.lcr = up_inserial(priv, UART_LCR_OFFS); |