[bus] Rename bus__add_child to WvBusAddChild

diff --git a/src/aoe/bus.c b/src/aoe/bus.c
index 77bb01a..707e1cf 100644 (file)
--- a/src/aoe/bus.c
+++ b/src/aoe/bus.c
@@ -110,7 +110,7 @@ winvblock__bool aoe_bus__create(void) {
       );
     new_bus->named = TRUE;
     /* Add it as a sub-bus to WinVBlock. */
-    if (!bus__add_child(driver__bus(), new_bus->device)) {
+    if (!WvBusAddChild(driver__bus(), new_bus->device)) {
         DBG("Couldn't add AoE bus to WinVBlock bus!\n");
         goto err_add_child;
       }

diff --git a/src/aoe/driver.c b/src/aoe/driver.c
index 57fcab0..56b9d5b 100644 (file)
--- a/src/aoe/driver.c
+++ b/src/aoe/driver.c
@@ -2080,7 +2080,7 @@ static void aoe__process_abft_(void) {
     aoe_disk->Timeout = 200000;          /* 20 ms. */
     aoe_disk->disk->BootDrive = TRUE;
     aoe_disk->disk->media = disk__media_hard;
-    bus__add_child(driver__bus(), aoe_disk->disk->device);
+    WvBusAddChild(driver__bus(), aoe_disk->disk->device);
     return;
 
     out_no_abft:
@@ -2255,7 +2255,7 @@ NTSTATUS STDCALL aoe__mount(
     aoe_disk->Timeout = 200000;             /* 20 ms. */
     aoe_disk->disk->BootDrive = FALSE;
     aoe_disk->disk->media = disk__media_hard;
-    bus__add_child(driver__bus(), aoe_disk->disk->device);
+    WvBusAddChild(driver__bus(), aoe_disk->disk->device);
 
     return driver__complete_irp(irp, 0, STATUS_SUCCESS);
   }

diff --git a/src/include/bus.h b/src/include/bus.h
index 531ffa6..f8971fa 100644 (file)
--- a/src/include/bus.h
+++ b/src/include/bus.h
@@ -79,7 +79,7 @@ extern NTSTATUS STDCALL WvBusGetDevCapabilities(
   );
 extern winvblock__lib_func void WvBusInit(WV_SP_BUS_T);
 extern winvblock__lib_func WV_SP_BUS_T WvBusCreate(void);
-extern winvblock__lib_func winvblock__bool STDCALL bus__add_child(
+extern winvblock__lib_func winvblock__bool STDCALL WvBusAddChild(
     IN OUT WV_SP_BUS_T,
     IN struct device__type *
   );

diff --git a/src/winvblock/bus/bus.c b/src/winvblock/bus/bus.c
index 90555eb..487e5b5 100644 (file)
--- a/src/winvblock/bus/bus.c
+++ b/src/winvblock/bus/bus.c
@@ -84,7 +84,7 @@ struct device__irp_mj bus__irp_mj_ = {
  * @v dev_ptr           Points to the child device to add.
  * @ret                 TRUE for success, FALSE for failure.
  */
-winvblock__lib_func winvblock__bool STDCALL bus__add_child(
+winvblock__lib_func winvblock__bool STDCALL WvBusAddChild(
     IN OUT WV_SP_BUS_T bus_ptr,
     IN OUT struct device__type * dev_ptr
   ) {

diff --git a/src/winvblock/filedisk/filedisk.c b/src/winvblock/filedisk/filedisk.c
index 3f80b38..4a6c387 100644 (file)
--- a/src/winvblock/filedisk/filedisk.c
+++ b/src/winvblock/filedisk/filedisk.c
@@ -220,7 +220,7 @@ NTSTATUS STDCALL filedisk__attach(
       filedisk_ptr->hash += *path_iterator++;
   }
   /* Add the filedisk to the bus. */
-  if (!bus__add_child(driver__bus(), filedisk_ptr->disk->device)) {
+  if (!WvBusAddChild(driver__bus(), filedisk_ptr->disk->device)) {
       status = STATUS_UNSUCCESSFUL;
       goto err_add_child;
     }

diff --git a/src/winvblock/filedisk/grub4dos.c b/src/winvblock/filedisk/grub4dos.c
index 25ea42a..99634c9 100644 (file)
--- a/src/winvblock/filedisk/grub4dos.c
+++ b/src/winvblock/filedisk/grub4dos.c
@@ -492,7 +492,7 @@ filedisk_grub4dos__find (
          filedisk_ptr->disk->BootDrive = TRUE;
          FoundGrub4DosMapping = TRUE;
          /* Add the filedisk to the bus. */
-         if (!bus__add_child(driver__bus(), filedisk_ptr->disk->device))
+         if (!WvBusAddChild(driver__bus(), filedisk_ptr->disk->device))
       device__free(filedisk_ptr->disk->device);
        }
       InterruptVector = &SafeMbrHookPtr->PrevHook;

diff --git a/src/winvblock/ramdisk/grub4dos.c b/src/winvblock/ramdisk/grub4dos.c
index 0c56c15..f63d10c 100644 (file)
--- a/src/winvblock/ramdisk/grub4dos.c
+++ b/src/winvblock/ramdisk/grub4dos.c
@@ -145,7 +145,7 @@ ramdisk_grub4dos__find (
          ramdisk_ptr->disk->BootDrive = TRUE;
          FoundGrub4DosMapping = TRUE;
          /* Add the ramdisk to the bus. */
-         if (!bus__add_child(driver__bus(), ramdisk_ptr->disk->device))
+         if (!WvBusAddChild(driver__bus(), ramdisk_ptr->disk->device))
       device__free(ramdisk_ptr->disk->device);
        }
       InterruptVector = &SafeMbrHookPtr->PrevHook;

diff --git a/src/winvblock/ramdisk/memdisk.c b/src/winvblock/ramdisk/memdisk.c
index 653e0bc..a274994 100644 (file)
--- a/src/winvblock/ramdisk/memdisk.c
+++ b/src/winvblock/ramdisk/memdisk.c
@@ -109,7 +109,7 @@ check_mbft (
   ramdisk_ptr->disk->Sectors = mBFT->mdi.sectors;
   ramdisk_ptr->disk->BootDrive = TRUE;
   /* Add the ramdisk to the bus. */
-  if (!bus__add_child(driver__bus(), ramdisk_ptr->disk->device)) {
+  if (!WvBusAddChild(driver__bus(), ramdisk_ptr->disk->device)) {
       device__free(ramdisk_ptr->disk->device);
       return FALSE;
     }