diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-18 18:22:06 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-18 18:22:06 +0000 |
commit | 13ecead34f2276518c3d4fe9a3b99799a147f429 (patch) | |
tree | 9e60886f83d6d329848e95ffe76ad6c78cbba115 /nuttx/configs/xtrs | |
parent | 8951e208d178ae12913a1598d887555d736da978 (diff) | |
download | px4-nuttx-13ecead34f2276518c3d4fe9a3b99799a147f429.tar.gz px4-nuttx-13ecead34f2276518c3d4fe9a3b99799a147f429.tar.bz2 px4-nuttx-13ecead34f2276518c3d4fe9a3b99799a147f429.zip |
Still detangling lowuart stuff
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@709 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/xtrs')
-rw-r--r-- | nuttx/configs/xtrs/include/board.h | 3 | ||||
-rw-r--r-- | nuttx/configs/xtrs/nsh/defconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/xtrs/ostest/defconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/xtrs/pashello/defconfig | 6 | ||||
-rw-r--r-- | nuttx/configs/xtrs/src/xtr_lowputc.c | 8 | ||||
-rw-r--r-- | nuttx/configs/xtrs/src/xtr_serial.c | 6 |
6 files changed, 30 insertions, 7 deletions
diff --git a/nuttx/configs/xtrs/include/board.h b/nuttx/configs/xtrs/include/board.h index 97282fe55..7a3050d6f 100644 --- a/nuttx/configs/xtrs/include/board.h +++ b/nuttx/configs/xtrs/include/board.h @@ -60,6 +60,9 @@ extern "C" { #define EXTERN extern #endif +EXTERN void z80_lowputc(char ch) __naked; +EXTERN char z80_lowgetc(void) __naked; + #undef EXTERN #if defined(__cplusplus) } diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig index 62d4047b3..d5467c869 100644 --- a/nuttx/configs/xtrs/nsh/defconfig +++ b/nuttx/configs/xtrs/nsh/defconfig @@ -110,8 +110,13 @@ CONFIG_LINKER_CODE_AREA=0x5300 # CONFIG_JULIAN_TIME - Enables Julian time conversions # CONFIG_START_YEAR, CONFIG_START_MONTH, CONFIG_START_DAY - # Used to initialize the internal time logic. +# CONFIG_HAVE_LOWUARTINIT - Provides low-level UART initialization +# logic as up_lowuartinit (only needed if there is no +# serial driver). # CONFIG_DEV_CONSOLE - Set if architecture-specific logic # provides /dev/console. Enables stdout, stderr, stdin. +# CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console +# driver (minimul support) # CONFIG_EXAMPLE=nsh CONFIG_DEBUG=n @@ -125,7 +130,9 @@ CONFIG_START_YEAR=2007 CONFIG_START_MONTH=2 CONFIG_START_DAY=21 CONFIG_JULIAN_TIME=n +CONFIG_HAVE_LOWUARTINIT=n CONFIG_DEV_CONSOLE=n +CONFIG_DEV_LOWCONSOLE=n # # The following can be used to disable categories of diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig index 4561837e0..e7cda9a36 100644 --- a/nuttx/configs/xtrs/ostest/defconfig +++ b/nuttx/configs/xtrs/ostest/defconfig @@ -110,8 +110,13 @@ CONFIG_LINKER_CODE_AREA=0x5300 # CONFIG_JULIAN_TIME - Enables Julian time conversions # CONFIG_START_YEAR, CONFIG_START_MONTH, CONFIG_START_DAY - # Used to initialize the internal time logic. +# CONFIG_HAVE_LOWUARTINIT - Provides low-level UART initialization +# logic as up_lowuartinit (only needed if there is no +# serial driver). # CONFIG_DEV_CONSOLE - Set if architecture-specific logic # provides /dev/console. Enables stdout, stderr, stdin. +# CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console +# driver (minimul support) # CONFIG_EXAMPLE=ostest CONFIG_DEBUG=n @@ -125,7 +130,9 @@ CONFIG_START_YEAR=2008 CONFIG_START_MONTH=2 CONFIG_START_DAY=21 CONFIG_JULIAN_TIME=n +CONFIG_HAVE_LOWUARTINIT=n CONFIG_DEV_CONSOLE=n +CONFIG_DEV_LOWCONSOLE=n # # The following can be used to disable categories of diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig index 824f86d02..7246a8b16 100644 --- a/nuttx/configs/xtrs/pashello/defconfig +++ b/nuttx/configs/xtrs/pashello/defconfig @@ -110,8 +110,13 @@ CONFIG_LINKER_CODE_AREA=0x5300 # CONFIG_JULIAN_TIME - Enables Julian time conversions # CONFIG_START_YEAR, CONFIG_START_MONTH, CONFIG_START_DAY - # Used to initialize the internal time logic. +# CONFIG_HAVE_LOWUARTINIT - Provides low-level UART initialization +# logic as up_lowuartinit (only needed if there is no +# serial driver). # CONFIG_DEV_CONSOLE - Set if architecture-specific logic # provides /dev/console. Enables stdout, stderr, stdin. +# CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console +# driver (minimul support) # CONFIG_EXAMPLE=pashello CONFIG_DEBUG=n @@ -125,6 +130,7 @@ CONFIG_START_YEAR=2008 CONFIG_START_MONTH=2 CONFIG_START_DAY=21 CONFIG_JULIAN_TIME=n +CONFIG_HAVE_LOWUARTINIT=n CONFIG_DEV_CONSOLE=n CONFIG_DEV_LOWCONSOLE=n diff --git a/nuttx/configs/xtrs/src/xtr_lowputc.c b/nuttx/configs/xtrs/src/xtr_lowputc.c index be1628444..c85f540d2 100644 --- a/nuttx/configs/xtrs/src/xtr_lowputc.c +++ b/nuttx/configs/xtrs/src/xtr_lowputc.c @@ -77,10 +77,10 @@ ********************************************************************************/ /******************************************************************************** - * Name: up_lowputc + * Name: z80_lowputc ********************************************************************************/ -void up_lowputc(char ch) __naked +void z80_lowputc(char ch) __naked { _asm ld hl, #2 @@ -92,10 +92,10 @@ void up_lowputc(char ch) __naked } /******************************************************************************** - * Name: up_lowgetc + * Name: z80_lowgetc ********************************************************************************/ -char up_lowgetc(void) __naked +char z80_lowgetc(void) __naked { _asm call _TRS80_M3_KBDSCN ;0x002b diff --git a/nuttx/configs/xtrs/src/xtr_serial.c b/nuttx/configs/xtrs/src/xtr_serial.c index dbe69df67..b6a90baf1 100644 --- a/nuttx/configs/xtrs/src/xtr_serial.c +++ b/nuttx/configs/xtrs/src/xtr_serial.c @@ -277,7 +277,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) static int up_receive(struct uart_dev_s *dev, uint32 *status) { -// uint8 ch = up_lowgetc(); +// uint8 ch = z80_lowputc(); *status = 0; return ch; @@ -318,7 +318,7 @@ static boolean up_rxavailable(struct uart_dev_s *dev) static void up_send(struct uart_dev_s *dev, int ch) { - up_lowputc(ch); + z80_lowputc(ch); } /**************************************************************************** @@ -409,6 +409,6 @@ void up_serialinit(void) int up_putc(int ch) { - up_lowputc(ch); + z80_lowputc(ch); return 0; } |