You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/07/13 05:47:09 UTC
[incubator-nuttx] 03/03: Fix nxstyle warnings
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9db5d2aeea423c80bba7519d7bb9b7da3f69f58e
Author: Nakamura, Yuuichi <Yu...@sony.com>
AuthorDate: Fri Jul 10 10:08:49 2020 +0900
Fix nxstyle warnings
---
arch/avr/src/common/up_initialize.c | 10 ++++++----
arch/hc/src/common/up_initialize.c | 7 ++++---
arch/or1k/src/common/up_initialize.c | 11 ++++++-----
arch/renesas/src/common/up_initialize.c | 10 ++++++----
arch/sim/src/sim/up_initialize.c | 16 ++++++++++++----
arch/x86/src/common/up_initialize.c | 4 ++--
6 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 199418a..99c82cc 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -1,7 +1,8 @@
/****************************************************************************
* arch/avr/src/common/up_initialize.c
*
- * Copyright (C) 2010, 2012-2013, 2015-2017 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010, 2012-2013, 2015-2017 Gregory Nutt. All rights
+ * reserved.
* Author: Gregory Nutt <gn...@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -64,7 +65,8 @@
/* Determine which (if any) console driver to use. This will probably cause
* up_serialinit to be incorrectly called if there is no USART configured to
- * be an RS-232 device (see as an example arch/avr/src/at32uc23/at32uc3_config.h)
+ * be an RS-232 device (see as an example
+ * arch/avr/src/at32uc23/at32uc3_config.h)
* This will probably have to be revisited someday.
*
* If a console is enabled and no other console device is specified, then a
@@ -166,8 +168,8 @@ void up_initialize(void)
#endif
#ifdef CONFIG_ARCH_DMA
- /* Initialize the DMA subsystem if the weak function up_dma_initialize has been
- * brought into the build
+ /* Initialize the DMA subsystem if the weak function up_dma_initialize has
+ * been brought into the build
*/
#ifdef CONFIG_HAVE_WEAKFUNCTIONS
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index c769b0c..2e2ceb4 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -1,7 +1,8 @@
/****************************************************************************
* arch/hc/src/common/up_initialize.c
*
- * Copyright (C) 2009-2010, 2012-2013, 2015-2017 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2010, 2012-2013, 2015-2017 Gregory Nutt. All rights
+ * reserved.
* Author: Gregory Nutt <gn...@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -99,8 +100,8 @@ void up_initialize(void)
#endif
#ifdef CONFIG_ARCH_DMA
- /* Initialize the DMA subsystem if the weak function up_dma_initialize has been
- * brought into the build
+ /* Initialize the DMA subsystem if the weak function up_dma_initialize has
+ * been brought into the build
*/
#ifdef CONFIG_HAVE_WEAKFUNCTIONS
diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c
index e28aad0..78ae0e4 100644
--- a/arch/or1k/src/common/up_initialize.c
+++ b/arch/or1k/src/common/up_initialize.c
@@ -74,7 +74,8 @@ void up_enable_icache(void)
mfspr(SPR_SYS_ICCFGR, iccfg);
- syslog(LOG_INFO, "ICACHE NCW: %d NCS: %d CBS: %d CCRI: %d CBIRI: %d CBPRI: %d\n",
+ syslog(LOG_INFO,
+ "ICACHE NCW: %d NCS: %d CBS: %d CCRI: %d CBIRI: %d CBPRI: %d\n",
(iccfg & SPR_ICCFGR_NCW_MASK) >> SPR_ICCFGR_NCW_SHIFT,
(iccfg & SPR_ICCFGR_NCS_MASK) >> SPR_ICCFGR_NCS_SHIFT,
(iccfg & SPR_ICCFGR_CBS) ? 1 : 0,
@@ -91,7 +92,6 @@ void up_enable_icache(void)
mfspr(SPR_SYS_SR, sr);
sr |= SPR_SR_ICE;
mtspr(SPR_SYS_SR, sr);
-
}
#endif
@@ -104,7 +104,8 @@ void up_enable_dcache(void)
mfspr(SPR_SYS_DCCFGR, dccfg);
- syslog(LOG_INFO, "DCACHE NCW: %d NCS: %d CBS: %d CCRI: %d CBIRI: %d CBPRI: %d\n",
+ syslog(LOG_INFO,
+ "DCACHE NCW: %d NCS: %d CBS: %d CCRI: %d CBIRI: %d CBPRI: %d\n",
(dccfg & SPR_DCCFGR_NCW_MASK) >> SPR_DCCFGR_NCW_SHIFT,
(dccfg & SPR_DCCFGR_NCS_MASK) >> SPR_DCCFGR_NCS_SHIFT,
(dccfg & SPR_DCCFGR_CBS) ? 1 : 0,
@@ -194,8 +195,8 @@ void up_initialize(void)
#endif
#ifdef CONFIG_ARCH_DMA
- /* Initialize the DMA subsystem if the weak function up_dma_initialize has been
- * brought into the build
+ /* Initialize the DMA subsystem if the weak function up_dma_initialize has
+ * been brought into the build
*/
#ifdef CONFIG_HAVE_WEAKFUNCTIONS
diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
index fde7e3c..af4c66d 100644
--- a/arch/renesas/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -1,7 +1,8 @@
/****************************************************************************
* arch/renesas/src/common/up_initialize.c
*
- * Copyright (C) 2008-2010, 2012-2013, 2015-2017 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2010, 2012-2013, 2015-2017 Gregory Nutt. All rights
+ * reserved.
* Author: Gregory Nutt <gn...@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -131,9 +132,10 @@ void up_initialize(void)
#endif
/* Initialize the console device driver (if it is other than the standard
- * serial driver). NOTE that the naming implies that the console is a serial
- * driver. That is usually the case, however, if no UARTs are enabled, the
- * console could also be provided through some other device, such as an LCD.
+ * serial driver). NOTE that the naming implies that the console is a
+ * serial driver. That is usually the case, however, if no UARTs are
+ * enabled, the console could also be provided through some other device,
+ * such as an LCD.
* Architecture-specific logic will have to detect that case.
*/
diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c
index b649dea..a512ce1 100644
--- a/arch/sim/src/sim/up_initialize.c
+++ b/arch/sim/src/sim/up_initialize.c
@@ -91,7 +91,9 @@ static void up_init_smartfs(void)
{
mtd = m25p_initialize(spi);
- /* Now initialize a SMART Flash block device and bind it to the MTD device */
+ /* Now initialize a SMART Flash block device and bind it to the MTD
+ * device
+ */
if (mtd != NULL)
{
@@ -108,7 +110,9 @@ static void up_init_smartfs(void)
{
mtd = sst26_initialize_spi(spi);
- /* Now initialize a SMART Flash block device and bind it to the MTD device */
+ /* Now initialize a SMART Flash block device and bind it to the MTD
+ * device
+ */
if (mtd != NULL)
{
@@ -125,7 +129,9 @@ static void up_init_smartfs(void)
{
mtd = w25_initialize(spi);
- /* Now initialize a SMART Flash block device and bind it to the MTD device */
+ /* Now initialize a SMART Flash block device and bind it to the MTD
+ * device
+ */
if (mtd != NULL)
{
@@ -143,7 +149,9 @@ static void up_init_smartfs(void)
{
mtd = n25qxxx_initialize(qspi, 0);
- /* Now initialize a SMART Flash block device and bind it to the MTD device */
+ /* Now initialize a SMART Flash block device and bind it to the MTD
+ * device
+ */
if (mtd != NULL)
{
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 35b65b7..c1de39f7 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -101,8 +101,8 @@ void up_initialize(void)
#endif
#ifdef CONFIG_ARCH_DMA
- /* Initialize the DMA subsystem if the weak function up_dma_initialize has been
- * brought into the build
+ /* Initialize the DMA subsystem if the weak function up_dma_initialize has
+ * been brought into the build
*/
#ifdef CONFIG_HAVE_WEAKFUNCTIONS