Changeset 104302 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Apr 12, 2024 7:31:00 AM (8 months ago)

Author:

vboxsync

Message:

DevOHCI: Reworked ohciR3GetDirection() to not return a separate failure/success indicator.

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (6 diffs)

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

@@ -3088 +3088 @@
  * we do not raise an unrecoverable error but the caller may wish to.
  */
-static bool ohciR3GetDirection(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC, PCOHCIED pEd, VUSBDIRECTION *pEnmDir)
+static VUSBDIRECTION ohciR3GetDirection(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC, PCOHCIED pEd)
 {
     RT_NOREF(pThisCC);
@@ -3102 +3102 @@
             default:
                 Log(("ohciR3GetDirection: Invalid direction!!!! Ed.hwinfo=%#x\n", pEd->hwinfo));
-                *pEnmDir = VUSBDIRECTION_INVALID;
-                return false;
         }
     }
@@ -3124 +3122 @@
                     default:
                         Log(("ohciR3GetDirection: Invalid direction!!!! Td.hwinfo=%#x Ed.hwinfo=%#x\n", Td.hwinfo, pEd->hwinfo));
-                        *pEnmDir = VUSBDIRECTION_INVALID;
-                        return false;
                 }
         }
    }
 
-    *pEnmDir = enmDir;
-    return true;
+    return enmDir;
 }
 
@@ -3890 +3885 @@
                 uint8_t uAddr  = Ed.hwinfo & ED_HWINFO_FUNCTION;
                 uint8_t uEndPt = (Ed.hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
-                VUSBDIRECTION enmDir;
-                if (ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed, &enmDir))
+                VUSBDIRECTION enmDir = ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed);
+                if (enmDir != VUSBDIRECTION_INVALID)
                 {
                     pThisCC->RootHub.pIRhConn->pfnAbortEpByAddr(pThisCC->RootHub.pIRhConn, uAddr, uEndPt, enmDir);
@@ -3950 +3945 @@
                uint8_t uAddr  = Ed.hwinfo & ED_HWINFO_FUNCTION;
                uint8_t uEndPt = (Ed.hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
-               VUSBDIRECTION enmDir;
-               if (ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed, &enmDir))
+               VUSBDIRECTION enmDir = ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed);
+               if (enmDir != VUSBDIRECTION_INVALID)
                {
                    pThisCC->RootHub.pIRhConn->pfnAbortEpByAddr(pThisCC->RootHub.pIRhConn, uAddr, uEndPt, enmDir);
@@ -4120 +4115 @@
                 uint8_t uAddr  = Ed.hwinfo & ED_HWINFO_FUNCTION;
                 uint8_t uEndPt = (Ed.hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
-                VUSBDIRECTION enmDir;
-                if (ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed, &enmDir))
+                VUSBDIRECTION enmDir = ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed);
+                if (enmDir != VUSBDIRECTION_INVALID)
                 {
                     pThisCC->RootHub.pIRhConn->pfnAbortEpByAddr(pThisCC->RootHub.pIRhConn, uAddr, uEndPt, enmDir);