nuttx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gn...@apache.org
Subject [incubator-nuttx] 02/02: nxstyle corrections for .c and .h file modified by PR1030
Date Wed, 13 May 2020 12:47:16 GMT
This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 3d7678ad9b3eeef75a6f9ee53e4ef9cb8015b70f
Author: rajeshwaribhat <rajeshwaribhat@tataelxsi.co.in>
AuthorDate: Tue May 12 15:14:43 2020 +0530

    nxstyle corrections for .c and .h file modified by PR1030
---
 arch/renesas/src/rx65n/rx65n_eth.c                | 44 +++++++++---------
 arch/renesas/src/rx65n/rx65n_rtc.c                |  2 +-
 arch/renesas/src/rx65n/rx65n_serial.c             | 22 ++++-----
 boards/renesas/rx65n/rx65n-rsk1mb/include/board.h | 55 ++++++++---------------
 4 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/arch/renesas/src/rx65n/rx65n_eth.c b/arch/renesas/src/rx65n/rx65n_eth.c
index cc23813..ee86e78 100644
--- a/arch/renesas/src/rx65n/rx65n_eth.c
+++ b/arch/renesas/src/rx65n/rx65n_eth.c
@@ -371,7 +371,7 @@ struct eth_rxdesc_s
  * Private Types
  ****************************************************************************/
 
-/* The rx65n_ethmac_s encapsulates all state information for a single 
+/* The rx65n_ethmac_s encapsulates all state information for a single
  * hardware interface
  */
 
@@ -834,7 +834,7 @@ static int rx65n_transmit(FAR struct rx65n_ethmac_s *priv)
   struct eth_txdesc_s *txfirst;
   uint32_t regval;
 
-  /* The internal (optimal) network buffer size may be configured to be 
+  /* The internal (optimal) network buffer size may be configured to be
    * larger than the Ethernet buffer size.
    */
 
@@ -1128,7 +1128,7 @@ static int rx65n_txpoll(struct net_driver_s *dev)
         }
     }
 
-  /* If zero is returned, the polling will continue until all connections 
+  /* If zero is returned, the polling will continue until all connections
    * have been examined.
    */
 
@@ -1167,7 +1167,7 @@ static void rx65n_dopoll(FAR struct rx65n_ethmac_s *priv)
    * another packet for transmission.
    *
    * In a race condition, TACT may be cleared BUT still not available
-   * because rx65n_freeframe() has not yet run.  If rx65n_freeframe() has 
+   * because rx65n_freeframe() has not yet run.  If rx65n_freeframe() has
    * run, the buffer1 pointer (tdes2) will be nullified (and inflight
    * should be < CONFIG_RX65N_ETH_NTXDESC).
    */
@@ -1240,7 +1240,7 @@ static void rx65n_enableint(FAR struct rx65n_ethmac_s *priv, uint32_t
ierbit)
  *   None
  ****************************************************************************/
 
