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

tiva: tiva_lowputc.c, tiva_qencoder.c: Fix nxstyle warnings

Browse Source 
arch/arm/src/tiva/common/tiva_lowputc.c:

    * Fix nxstyle warnings. No functional changes.

arch/arm/src/tiva/common/tiva_qencoder.c:

    * Fix nxstyle warnings. No functional changes.
This commit is contained in:
Nathan Hartman 2020-09-14 09:54:26 -04:00 committed by Matias N
parent 03c7951cbd
commit e681396d35
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/src/tiva/common/tiva_lowputc.c
View File

@ -235,7 +235,8 @@ void arm_lowputc(char ch)
#ifdef HAVE_SERIAL_CONSOLE #ifdef HAVE_SERIAL_CONSOLE
/* Wait until the TX FIFO is not full */ /* Wait until the TX FIFO is not full */
while ((getreg32(TIVA_CONSOLE_BASE + TIVA_UART_FR_OFFSET) & UART_FR_TXFF) != 0); while ((getreg32(TIVA_CONSOLE_BASE + TIVA_UART_FR_OFFSET) &
UART_FR_TXFF) != 0);
/* Then send the character */ /* Then send the character */

53
arch/arm/src/tiva/common/tiva_qencoder.c
View File

@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* arch/arm/src/tiva/common/tiva_qencoder.c * arch/arm/src/tiva/common/tiva_qencoder.c
* *
* Copyright (C) 2016 Young Mu. All rights reserved. * Copyright (C) 2016 Young Mu. All rights reserved.
@ -38,11 +38,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -62,10 +62,9 @@
#include <arch/board/board.h> #include <arch/board/board.h>
/****************************************************************************
/************************************************************************************
* Private Types * Private Types
************************************************************************************/ ****************************************************************************/
struct tiva_qe_s struct tiva_qe_s
{ {
@ -78,9 +77,9 @@ struct tiva_qe_s
uint32_t maxpos; uint32_t maxpos;
}; };
/************************************************************************************ /****************************************************************************
* Private Function Prototypes * Private Function Prototypes
************************************************************************************/ ****************************************************************************/
static inline void tiva_qe_putreg(struct tiva_qe_s *qe, unsigned int offset, static inline void tiva_qe_putreg(struct tiva_qe_s *qe, unsigned int offset,
uint32_t regval); uint32_t regval);
@ -98,12 +97,13 @@ static int tiva_qe_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
static int tiva_qe_direction(struct tiva_qe_s *qe, unsigned long *dir); static int tiva_qe_direction(struct tiva_qe_s *qe, unsigned long *dir);
static int tiva_qe_velocity(struct tiva_qe_s *qe, unsigned long *vel); static int tiva_qe_velocity(struct tiva_qe_s *qe, unsigned long *vel);
static int tiva_qe_resetatppr(struct tiva_qe_s *qe, unsigned long ppr); static int tiva_qe_resetatppr(struct tiva_qe_s *qe, unsigned long ppr);
static int tiva_qe_resetatmaxpos(FAR struct tiva_qe_s *qe, unsigned long offs); static int tiva_qe_resetatmaxpos(FAR struct tiva_qe_s *qe,
unsigned long offs);
static int tiva_qe_resetatindex(FAR struct tiva_qe_s *qe); static int tiva_qe_resetatindex(FAR struct tiva_qe_s *qe);
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
static const struct qe_ops_s g_qe_ops = static const struct qe_ops_s g_qe_ops =
{ {
@ -140,31 +140,32 @@ static struct tiva_qe_s g_qe1 =
}; };
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: tiva_qe_getreg * Name: tiva_qe_getreg
* *
* Description: * Description:
* Get a 32-bit register value by offset * Get a 32-bit register value by offset
* *
************************************************************************************/ ****************************************************************************/
static inline uint32_t tiva_qe_getreg(struct tiva_qe_s *qe, unsigned int offset) static inline uint32_t tiva_qe_getreg(struct tiva_qe_s *qe,
unsigned int offset)
{ {
uintptr_t regaddr = qe->base + offset; uintptr_t regaddr = qe->base + offset;
return getreg32(regaddr); return getreg32(regaddr);
} }
/************************************************************************************ /****************************************************************************
* Name: tiva_qe_putreg * Name: tiva_qe_putreg
* *
* Description: * Description:
* Put a 32-bit register value by offset * Put a 32-bit register value by offset
* *
************************************************************************************/ ****************************************************************************/
static inline void tiva_qe_putreg(struct tiva_qe_s *qe, unsigned int offset, static inline void tiva_qe_putreg(struct tiva_qe_s *qe, unsigned int offset,
uint32_t regval) uint32_t regval)
@ -290,8 +291,8 @@ static int tiva_qe_setup(FAR struct qe_lowerhalf_s *lower)
* *
* Description: * Description:
* This method is called when the driver is closed. The lower half driver * This method is called when the driver is closed. The lower half driver
* stop data collection, free any resources, disable the timer hardware, and * stop data collection, free any resources, disable the timer hardware,
* put the system into the lowest possible power usage state * and put the system into the lowest possible power usage state.
* *
* Input Parameters: * Input Parameters:
* lower - A reference to the lower half QEI driver state structure * lower - A reference to the lower half QEI driver state structure
@ -354,7 +355,8 @@ static int tiva_qe_reset(FAR struct qe_lowerhalf_s *lower)
* *
****************************************************************************/ ****************************************************************************/
static int tiva_qe_position(FAR struct qe_lowerhalf_s *lower, FAR int32_t *pos) static int tiva_qe_position(FAR struct qe_lowerhalf_s *lower,
FAR int32_t *pos)
{ {
FAR struct tiva_qe_s *qe = (FAR struct tiva_qe_s *)lower; FAR struct tiva_qe_s *qe = (FAR struct tiva_qe_s *)lower;
@ -513,7 +515,8 @@ static int tiva_qe_resetatppr(FAR struct tiva_qe_s *qe, unsigned long ppr)
* *
****************************************************************************/ ****************************************************************************/
static int tiva_qe_resetatmaxpos(FAR struct tiva_qe_s *qe, unsigned long maxpos) static int tiva_qe_resetatmaxpos(FAR struct tiva_qe_s *qe,
unsigned long maxpos)
{ {
sninfo("set maxpos reset mode and maxpos value of QEI %d\n", qe->id); sninfo("set maxpos reset mode and maxpos value of QEI %d\n", qe->id);
@ -589,7 +592,7 @@ static int tiva_qe_resetatindex(FAR struct tiva_qe_s *qe)
return OK; return OK;
} }
/************************************************************************************ /****************************************************************************
* Name: tiva_qei_initialize * Name: tiva_qei_initialize
* *
* Description: * Description:
@ -603,7 +606,7 @@ static int tiva_qe_resetatindex(FAR struct tiva_qe_s *qe)
* On success, a pointer to the lower half QEI driver is returned. * On success, a pointer to the lower half QEI driver is returned.
* NULL is returned on any failure. * NULL is returned on any failure.
* *
************************************************************************************/ ****************************************************************************/
FAR struct qe_lowerhalf_s *tiva_qei_initialize(int id) FAR struct qe_lowerhalf_s *tiva_qei_initialize(int id)
{ {