diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-28 22:03:49 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-28 22:03:49 +0000 |
| commit | a7fffa54ed01e92f3797af5707add81d8c9358cf (patch) | |
| tree | 18e317106c391d9dd874559d38993d17d100f401 /nuttx/arch/z16 | |
| parent | 6db7527fa05112bad73b91e57d647d52caf3809a (diff) | |
| download | px4-nuttx-a7fffa54ed01e92f3797af5707add81d8c9358cf.tar.gz px4-nuttx-a7fffa54ed01e92f3797af5707add81d8c9358cf.tar.bz2 px4-nuttx-a7fffa54ed01e92f3797af5707add81d8c9358cf.zip | |
Basic Z16F serial driver functionality
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@577 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z16')
| -rw-r--r-- | nuttx/arch/z16/src/z16f/chip.h | 12 | ||||
| -rwxr-xr-x | nuttx/arch/z16/src/z16f/z16f_head.S | 7 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/z16f/z16f_serial.c | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/nuttx/arch/z16/src/z16f/chip.h b/nuttx/arch/z16/src/z16f/chip.h index bcfff9279..f43a65392 100644 --- a/nuttx/arch/z16/src/z16f/chip.h +++ b/nuttx/arch/z16/src/z16f/chip.h @@ -517,12 +517,12 @@ /* Register access macros ***********************************************************/ #ifndef __ASSEMBLY__ -# define getreg8(a) (*(ubyte volatile _Near*)((a) & 0xffff)) -# define putreg8(v,a) (*(ubyte volatile _Near*)((a) & 0xffff) = (v)) -# define getreg16(a) (*(uint16 volatile _Near*)((a) & 0xffff)) -# define putreg16(v,a) (*(uint16 volatile _Near*)((a) & 0xffff) = (v)) -# define getreg32(a) (*(uint32 volatile _Near*)((a) & 0xffff)) -# define putreg32(v,a) (*(uint32 volatile _Near*)((a) & 0xffff) = (v)) +# define getreg8(a) (*(ubyte volatile _Near*)(a)) +# define putreg8(v,a) (*(ubyte volatile _Near*)(a) = (v)) +# define getreg16(a) (*(uint16 volatile _Near*)(a)) +# define putreg16(v,a) (*(uint16 volatile _Near*)(a) = (v)) +# define getreg32(a) (*(uint32 volatile _Near*)(a)) +# define putreg32(v,a) (*(uint32 volatile _Near*)(a) = (v)) #endif /* __ASSEMBLY__ */ /************************************************************************************ diff --git a/nuttx/arch/z16/src/z16f/z16f_head.S b/nuttx/arch/z16/src/z16f/z16f_head.S index 7e0682e76..f6108c250 100755 --- a/nuttx/arch/z16/src/z16f/z16f_head.S +++ b/nuttx/arch/z16/src/z16f/z16f_head.S @@ -50,14 +50,11 @@ #ifdef CONFIG_ARCH_LEDS xref _up_ledinit:EROM #endif -#if defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0 - xref _up_earlyserialinit:EROM -#endif -#if defined(CONFIG_ARCH_LOWPUTC) || defined(CONFIG_ARCH_LOWGETC) +#if defined(CONFIG_ARCH_LOWPUTC) || defined(CONFIG_ARCH_LOWGETC) || CONFIG_NFILE_DESCRIPTORS == 0 xref _z16f_lowuartinit:EROM #endif #if defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0 - xref up_earlyserialinit:EROM + xref _up_earlyserialinit:EROM #endif xref _os_start:EROM xref _up_doirq:EROM diff --git a/nuttx/arch/z16/src/z16f/z16f_serial.c b/nuttx/arch/z16/src/z16f/z16f_serial.c index fb92919b1..63f40f62a 100644 --- a/nuttx/arch/z16/src/z16f/z16f_serial.c +++ b/nuttx/arch/z16/src/z16f/z16f_serial.c @@ -298,7 +298,7 @@ static void z16f_waittx(struct uart_dev_s *dev, boolean (*status)(struct uart_de static int z16f_setup(struct uart_dev_s *dev) { -#ifdef CONFIG_SUPPRESS_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct z16f_uart_s *priv = (struct z16f_uart_s*)dev->priv; uint32 brg; ubyte ctl0; |