-static void rx65n_disableint(FAR struct rx65n_ethmac_s *priv, 
+static void rx65n_disableint(FAR struct rx65n_ethmac_s *priv,
                              uint32_t ierbit)
 {
   uint32_t regval;
@@ -1345,7 +1345,7 @@ static int rx65n_recvframe(FAR struct rx65n_ethmac_s *priv)
   ninfo("rxhead: %p rxcurr: %p segments: %d\n",
         priv->rxhead, priv->rxcurr, priv->segments);
 
-  /* Check if there are free buffers.  We cannot receive new frames in 
+  /* Check if there are free buffers.  We cannot receive new frames in
    * this design unless there is at least one free buffer.
    */
 
@@ -1446,7 +1446,7 @@ static int rx65n_recvframe(FAR struct rx65n_ethmac_s *priv)
   (priv->dev.d_statistics.rx_packets)++;
 #endif
 
-              /* Return success, remembering where we should re-start 
+              /* Return success, remembering where we should re-start
                * scanning and resetting the segment scanning logic
                */
 
@@ -1524,9 +1524,9 @@ static void rx65n_receive(FAR struct rx65n_ethmac_s *priv)
     {
 #ifdef CONFIG_NET_PKT
 
-      /* When packet sockets are enabled, feed the frame into the packet 
-	   * tap
-	   */
+      /* When packet sockets are enabled, feed the frame into the packet
+       * tap
+       */
 
       pkt_input(&priv->dev);
 #endif
@@ -1693,7 +1693,7 @@ static void rx65n_receive(FAR struct rx65n_ethmac_s *priv)
  * Function: rx65n_freeframe
  *
  * Description:
- *   Scans the TX descriptors and frees the buffers of completed TX 
+ *   Scans the TX descriptors and frees the buffers of completed TX
  *   transfers.
  *
  * Input Parameters:
@@ -1885,8 +1885,8 @@ static void rx65n_interrupt_work(FAR void *arg)
                                          PHY_STS_READ_REG, &phyreg);
       if (OK == phyreg_read_status)
         {
-          regval = (uint32_t)(phyreg & PHY_STS_BIT_MASK) 
-		             >> PHY_STS_SHIFT_COUNT;
+          regval = (uint32_t)(phyreg & PHY_STS_BIT_MASK)
+                    >> PHY_STS_SHIFT_COUNT;
         }
 
       if (regval != priv->prevlinkstatus) /* Check link status by 0th bit */
@@ -2122,8 +2122,8 @@ static void rx65n_poll_work(FAR void *arg)
    * a transmit in progress, we will miss TCP time state updates?
    *
    * In a race condition, TACT may be cleared BUT still not available
-   * because rx65n_freeframe() has not yet run.  If rx65n_freeframe() has 
-   * run, the buffer1 pointer (tdes2) will be nullified (and inflight 
+   * because rx65n_freeframe() has not yet run.  If rx65n_freeframe() has
+   * run, the buffer1 pointer (tdes2) will be nullified (and inflight
    * should be < CONFIG_RX65N_ETH_NTXDESC).
    */
 
@@ -2581,9 +2581,9 @@ static void rx65n_txdescinit(FAR struct rx65n_ethmac_s *priv)
       txdesc->tdes1 = (uint32_t)(1 << 16);
       txdesc->tdes2 = 0;
 
-      /* Initialize the next descriptor with the Next Descriptor Polling 
-	   * Enable
-	   */
+      /* Initialize the next descriptor with the Next Descriptor Polling
+       * Enable
+       */
 
       if (i < (CONFIG_RX65N_ETH_NTXDESC - 1))
         {
@@ -2663,9 +2663,9 @@ static void rx65n_rxdescinit(FAR struct rx65n_ethmac_s *priv)
 
       rxdesc->rdes2 = (uint32_t)&priv->rxbuffer[i*CONFIG_RX65N_ETH_BUFSIZE];
 
-      /* Initialize the next descriptor with the Next Descriptor Polling 
-	   * Enable
-	   */
+      /* Initialize the next descriptor with the Next Descriptor Polling
+       * Enable
+       */
 
       if (i < (CONFIG_RX65N_ETH_NRXDESC - 1))
         {
@@ -2978,7 +2978,7 @@ void phy_start_autonegotiate (uint8_t pause)
                      PHY_AN_ADVERTISEMENT_SELECTOR);
     }
 
-  /* Configure what the PHY and the Ethernet controller on this board 
+  /* Configure what the PHY and the Ethernet controller on this board
    * supports
    */
 
diff --git a/arch/renesas/src/rx65n/rx65n_rtc.c b/arch/renesas/src/rx65n/rx65n_rtc.c
index 0967343..46a4a4f 100644
--- a/arch/renesas/src/rx65n/rx65n_rtc.c
+++ b/arch/renesas/src/rx65n/rx65n_rtc.c
@@ -562,7 +562,7 @@ int up_rtc_settime(FAR const struct timespec *tp)
   volatile uint8_t dummy_byte;
   volatile uint16_t dummy_word;
 
-  /* Break out the time values (note that the time is set only to units of 
+  /* Break out the time values (note that the time is set only to units of
    * seconds)
    */
 
diff --git a/arch/renesas/src/rx65n/rx65n_serial.c b/arch/renesas/src/rx65n/rx65n_serial.c
index 111b021..21ed156 100644
--- a/arch/renesas/src/rx65n/rx65n_serial.c
+++ b/arch/renesas/src/rx65n/rx65n_serial.c
@@ -1199,9 +1199,9 @@ static int up_eriinterrupt(int irq, void *context, void *arg)
 
       priv->ssr = up_serialin(priv, RX_SCI_SSR_OFFSET);
 
-      /* Clear all read related events (probably already done in 
-	   * up_receive))
-	   */
+      /* Clear all read related events (probably already done in
+       * up_receive))
+       */
 
       priv->ssr &= ~(RX_SCISSR_ORER | RX_SCISSR_FER | RX_SCISSR_PER);
       up_serialout(priv, RX_SCI_SSR_OFFSET, priv->ssr);
@@ -1226,9 +1226,9 @@ static int up_teiinterrupt(int irq, void *context, void *arg)
 
     priv->ssr = up_serialin(priv, RX_SCI_SSR_OFFSET);
 
-      /* Clear all read related events (probably already done in 
-	   * up_receive))
-	   */
+      /* Clear all read related events (probably already done in
+       * up_receive))
+       */
 
      priv->ssr &= ~(RX_SCISSR_TEND);
      up_serialout(priv, RX_SCI_SSR_OFFSET, priv->ssr);
@@ -1273,8 +1273,8 @@ static int  up_xmtinterrupt(int irq, void *context, FAR void *arg)
   DEBUGASSERT((NULL != dev));
 
   /* Handle outgoing, transmit bytes (TDRE: Transmit Data Register Empty)
-   * when TIE is enabled.  TIE is only enabled when the driver is waiting with
-   * buffered data.  Since TDRE is usually true,
+   * when TIE is enabled.  TIE is only enabled when the driver is waiting
+   * with buffered data.  Since TDRE is usually true,
    */
 
   uart_xmitchars(dev);
@@ -1302,8 +1302,8 @@ static int up_receive(struct uart_dev_s *dev, unsigned int *status)
 
   rdr  = up_serialin(priv, RX_SCI_RDR_OFFSET);
 
-  /* Clear all read related status in  real ssr (so that when when rxavailable
-   * is called again, it will return false.
+  /* Clear all read related status in  real ssr (so that when when
+   * rx available is called again, it will return false.
    */
 
   ssr = up_serialin(priv, RX_SCI_SSR_OFFSET);
@@ -1311,7 +1311,7 @@ static int up_receive(struct uart_dev_s *dev, unsigned int *status)
            RX_SCISSR_FER  | RX_SCISSR_PER) ;
   up_serialout(priv, RX_SCI_SSR_OFFSET, ssr);
 
-  /* For status, return the SSR at the time that the interrupt was received */
+  /* For status, return SSR at the time that the interrupt was received */
 
   *status = (uint32_t)priv->ssr << 8 | rdr;
 
diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h b/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h
index 13e6706..f07c89c 100644
--- a/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h
+++ b/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h
@@ -1,44 +1,29 @@
-/***************************************************************************
- * boards/renesas/rx65n/rx65n-rsklmb/include/board.h
- *
- *   Copyright (C) 2008-2019 Gregory Nutt. All rights reserved.
- *   Author: Anjana <anjana@tataelxsi.co.in>
+/****************************************************************************
+ * boards/renesas/rx65n/rx65n-rsk1mb/include/board.h
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  *
- ***************************************************************************/
+ ****************************************************************************/
 
 #ifndef __BOARDS_RENESAS_RX65N_RX65N_RSKLMB_INCLUDE_BOARD_H
 #define __BOARDS_RENESAS_RX65N_RX65N_RSKLMB_INCLUDE_BOARD_H
 
-/***************************************************************************
+/****************************************************************************
  * Included Files
- ***************************************************************************/
+ ****************************************************************************/
 
 #ifndef __ASSEMBLY__
 # include <stdint.h>
@@ -46,7 +31,7 @@
 
 /****************************************************************************
  * Pre-processor Definitions
- ***************************************************************************/
+ ****************************************************************************/
 
 /* Clocking */
 
@@ -137,10 +122,6 @@ extern "C"
 #define EXTERN extern
 #endif
 
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
 #undef EXTERN
 #ifdef __cplusplus
 }


Mime
View raw message