Changeset 44565 in vbox for trunk/src

Timestamp:

Feb 6, 2013 1:57:03 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83633

Message:

nits

File:

• trunk/src/VBox/Devices/Network/DevE1000Phy.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Network/DevE1000Phy.cpp

@@ -11 +11 @@
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -40 +40 @@
 # define SSMR3PutMem(a,b,c)
 # define SSMR3GetMem(a,b,c)
-#include <stdio.h>
+# include <stdio.h>
 # define PhyLog(a)               printf a
 #else /* PHY_UNIT_TEST */
@@ -58 +58 @@
     static void softReset(PPHY pPhy);
 
-    /* Generic handlers ******************************************************/
+    /** @name Generic handlers
+     * @{ */
     static uint16_t regReadDefault       (PPHY pPhy, uint32_t index);
     static void     regWriteDefault      (PPHY pPhy, uint32_t index, uint16_t u16Value);
@@ -65 +66 @@
     static uint16_t regReadUnimplemented (PPHY pPhy, uint32_t index);
     static void     regWriteUnimplemented(PPHY pPhy, uint32_t index, uint16_t u16Value);
-    /* Register-specific handlers ********************************************/
+    /** @} */
+    /** @name Register-specific handlers
+     * @{ */
     static void     regWritePCTRL        (PPHY pPhy, uint32_t index, uint16_t u16Value);
     static uint16_t regReadPSTATUS       (PPHY pPhy, uint32_t index);
     static uint16_t regReadGSTATUS       (PPHY pPhy, uint32_t index);
+    /** @} */
 
     /**
@@ -84 +88 @@
         void       (*pfnWrite)(PPHY pPhy, uint32_t index, uint16_t u16Value);
         /** Abbreviated name. */
-        const char *szAbbrev;
+        const char *pszAbbrev;
         /** Full name. */
-        const char *szName;
+        const char *pszName;
     } s_regMap[NUM_OF_PHY_REGS] =
     {
@@ -156 +160 @@
 {
     PhyLog(("PHY#%d At %02d read attempted from write-only '%s'\n",
-            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].szName));
+            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].pszName));
     return 0;
 }
@@ -171 +175 @@
 {
     PhyLog(("PHY#%d At %02d write attempted to read-only '%s'\n",
-            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].szName));
+            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].pszName));
 }
 
@@ -186 +190 @@
 {
     PhyLog(("PHY#%d At %02d read attempted from unimplemented '%s'\n",
-            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].szName));
+            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].pszName));
     return 0;
 }
@@ -201 +205 @@
 {
     PhyLog(("PHY#%d At %02d write attempted to unimplemented '%s'\n",
-            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].szName));
+            pPhy->iInstance, s_regMap[index].u32Address, s_regMap[index].pszName));
 }
 
@@ -244 +248 @@
         PhyLog(("PHY#%d At %02d read  %04X      from %s (%s)\n",
                 pPhy->iInstance, s_regMap[index].u32Address, u16,
-                s_regMap[index].szAbbrev, s_regMap[index].szName));
+                s_regMap[index].pszAbbrev, s_regMap[index].pszName));
     }
     else
@@ -268 +272 @@
         PhyLog(("PHY#%d At %02d write      %04X  to  %s (%s)\n",
                 pPhy->iInstance, s_regMap[index].u32Address, u16Value,
-                s_regMap[index].szAbbrev, s_regMap[index].szName));
+                s_regMap[index].pszAbbrev, s_regMap[index].pszName));
         s_regMap[index].pfnWrite(pPhy, index, u16Value);
     }
@@ -374 +378 @@
 
 #ifdef IN_RING3
+
 /**
  * Save PHY state.
@@ -404 +409 @@
     return SSMR3GetMem(pSSMHandle, pPhy->au16Regs, sizeof(pPhy->au16Regs));
 }
+
 #endif /* IN_RING3 */