diff options
Diffstat (limited to 'nuttx/configs/z80sim')
-rw-r--r-- | nuttx/configs/z80sim/include/board.h | 3 | ||||
-rw-r--r-- | nuttx/configs/z80sim/nsh/defconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/z80sim/ostest/defconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/z80sim/pashello/defconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/z80sim/src/z80_lowputc.c | 8 | ||||
-rw-r--r-- | nuttx/configs/z80sim/src/z80_serial.c | 6 |
6 files changed, 31 insertions, 7 deletions
diff --git a/nuttx/configs/z80sim/include/board.h b/nuttx/configs/z80sim/include/board.h index eb7aa3685..4cc4b97da 100644 --- a/nuttx/configs/z80sim/include/board.h +++ b/nuttx/configs/z80sim/include/board.h @@ -55,6 +55,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/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig index aa852ef8a..190f7af9c 100644 --- a/nuttx/configs/z80sim/nsh/defconfig +++ b/nuttx/configs/z80sim/nsh/defconfig @@ -103,8 +103,13 @@ CONFIG_HAVE_LIBM=n # 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 @@ -118,7 +123,9 @@ CONFIG_START_YEAR=2007 CONFIG_START_MONTH=2 CONFIG_START_DAY=21 CONFIG_JULIAN_TIME=n +CONFIG_HAVE_LOWUARTINIT=n CONFIG_DEV_CONSOLE=y +CONFIG_DEV_LOWCONSOLE=n # # The following can be used to disable categories of diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig index 50eaec587..3907e75b7 100644 --- a/nuttx/configs/z80sim/ostest/defconfig +++ b/nuttx/configs/z80sim/ostest/defconfig @@ -103,8 +103,13 @@ CONFIG_HAVE_LIBM=n # 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 @@ -118,7 +123,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/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig index e56c00e2a..6f2649084 100644 --- a/nuttx/configs/z80sim/pashello/defconfig +++ b/nuttx/configs/z80sim/pashello/defconfig @@ -103,8 +103,13 @@ CONFIG_HAVE_LIBM=n # 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 @@ -119,7 +124,9 @@ CONFIG_START_MONTH=2 CONFIG_START_DAY=21 CONFIG_JULIAN_TIME=n CONFIG_DEV_CONSOLE=y +CONFIG_HAVE_LOWUARTINIT=n CONFIG_DEV_LOWCONSOLE=y +CONFIG_DEV_LOWCONSOLE=n # # The following can be used to disable categories of diff --git a/nuttx/configs/z80sim/src/z80_lowputc.c b/nuttx/configs/z80sim/src/z80_lowputc.c index 4996272f9..269d37f92 100644 --- a/nuttx/configs/z80sim/src/z80_lowputc.c +++ b/nuttx/configs/z80sim/src/z80_lowputc.c @@ -69,13 +69,13 @@ ********************************************************************************/ /******************************************************************************** - * Name: up_lowputc + * Name: z80_lowputc * * Data sent to port 0xbe are echoed on stdout by the simulation * ********************************************************************************/ -void up_lowputc(char ch) __naked +void z80_lowputc(char ch) __naked { _asm ld hl, #2 @@ -87,13 +87,13 @@ void up_lowputc(char ch) __naked } /******************************************************************************** - * Name: up_lowgetc + * Name: z80_lowgetc * * Data from stdin can be received on port 0xbe in the simulation * ********************************************************************************/ -char up_lowgetc(void) __naked +char z80_lowgetc(void) __naked { _asm in a, (0xbe) diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c index 42b0eecc1..974b51b8f 100644 --- a/nuttx/configs/z80sim/src/z80_serial.c +++ b/nuttx/configs/z80sim/src/z80_serial.c @@ -227,7 +227,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_getputc(); *status = 0; return ch; } @@ -267,7 +267,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); } /**************************************************************************** @@ -358,7 +358,7 @@ void up_serialinit(void) int up_putc(int ch) { - up_lowputc(ch); + z80_lowputc(ch); return 0; } |