sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename all references to up_lowgetc

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-04 07:59:02 -06:00
parent ed1535f188
commit 184ca294e8
6 changed files with 15 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/src/kl/kl_lowgetc.c
View File

@ -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

10
arch/arm/src/kl/kl_lowgetc.h
View File

@ -43,14 +43,6 @@
#include <nuttx/config.h>
#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

22
arch/arm/src/lpc11xx/lpc11_lowgetc.c
View File

@ -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

10
arch/arm/src/lpc11xx/lpc11_lowgetc.h
View File

@ -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 <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -43,14 +43,6 @@
#include <nuttx/config.h>
#include "lpc11_serial.h"
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/************************************************************************************
* Public Types
************************************************************************************/
/************************************************************************************
* Public Data
************************************************************************************/

2
arch/z16/src/common/up_internal.h
View File

@ -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

20
arch/z16/src/z16f/z16f_lowuart.S
View File

@ -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 */