From 184ca294e8ae1065d8cec59baff32f53e21d2c83 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 4 Jun 2016 07:59:02 -0600 Subject: [PATCH] Rename all references to up_lowgetc --- arch/arm/src/kl/kl_lowgetc.c | 22 +--------------------- arch/arm/src/kl/kl_lowgetc.h | 10 +--------- arch/arm/src/lpc11xx/lpc11_lowgetc.c | 22 +--------------------- arch/arm/src/lpc11xx/lpc11_lowgetc.h | 10 +--------- arch/z16/src/common/up_internal.h | 2 +- arch/z16/src/z16f/z16f_lowuart.S | 20 ++++++++++---------- 6 files changed, 15 insertions(+), 71 deletions(-) diff --git a/arch/arm/src/kl/kl_lowgetc.c b/arch/arm/src/kl/kl_lowgetc.c index f1c02981d2..8033ee732f 100644 --- a/arch/arm/src/kl/kl_lowgetc.c +++ b/arch/arm/src/kl/kl_lowgetc.c @@ -77,32 +77,12 @@ # define CONSOLE_PARITY CONFIG_UART2_PARITY #endif -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: up_lowgetc + * Name: kl_lowgetc * * Description: * Input one byte from the serial console diff --git a/arch/arm/src/kl/kl_lowgetc.h b/arch/arm/src/kl/kl_lowgetc.h index 4ed52365a2..625f534964 100644 --- a/arch/arm/src/kl/kl_lowgetc.h +++ b/arch/arm/src/kl/kl_lowgetc.h @@ -43,14 +43,6 @@ #include #include "kl_config.h" -/************************************************************************************ - * Pre-processor Definitions - ************************************************************************************/ - -/************************************************************************************ - * Public Types - ************************************************************************************/ - /************************************************************************************ * Public Data ************************************************************************************/ @@ -67,7 +59,7 @@ extern "C" #endif /************************************************************************************ - * Public Functions + * Public Function Prototypes ************************************************************************************/ #ifdef HAVE_SERIAL_CONSOLE diff --git a/arch/arm/src/lpc11xx/lpc11_lowgetc.c b/arch/arm/src/lpc11xx/lpc11_lowgetc.c index a0a12b6108..a4c0f81c54 100644 --- a/arch/arm/src/lpc11xx/lpc11_lowgetc.c +++ b/arch/arm/src/lpc11xx/lpc11_lowgetc.c @@ -79,32 +79,12 @@ # define CONSOLE_PARITY CONFIG_UART2_PARITY #endif -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: up_lowgetc + * Name: lpc11_lowgetc * * Description: * Input one byte from the serial console diff --git a/arch/arm/src/lpc11xx/lpc11_lowgetc.h b/arch/arm/src/lpc11xx/lpc11_lowgetc.h index 4c94f39b78..932898f395 100644 --- a/arch/arm/src/lpc11xx/lpc11_lowgetc.h +++ b/arch/arm/src/lpc11xx/lpc11_lowgetc.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/lpc11/lpc11_lowgetc.h * - * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2015, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,14 +43,6 @@ #include #include "lpc11_serial.h" -/************************************************************************************ - * Pre-processor Definitions - ************************************************************************************/ - -/************************************************************************************ - * Public Types - ************************************************************************************/ - /************************************************************************************ * Public Data ************************************************************************************/ diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h index bd6f36ca9f..64a5302a42 100644 --- a/arch/z16/src/common/up_internal.h +++ b/arch/z16/src/common/up_internal.h @@ -58,7 +58,7 @@ #undef CONFIG_SUPPRESS_UART_CONFIG /* Do not reconfig UART */ #undef CONFIG_DUMP_ON_EXIT /* Dump task state on exit */ #undef CONFIG_Z16_LOWPUTC /* Support up_lowputc for debug */ -#undef CONFIG_Z16_LOWGETC /* support up_lowgetc for debug */ +#undef CONFIG_Z16_LOWGETC /* support z16_lowgetc for debug */ /* Determine which (if any) console driver to use. If a console is enabled * and no other console device is specified, then a serial console is diff --git a/arch/z16/src/z16f/z16f_lowuart.S b/arch/z16/src/z16f/z16f_lowuart.S index 161d5ac924..ef7c31a6ca 100644 --- a/arch/z16/src/z16f/z16f_lowuart.S +++ b/arch/z16/src/z16f/z16f_lowuart.S @@ -70,7 +70,7 @@ xdef _up_lowputc #endif #ifdef CONFIG_Z16_LOWGETC - xdef _up_lowgetc + xdef _z16_lowgetc #endif /************************************************************************* @@ -222,7 +222,7 @@ _z16f_xmitc1: #endif /* CONFIG_Z16_LOWPUTC */ /************************************************************************* - * Name: _up_lowgetc + * Name: _z16_lowgetc * * Description: * Get a character from the serial port @@ -236,34 +236,34 @@ _z16f_xmitc1: *************************************************************************/ #ifdef CONFIG_Z16_LOWGETC -_up_lowgetc: -_up_lowgetc1: +_z16_lowgetc: +_z16_lowgetc1: #ifdef HAVE_Z16F_SERIAL_CONSOLE ld r0, #Z16F_UARTSTAT0_RDA /* RDA=Receive data available */ #ifdef CONFIG_UART1_SERIAL_CONSOLE tm.b Z16F_UART1_STAT0, r0 - jp eq, _up_lowgetc1 /* While (!Z16F_UART1_STAT0 & RDA)) */ + jp eq, _z16_lowgetc1 /* While (!Z16F_UART1_STAT0 & RDA)) */ ld.ub r0, Z16F_UART1_RXD /* r0 = Z16F_UART1_RXD */ #else tm.b Z16F_UART0_STAT0,r0 /* While (!Z16F_UART0_STAT0 & RDA) */ - jp eq, _up_lowgetc1 + jp eq, _z16_lowgetc1 ld.ub r0, Z16F_UART0_RXD /* r0 = Z16F_UART0_RXD */ #endif cp r0, #%0d /* Test for '\r' */ - jp eq, _up_lowgetc2 + jp eq, _z16_lowgetc2 cp r0, #%0d /* Test \r + high bit */ - jp ne, _up_lowgetc3 + jp ne, _z16_lowgetc3 -_up_lowgetc2: +_z16_lowgetc2: ld r0, #%0a /* Convert '\r' to '\n' */ -_up_lowgetc3: /* Return value in r0 */ +_z16_lowgetc3: /* Return value in r0 */ #endif /* HAVE_Z16F_SERIAL_CONSOLE */ ret /* Return */