Changeset 62699 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/dev

Timestamp:

Jul 29, 2016 4:01:21 PM (8 years ago)

Author:

vboxsync

Message:

vboxUsbPnPStateGbgChange: Corrected seemingly incorrect state assertion (was always true).

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev

Files:

• VBoxUsbDev.cpp (modified) (3 diffs)
• VBoxUsbDev.h (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp

@@ -302 +302 @@
 }
 
-#ifdef DEBUG
+#ifdef VBOX_STRICT
 DECLHIDDEN(VOID) vboxUsbPnPStateGbgChange(ENMVBOXUSB_PNPSTATE enmOldState, ENMVBOXUSB_PNPSTATE enmNewState)
 {
@@ -309 +309 @@
     {
         case ENMVBOXUSB_PNPSTATE_STARTED:
-            Assert(enmOldState == ENMVBOXUSB_PNPSTATE_START_PENDING
-                    || ENMVBOXUSB_PNPSTATE_REMOVE_PENDING
-                    || ENMVBOXUSB_PNPSTATE_STOPPED
-                    || ENMVBOXUSB_PNPSTATE_STOP_PENDING);
+            Assert(   enmOldState == ENMVBOXUSB_PNPSTATE_START_PENDING
+                   || enmOldState == ENMVBOXUSB_PNPSTATE_REMOVE_PENDING
+                   || enmOldState == ENMVBOXUSB_PNPSTATE_STOPPED
+                   || enmOldState == ENMVBOXUSB_PNPSTATE_STOP_PENDING);
             break;
         case ENMVBOXUSB_PNPSTATE_STOP_PENDING:
@@ -327 +327 @@
             break;
         case ENMVBOXUSB_PNPSTATE_REMOVED:
-            Assert(enmOldState == ENMVBOXUSB_PNPSTATE_REMOVE_PENDING
-                    || enmOldState == ENMVBOXUSB_PNPSTATE_SURPRISE_REMOVED);
+            Assert(   enmOldState == ENMVBOXUSB_PNPSTATE_REMOVE_PENDING
+                   || enmOldState == ENMVBOXUSB_PNPSTATE_SURPRISE_REMOVED);
             break;
         default:
-            AssertBreakpoint();
+            AssertFailed();
             break;
     }

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h

@@ -18 +18 @@
 #ifndef ___VBoxUsbDev_h___
 #define ___VBoxUsbDev_h___
+
 #include "VBoxUsbCmn.h"
+#include <VBox/cdefs.h>
 #include <iprt/assert.h>
 
@@ -45 +47 @@
 AssertCompile(sizeof (ENMVBOXUSB_PNPSTATE) == sizeof (uint32_t));
 
-#ifdef DEBUG
+#ifdef VBOX_STRICT
 DECLHIDDEN(VOID) vboxUsbPnPStateGbgChange(ENMVBOXUSB_PNPSTATE enmOld, ENMVBOXUSB_PNPSTATE enmNew);
 # define VBOXUSB_PNP_GBG_STATE_CHANGE(_old, _new) vboxUsbPnPStateGbgChange((_old), (_new))