You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/07/27 04:50:06 UTC
[incubator-nuttx] 02/02: arch: imxrt: Fix style violations in
imxrt_enet.c
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a58193aa9ae8aaacace5bae4c61d323f459e838f
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Jul 24 06:58:36 2020 +0900
arch: imxrt: Fix style violations in imxrt_enet.c
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/arm/src/imxrt/imxrt_enet.c | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c
index 6aa70a8..b1b8105 100644
--- a/arch/arm/src/imxrt/imxrt_enet.c
+++ b/arch/arm/src/imxrt/imxrt_enet.c
@@ -242,7 +242,9 @@
#define CRITICAL_ERROR (ENET_INT_UN | ENET_INT_RL | ENET_INT_EBERR)
-/* This is a helper pointer for accessing the contents of the Ethernet header */
+/* This is a helper pointer for accessing
+ * the contents of the Ethernet header
+ */
#define BUF ((struct eth_hdr_s *)priv->dev.d_buf)
@@ -252,8 +254,8 @@
* Private Types
****************************************************************************/
-/* The imxrt_driver_s encapsulates all state information for a single hardware
- * interface
+/* The imxrt_driver_s encapsulates all state information for
+ * a single hardware interface
*/
struct imxrt_driver_s
@@ -651,8 +653,8 @@ static int imxrt_txpoll(struct net_driver_s *dev)
}
}
- /* If zero is returned, the polling will continue until all connections have
- * been examined.
+ /* If zero is returned, the polling will continue until
+ * all connections have been examined.
*/
return 0;
@@ -1219,8 +1221,9 @@ static void imxrt_poll_work(FAR void *arg)
{
FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg;
- /* Check if there is there is a transmission in progress. We cannot perform
- * the TX poll if he are unable to accept another packet for transmission.
+ /* Check if there is there is a transmission in progress.
+ * We cannot perform the TX poll if he are unable to accept
+ * another packet for transmission.
*/
net_lock();
@@ -1788,7 +1791,8 @@ static int imxrt_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg)
{
struct mii_ioctl_data_s *req =
(struct mii_ioctl_data_s *)((uintptr_t)arg);
- ret = imxrt_readmii(priv, req->phy_id, req->reg_num, &req->val_out);
+ ret = imxrt_readmii(priv, req->phy_id,
+ req->reg_num, &req->val_out);
}
break;
@@ -2037,9 +2041,10 @@ static inline int imxrt_initphy(struct imxrt_driver_s *priv, bool renogphy)
if (renogphy)
{
- /* Loop (potentially infinitely?) until we successfully communicate with
- * the PHY. This is 'standard stuff' that should work for any PHY - we
- * are not communicating with it's 'special' registers at this point.
+ /* Loop (potentially infinitely?) until we successfully communicate
+ * with the PHY. This is 'standard stuff' that should work for any PHY
+ * - we are not communicating with it's 'special' registers
+ * at this point.
*/
ninfo("%s: Try phyaddr: %u\n", BOARD_PHY_NAME, phyaddr);
@@ -2474,7 +2479,9 @@ int imxrt_netinitialize(int intf)
regval |= GPR_GPR1_ENET1_TX_CLK_OUT_EN;
putreg32(regval, IMXRT_IOMUXC_GPR_GPR1);
- /* Enable the ENET clock. Clock is on during all modes, except STOP mode. */
+ /* Enable the ENET clock. Clock is on during all modes,
+ * except STOP mode.
+ */
imxrt_clockall_enet();
@@ -2538,8 +2545,8 @@ int imxrt_netinitialize(int intf)
#ifdef CONFIG_NET_ETHERNET
/* Determine a semi-unique MAC address from MCU UID
* We use UID Low and Mid Low registers to get 64 bits, from which we keep
- * 48 bits. We then force unicast and locally administered bits (b0 and b1,
- * 1st octet)
+ * 48 bits. We then force unicast and locally administered bits
+ * (b0 and b1, 1st octet)
*/
/* hardcoded offset: todo: need proper header file */