Changeset 44571 in vbox

Timestamp:

Feb 6, 2013 2:10:37 PM (12 years ago)

Author:

vboxsync

Message:

Fixed hungarian typos in MSI registration code. Some E1000 prefix adjustments.

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchIntelHDA.cpp (modified) (1 diff)
• Network/DevE1000.cpp (modified) (13 diffs)
• Storage/DevAHCI.cpp (modified) (1 diff)
• Storage/DevLsiLogicSCSI.cpp (modified) (1 diff)
• USB/DevOHCI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp

@@ -2604 +2604 @@
 
 #ifdef VBOX_WITH_MSI_DEVICES
-    PDMMSIREG aMsiReg;
-
-    RT_ZERO(aMsiReg);
-    aMsiReg.cMsiVectors = 1;
-    aMsiReg.iMsiCapOffset = 0x60;
-    aMsiReg.iMsiNextOffset = 0x50;
-    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
+    PDMMSIREG MsiReg;
+    RT_ZERO(MsiReg);
+    MsiReg.cMsiVectors    = 1;
+    MsiReg.iMsiCapOffset  = 0x60;
+    MsiReg.iMsiNextOffset = 0x50;
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
     if (RT_FAILURE (rc))
     {

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

@@ -2983 +2983 @@
  *
  * @remarks Write into RDT forces switch to HC and signal to
- *          e1kNetworkDown_WaitReceiveAvail().
+ *          e1kR3NetworkDown_WaitReceiveAvail().
  *
  * @returns VBox status code.
@@ -5183 +5183 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
  */
-static DECLCALLBACK(void) e1kNetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
+static DECLCALLBACK(void) e1kR3NetworkDown_XmitPending(PPDMINETWORKDOWN pInterface)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkDown);
@@ -6072 +6072 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnWaitReceiveAvail}
  */
-static DECLCALLBACK(int) e1kNetworkDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
+static DECLCALLBACK(int) e1kR3NetworkDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkDown);
@@ -6095 +6095 @@
             break;
         }
-        E1kLogRel(("E1000 e1kNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
-        E1kLog(("%s e1kNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", pThis->szPrf, cMillies));
+        E1kLogRel(("E1000 e1kR3NetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
+        E1kLog(("%s e1kR3NetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", pThis->szPrf, cMillies));
         RTSemEventWait(pThis->hEventMoreRxDescAvail, cMillies);
     }
@@ -6290 +6290 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnReceive}
  */
-static DECLCALLBACK(int) e1kNetworkDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
+static DECLCALLBACK(int) e1kR3NetworkDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkDown);
@@ -6348 +6348 @@
  * @interface_method_impl{PDMILEDPORTS,pfnQueryStatusLed}
  */
-static DECLCALLBACK(int) e1kQueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
+static DECLCALLBACK(int) e1kR3QueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, ILeds);
@@ -6367 +6367 @@
  * @interface_method_impl{PDMINETWORKCONFIG,pfnGetMac}
  */
-static DECLCALLBACK(int) e1kGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
+static DECLCALLBACK(int) e1kR3GetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkConfig);
@@ -6377 +6377 @@
  * @interface_method_impl{PDMINETWORKCONFIG,pfnGetLinkState}
  */
-static DECLCALLBACK(PDMNETWORKLINKSTATE) e1kGetLinkState(PPDMINETWORKCONFIG pInterface)
+static DECLCALLBACK(PDMNETWORKLINKSTATE) e1kR3GetLinkState(PPDMINETWORKCONFIG pInterface)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkConfig);
@@ -6388 +6388 @@
  * @interface_method_impl{PDMINETWORKCONFIG,pfnSetLinkState}
  */
