From 804a97d16384e2098dd941cc458b8b54b5879f14 Mon Sep 17 00:00:00 2001
From: Shao Miller <Shao.Miller@yrdsb.edu.on.ca>
Date: Tue, 21 Dec 2010 08:24:35 -0500
Subject: [PATCH 1/1] [aoe] Rename aoe_bus to AoeBusMain

---
 src/aoe/bus.c    | 16 ++++++++--------
 src/aoe/driver.c |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/aoe/bus.c b/src/aoe/bus.c
index 026ebb2..5443934 100644
--- a/src/aoe/bus.c
+++ b/src/aoe/bus.c
@@ -51,7 +51,7 @@ winvblock__bool aoe_bus__create(void);
 void aoe_bus__free(void);
 
 /* Globals. */
-WV_SP_BUS_T aoe_bus = NULL;
+WV_SP_BUS_T AoeBusMain = NULL;
 static UNICODE_STRING AoeBusName_ = {
     sizeof AOE_M_BUS_NAME_,
     sizeof AOE_M_BUS_NAME_,
@@ -104,7 +104,7 @@ winvblock__bool aoe_bus__create(void) {
     NTSTATUS status;
 
     /* We should only be called once. */
-    if (aoe_bus) {
+    if (AoeBusMain) {
         DBG("AoE bus already created\n");
         return FALSE;
       }
@@ -131,13 +131,13 @@ winvblock__bool aoe_bus__create(void) {
         goto err_dos_symlink;
       }
     /* All done. */
-    aoe_bus = new_bus;
+    AoeBusMain = new_bus;
     return TRUE;
 
     IoDeleteSymbolicLink(&AoeBusDosname_);
     err_dos_symlink:
 
-    IoDeleteDevice(aoe_bus->Dev->Self);
+    IoDeleteDevice(AoeBusMain->Dev->Self);
     err_add_child:
 
     WvDevFree(new_bus->Dev);
@@ -148,16 +148,16 @@ winvblock__bool aoe_bus__create(void) {
 
 /* Destroy the AoE bus. */
 void aoe_bus__free(void) {
-    if (!aoe_bus)
+    if (!AoeBusMain)
       /* Nothing to do. */
       return;
 
     IoDeleteSymbolicLink(&AoeBusDosname_);
-    IoDeleteDevice(aoe_bus->Dev->Self);
+    IoDeleteDevice(AoeBusMain->Dev->Self);
     #if 0
-    bus__remove_child(driver__bus(), aoe_bus->Dev);
+    bus__remove_child(driver__bus(), AoeBusMain->Dev);
     #endif
-    WvDevFree(aoe_bus->Dev);
+    WvDevFree(AoeBusMain->Dev);
     return;
   }
 
diff --git a/src/aoe/driver.c b/src/aoe/driver.c
index ce01886..dc6a409 100644
--- a/src/aoe/driver.c
+++ b/src/aoe/driver.c
@@ -51,7 +51,7 @@ extern NTSTATUS STDCALL ZwWaitForSingleObject(
   );
 
 /* From aoe/bus.c */
-extern WV_SP_BUS_T aoe_bus;
+extern WV_SP_BUS_T AoeBusMain;
 extern winvblock__bool aoe_bus__create(void);
 extern void aoe_bus__free(void);
 
-- 
2.17.1