[bus] Rename WV_E_BUS_STATE to WVL_E_BUS_STATE
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 04:07:41 +0000 (23:07 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 04:07:41 +0000 (23:07 -0500)
Along with enumeration values from WvBusState*
to WvlBusState*.

src/aoe/bus.c
src/include/bus.h
src/winvblock/bus/pnp.c

index c89d049..01ce096 100644 (file)
@@ -329,7 +329,7 @@ winvblock__bool AoeBusCreate(IN PDRIVER_OBJECT driver_obj) {
     AoeBusMain.Fdo->Flags |= DO_POWER_INRUSH;      /* FIXME? */
     AoeBusMain.Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
     #ifdef RIS
-    AoeBusMain.State = WvBusStateStarted;
+    AoeBusMain.State = WvlBusStateStarted;
     #endif
     /* All done. */
     DBG("Exit\n");
index f0d569d..f2e8c5d 100644 (file)
@@ -49,16 +49,16 @@ typedef NTSTATUS STDCALL WVL_F_BUS_PNP(IN WV_SP_BUS_T, IN PIRP);
 typedef WVL_F_BUS_PNP * WVL_FP_BUS_PNP;
 
 /* Device state. */
-typedef enum WV_BUS_STATE {
-    WvBusStateNotStarted,
-    WvBusStateStarted,
-    WvBusStateStopPending,
-    WvBusStateStopped,
-    WvBusStateRemovePending,
-    WvBusStateSurpriseRemovePending,
-    WvBusStateDeleted,
-    WvBusStates
-  } WV_E_BUS_STATE, * WV_EP_BUS_STATE;
+typedef enum WVL_BUS_STATE {
+    WvlBusStateNotStarted,
+    WvlBusStateStarted,
+    WvlBusStateStopPending,
+    WvlBusStateStopped,
+    WvlBusStateRemovePending,
+    WvlBusStateSurpriseRemovePending,
+    WvlBusStateDeleted,
+    WvlBusStates
+  } WVL_E_BUS_STATE, * WVL_EP_BUS_STATE;
 
 /* The bus type. */
 typedef struct WV_BUS_T {
@@ -69,8 +69,8 @@ typedef struct WV_BUS_T {
     WVL_FP_BUS_THREAD Thread;
     KEVENT ThreadSignal;
     winvblock__bool Stop;
-    WV_E_BUS_STATE OldState;
-    WV_E_BUS_STATE State;
+    WVL_E_BUS_STATE OldState;
+    WVL_E_BUS_STATE State;
     WVL_FP_BUS_PNP QueryDevText;
     struct {
         LIST_ENTRY Nodes;
index a46f2ec..0ff175f 100644 (file)
@@ -70,7 +70,7 @@ static NTSTATUS STDCALL WvBusPnpStartDev_(IN WV_SP_BUS_T bus, IN PIRP irp) {
       }
     if (NT_SUCCESS(status = irp->IoStatus.Status)) {
         bus->OldState = bus->State;
-        bus->State = WvBusStateStarted;
+        bus->State = WvlBusStateStarted;
       }
     return driver__complete_irp(
         irp,
@@ -98,7 +98,7 @@ static NTSTATUS STDCALL WvBusPnpRemoveDev_(IN WV_SP_BUS_T bus, IN PIRP irp) {
     status = STATUS_SUCCESS;
     lower = bus->LowerDeviceObject;
     bus->OldState = bus->State;
-    bus->State = WvBusStateDeleted;
+    bus->State = WvlBusStateDeleted;
     /* Pass the IRP on to any lower DEVICE_OBJECT */
     if (lower) {
         irp->IoStatus.Information = 0;
@@ -279,7 +279,7 @@ static NTSTATUS STDCALL WvBusPnpSimple_(
         case IRP_MN_QUERY_STOP_DEVICE:
           DBG("bus_pnp: IRP_MN_QUERY_STOP_DEVICE\n");
           bus->OldState = bus->State;
-          bus->State = WvBusStateStopPending;
+          bus->State = WvlBusStateStopPending;
           status = STATUS_SUCCESS;
           break;
 
@@ -292,14 +292,14 @@ static NTSTATUS STDCALL WvBusPnpSimple_(
         case IRP_MN_STOP_DEVICE:
           DBG("bus_pnp: IRP_MN_STOP_DEVICE\n");
           bus->OldState = bus->State;
-          bus->State = WvBusStateStopped;
+          bus->State = WvlBusStateStopped;
           status = STATUS_SUCCESS;
           break;
 
         case IRP_MN_QUERY_REMOVE_DEVICE:
           DBG("bus_pnp: IRP_MN_QUERY_REMOVE_DEVICE\n");
           bus->OldState = bus->State;
-          bus->State = WvBusStateRemovePending;
+          bus->State = WvlBusStateRemovePending;
           status = STATUS_SUCCESS;
           break;
 
@@ -312,7 +312,7 @@ static NTSTATUS STDCALL WvBusPnpSimple_(
         case IRP_MN_SURPRISE_REMOVAL:
           DBG("bus_pnp: IRP_MN_SURPRISE_REMOVAL\n");
           bus->OldState = bus->State;
-          bus->State = WvBusStateSurpriseRemovePending;
+          bus->State = WvlBusStateSurpriseRemovePending;
           status = STATUS_SUCCESS;
           break;