-static DECLCALLBACK(int) e1kSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
+static DECLCALLBACK(int) e1kR3SetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkConfig);
@@ -6429 +6429 @@
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) e1kQueryInterface(struct PDMIBASE *pInterface, const char *pszIID)
+static DECLCALLBACK(void *) e1kR3QueryInterface(struct PDMIBASE *pInterface, const char *pszIID)
 {
     PE1KSTATE pThis = RT_FROM_MEMBER(pInterface, E1KSTATE, IBase);
@@ -7342 +7342 @@
 
     /* Interfaces */
-    pThis->IBase.pfnQueryInterface          = e1kQueryInterface;
-
-    pThis->INetworkDown.pfnWaitReceiveAvail = e1kNetworkDown_WaitReceiveAvail;
-    pThis->INetworkDown.pfnReceive          = e1kNetworkDown_Receive;
-    pThis->INetworkDown.pfnXmitPending      = e1kNetworkDown_XmitPending;
-
-    pThis->ILeds.pfnQueryStatusLed          = e1kQueryStatusLed;
-
-    pThis->INetworkConfig.pfnGetMac         = e1kGetMac;
-    pThis->INetworkConfig.pfnGetLinkState   = e1kGetLinkState;
-    pThis->INetworkConfig.pfnSetLinkState   = e1kSetLinkState;
+    pThis->IBase.pfnQueryInterface          = e1kR3QueryInterface;
+
+    pThis->INetworkDown.pfnWaitReceiveAvail = e1kR3NetworkDown_WaitReceiveAvail;
+    pThis->INetworkDown.pfnReceive          = e1kR3NetworkDown_Receive;
+    pThis->INetworkDown.pfnXmitPending      = e1kR3NetworkDown_XmitPending;
+
+    pThis->ILeds.pfnQueryStatusLed          = e1kR3QueryStatusLed;
+
+    pThis->INetworkConfig.pfnGetMac         = e1kR3GetMac;
+    pThis->INetworkConfig.pfnGetLinkState   = e1kR3GetLinkState;
+    pThis->INetworkConfig.pfnSetLinkState   = e1kR3SetLinkState;
 
     /*
@@ -7383 +7383 @@
 
     /* Get config params */
-    rc = CFGMR3QueryBytes(pCfg, "MAC", pThis->macConfigured.au8,
-                          sizeof(pThis->macConfigured.au8));
+    rc = CFGMR3QueryBytes(pCfg, "MAC", pThis->macConfigured.au8, sizeof(pThis->macConfigured.au8));
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -7470 +7469 @@
 
 #ifdef E1K_WITH_MSI
-    PDMMSIREG aMsiReg;
-    aMsiReg.cMsiVectors = 1;
-    aMsiReg.iMsiCapOffset = 0x80;
-    aMsiReg.iMsiNextOffset = 0x0;
-    aMsiReg.fMsi64bit = false;
-    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
-    AssertRC(rc);
-    if (RT_FAILURE (rc))
-        return rc;
+    PDMMSIREG MsiReg;
+    RT_ZERO(MsiReg);
+    MsiReg.cMsiVectors    = 1;
+    MsiReg.iMsiCapOffset  = 0x80;
+    MsiReg.iMsiNextOffset = 0x0;
+    MsiReg.fMsi64bit      = false;
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
+    AssertRCReturn(rc, rc);
 #endif
 

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -7995 +7995 @@
 
 #ifdef VBOX_WITH_MSI_DEVICES
-    PDMMSIREG aMsiReg;
-
-    RT_ZERO(aMsiReg);
-    aMsiReg.cMsiVectors = 1;
-    aMsiReg.iMsiCapOffset = 0x80;
-    aMsiReg.iMsiNextOffset = 0x70;
-    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
-    if (RT_FAILURE (rc))
+    PDMMSIREG MsiReg;
+    RT_ZERO(MsiReg);
+    MsiReg.cMsiVectors    = 1;
+    MsiReg.iMsiCapOffset  = 0x80;
+    MsiReg.iMsiNextOffset = 0x70;
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
+    if (RT_FAILURE(rc))
     {
         LogRel(("Chipset cannot do MSI: %Rrc\n", rc));

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -5073 +5073 @@
 
 #ifdef VBOX_WITH_MSI_DEVICES
-    PDMMSIREG aMsiReg;
-    RT_ZERO(aMsiReg);
+    PDMMSIREG MsiReg;
+    RT_ZERO(MsiReg);
     /* use this code for MSI-X support */
-#if 0
-    aMsiReg.cMsixVectors = 1;
-    aMsiReg.iMsixCapOffset = 0x80;
-    aMsiReg.iMsixNextOffset = 0x0;
-    aMsiReg.iMsixBar = 3;
-#else
-    aMsiReg.cMsiVectors = 1;
-    aMsiReg.iMsiCapOffset = 0x80;
-    aMsiReg.iMsiNextOffset = 0x0;
-#endif
-    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
+# if 0
+    MsiReg.cMsixVectors    = 1;
+    MsiReg.iMsixCapOffset  = 0x80;
+    MsiReg.iMsixNextOffset = 0x00;
+    MsiReg.iMsixBar        = 3;
+# else
+    MsiReg.cMsiVectors     = 1;
+    MsiReg.iMsiCapOffset   = 0x80;
+    MsiReg.iMsiNextOffset  = 0x00;
+# endif
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
     if (RT_FAILURE (rc))
     {

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -5425 +5425 @@
 
 #ifdef VBOX_WITH_MSI_DEVICES
-    PDMMSIREG aMsiReg;
-    RT_ZERO(aMsiReg);
-    aMsiReg.cMsiVectors = 1;
-    aMsiReg.iMsiCapOffset = 0x80;
-    aMsiReg.iMsiNextOffset = 0x0;
-    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
+    PDMMSIREG MsiReg;
+    RT_ZERO(MsiReg);
+    MsiReg.cMsiVectors    = 1;
+    MsiReg.iMsiCapOffset  = 0x80;
+    MsiReg.iMsiNextOffset = 0x00;
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &MsiReg);
     if (RT_FAILURE(rc))
     {