[winvblock/driver] Rename dev_ext member to device

Just cosmetic.  I am trying to hide the details of
Windows DEVICE_OBJECTs with their DeviceExtension.

diff --git a/src/aoe/driver.c b/src/aoe/driver.c
index 174cd71..5a358e6 100644 (file)
--- a/src/aoe/driver.c
+++ b/src/aoe/driver.c
@@ -812,7 +812,7 @@ DriverEntry (
       }
     else
       {
-       irp__reg_table ( &bus_ptr->dev_ext.irp_handler_chain, handling_table );
+       irp__reg_table ( &bus_ptr->device.irp_handler_chain, handling_table );
       }
   }
   DriverObject->DriverUnload = unload;
@@ -946,7 +946,7 @@ unload (
       }
     else
       {
-       irp__unreg_table ( &bus_ptr->dev_ext.irp_handler_chain,
+       irp__unreg_table ( &bus_ptr->device.irp_handler_chain,
                           handling_table );
       }
   }
@@ -979,7 +979,7 @@ disk__init_decl (
   winvblock__uint32 MTU;
   aoe_disk_type_ptr aoe_disk_ptr;
 
-  aoe_disk_ptr = get_aoe_disk_ptr ( &disk_ptr->dev_ext );
+  aoe_disk_ptr = get_aoe_disk_ptr ( &disk_ptr->device );
   /*
    * Allocate our disk search 
    */
@@ -995,7 +995,7 @@ disk__init_decl (
   /*
    * Initialize the disk search 
    */
-  disk_searcher->DeviceExtension = &disk_ptr->dev_ext;
+  disk_searcher->DeviceExtension = &disk_ptr->device;
   disk_searcher->next = NULL;
   aoe_disk_ptr->search_state = search_state_search_nic;
   KeResetEvent ( &disk_ptr->SearchEvent );
@@ -1176,7 +1176,7 @@ disk__init_decl (
              disk_search_walker = AoE_Globals_DiskSearchList;
              while ( disk_search_walker
                      && disk_search_walker->DeviceExtension !=
-                     &disk_ptr->dev_ext )
+                     &disk_ptr->device )
                {
                  previous_disk_searcher = disk_search_walker;
                  disk_search_walker = disk_search_walker->next;
@@ -1239,7 +1239,7 @@ disk__init_decl (
        }
       RtlZeroMemory ( tag, sizeof ( work_tag ) );
       tag->type = tag_type_search_drive;
-      tag->DeviceExtension = &disk_ptr->dev_ext;
+      tag->DeviceExtension = &disk_ptr->device;
 
       /*
        * Establish our tag's AoE packet 
@@ -2036,7 +2036,7 @@ disk__max_xfer_len_decl (
   max_xfer_len
  )
 {
-  aoe_disk_type_ptr aoe_disk_ptr = get_aoe_disk_ptr ( &disk_ptr->dev_ext );
+  aoe_disk_type_ptr aoe_disk_ptr = get_aoe_disk_ptr ( &disk_ptr->device );
 
   return disk_ptr->SectorSize * aoe_disk_ptr->MaxSectorsPerPacket;
 }
@@ -2046,7 +2046,7 @@ disk__pnp_id_decl (
   query_id
  )
 {
-  aoe_disk_type_ptr aoe_disk_ptr = get_aoe_disk_ptr ( &disk_ptr->dev_ext );
+  aoe_disk_type_ptr aoe_disk_ptr = get_aoe_disk_ptr ( &disk_ptr->device );
 
   switch ( query_type )
     {
@@ -2184,9 +2184,9 @@ process_abft (
       aoe_disk.disk.BootDrive = TRUE;
       aoe_disk.disk.media = disk__media_hard;
       aoe_disk.disk.ops = &default_ops;
-      aoe_disk.disk.dev_ext.ops = disk__get_ops (  );
-      aoe_disk.disk.dev_ext.size = sizeof ( aoe_disk_type );
-      bus__add_child ( &aoe_disk.disk.dev_ext );
+      aoe_disk.disk.device.ops = disk__get_ops (  );
+      aoe_disk.disk.device.size = sizeof ( aoe_disk_type );
+      bus__add_child ( &aoe_disk.disk.device );
     }
   else
     {
@@ -2276,7 +2276,7 @@ irp__handler_decl (
   while ( disk_walker != NULL )
     {
       count++;
-      disk_walker = ( disk__type_ptr ) disk_walker->dev_ext.next_sibling_ptr;
+      disk_walker = ( disk__type_ptr ) disk_walker->device.next_sibling_ptr;
     }
 
   if ( ( disks =
@@ -2301,7 +2301,7 @@ irp__handler_decl (
   while ( disk_walker != NULL )
     {
       aoe_disk_type_ptr aoe_disk_ptr =
-       get_aoe_disk_ptr ( &disk_walker->dev_ext );
+       get_aoe_disk_ptr ( &disk_walker->device );
 
       disks->Disk[count].Disk = disk_walker->DiskNumber;
       RtlCopyMemory ( &disks->Disk[count].ClientMac, &aoe_disk_ptr->ClientMac,
@@ -2312,7 +2312,7 @@ irp__handler_decl (
       disks->Disk[count].Minor = aoe_disk_ptr->Minor;
       disks->Disk[count].LBASize = disk_walker->LBADiskSize;
       count++;
-      disk_walker = ( disk__type_ptr ) disk_walker->dev_ext.next_sibling_ptr;
+      disk_walker = ( disk__type_ptr ) disk_walker->device.next_sibling_ptr;
     }
   RtlCopyMemory ( Irp->AssociatedIrp.SystemBuffer, disks,
                  ( Stack->Parameters.DeviceIoControl.OutputBufferLength <
@@ -2350,9 +2350,9 @@ irp__handler_decl (
   aoe_disk.disk.BootDrive = FALSE;
   aoe_disk.disk.media = disk__media_hard;
   aoe_disk.disk.ops = &default_ops;
-  aoe_disk.disk.dev_ext.ops = disk__get_ops (  );
-  aoe_disk.disk.dev_ext.size = sizeof ( aoe_disk_type );
-  bus__add_child ( &aoe_disk.disk.dev_ext );
+  aoe_disk.disk.device.ops = disk__get_ops (  );
+  aoe_disk.disk.device.size = sizeof ( aoe_disk_type );
+  bus__add_child ( &aoe_disk.disk.device );
   Irp->IoStatus.Information = 0;
   *completion_ptr = TRUE;
   return STATUS_SUCCESS;

diff --git a/src/include/bus.h b/src/include/bus.h
index 9d9b56f..d09eb85 100644 (file)
--- a/src/include/bus.h
+++ b/src/include/bus.h
@@ -30,7 +30,7 @@
 
 winvblock__def_struct ( bus__type )
 {
-  device__type dev_ext;
+  device__type device;
   PDEVICE_OBJECT LowerDeviceObject;
   PDEVICE_OBJECT PhysicalDeviceObject;
   winvblock__uint32 Children;

diff --git a/src/include/disk.h b/src/include/disk.h
index 7d7f796..caded34 100644 (file)
--- a/src/include/disk.h
+++ b/src/include/disk.h
@@ -186,7 +186,7 @@ winvblock__def_struct ( disk__ops )
 
 struct _disk__type
 {
-  device__type dev_ext;
+  device__type device;
   KEVENT SearchEvent;
   KSPIN_LOCK SpinLock;
   winvblock__bool BootDrive;

diff --git a/src/include/driver.h b/src/include/driver.h
index 107ebac..08fe286 100644 (file)
--- a/src/include/driver.h
+++ b/src/include/driver.h
@@ -62,7 +62,7 @@ winvblock__def_struct ( device__type );
 /**
  * Device PDO creation routine
  *
- * @v dev_ext_ptr     The device whose PDO should be created
+ * @v dev_ptr           The device whose PDO should be created
  */
 #  define driver__dev_create_pdo_decl( x ) \
 \

diff --git a/src/winvblock/bus/dev_ctl.c b/src/winvblock/bus/dev_ctl.c
index 41653ef..c178c15 100644 (file)
--- a/src/winvblock/bus/dev_ctl.c
+++ b/src/winvblock/bus/dev_ctl.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * Copyright (C) 2009-2010, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  * Copyright 2006-2008, V.
  * For WinAoE contact information, see http://winaoe.org/
  *
@@ -56,7 +56,7 @@ irp__handler_decl (
          && ( disk_walker->DiskNumber != *( winvblock__uint32_ptr ) buffer ) )
     {
       prev_disk_walker = disk_walker;
-      disk_walker = ( disk__type_ptr ) disk_walker->dev_ext.next_sibling_ptr;
+      disk_walker = ( disk__type_ptr ) disk_walker->device.next_sibling_ptr;
     }
   if ( disk_walker != NULL )
     {
@@ -70,15 +70,15 @@ irp__handler_decl (
       if ( disk_walker == ( disk__type_ptr ) bus_ptr->first_child_ptr )
        {
          bus_ptr->first_child_ptr =
-           ( winvblock__uint8_ptr ) disk_walker->dev_ext.next_sibling_ptr;
+           ( winvblock__uint8_ptr ) disk_walker->device.next_sibling_ptr;
        }
       else
        {
-         prev_disk_walker->dev_ext.next_sibling_ptr =
-           disk_walker->dev_ext.next_sibling_ptr;
+         prev_disk_walker->device.next_sibling_ptr =
+           disk_walker->device.next_sibling_ptr;
        }
       disk_walker->Unmount = TRUE;
-      disk_walker->dev_ext.next_sibling_ptr = NULL;
+      disk_walker->device.next_sibling_ptr = NULL;
       if ( bus_ptr->PhysicalDeviceObject != NULL )
        IoInvalidateDeviceRelations ( bus_ptr->PhysicalDeviceObject,
                                      BusRelations );

diff --git a/src/winvblock/bus/pnp.c b/src/winvblock/bus/pnp.c
index 6aead7b..7a6af48 100644 (file)
--- a/src/winvblock/bus/pnp.c
+++ b/src/winvblock/bus/pnp.c
@@ -132,7 +132,7 @@ irp__handler_decl ( bus_pnp__query_dev_relations )
   while ( walker != NULL )
     {
       count++;
-      walker = ( disk__type_ptr ) walker->dev_ext.next_sibling_ptr;
+      walker = ( disk__type_ptr ) walker->device.next_sibling_ptr;
     }
   dev_relations =
     ( PDEVICE_RELATIONS ) ExAllocatePool ( NonPagedPool,
@@ -155,10 +155,10 @@ irp__handler_decl ( bus_pnp__query_dev_relations )
   walker = ( disk__type_ptr ) bus_ptr->first_child_ptr;
   while ( walker != NULL )
     {
-      ObReferenceObject ( walker->dev_ext.Self );
-      dev_relations->Objects[count] = walker->dev_ext.Self;
+      ObReferenceObject ( walker->device.Self );
+      dev_relations->Objects[count] = walker->device.Self;
       count++;
-      walker = ( disk__type_ptr ) walker->dev_ext.next_sibling_ptr;
+      walker = ( disk__type_ptr ) walker->device.next_sibling_ptr;
     }
   Irp->IoStatus.Information = ( ULONG_PTR ) dev_relations;
   status = STATUS_SUCCESS;

diff --git a/src/winvblock/disk/disk.c b/src/winvblock/disk/disk.c
index bad6d11..68e7c8b 100644 (file)
--- a/src/winvblock/disk/disk.c
+++ b/src/winvblock/disk/disk.c
@@ -179,7 +179,7 @@ driver__dev_create_pdo_decl (
    * the device extension space size requirement appropriately
    */
   status =
-    IoCreateDevice ( driver__obj_ptr, disk_ptr->dev_ext.size, NULL,
+    IoCreateDevice ( driver__obj_ptr, disk_ptr->device.size, NULL,
                     disk_types[disk_ptr->media],
                     FILE_AUTOGENERATED_DEVICE_NAME | FILE_DEVICE_SECURE_OPEN |
                     characteristics[disk_ptr->media], FALSE, &dev_obj_ptr );
@@ -196,11 +196,11 @@ driver__dev_create_pdo_decl (
   /*
    * Clear the extension space and establish parameters
    */
-  RtlZeroMemory ( dev_ptr, disk_ptr->dev_ext.size );
+  RtlZeroMemory ( dev_ptr, disk_ptr->device.size );
   /*
    * Copy the provided disk parameters into the disk extension space
    */
-  RtlCopyMemory ( dev_ptr, &disk_ptr->dev_ext, disk_ptr->dev_ext.size );
+  RtlCopyMemory ( dev_ptr, &disk_ptr->device, disk_ptr->device.size );
   /*
    * Universal disk properties the caller needn't bother with
    */

diff --git a/src/winvblock/filedisk.c b/src/winvblock/filedisk.c
index 367ac75..56174ea 100644 (file)
--- a/src/winvblock/filedisk.c
+++ b/src/winvblock/filedisk.c
@@ -88,7 +88,7 @@ disk__pnp_id_decl (
   query_id
  )
 {
-  filedisk__type_ptr filedisk_ptr = filedisk__get_ptr ( &disk_ptr->dev_ext );
+  filedisk__type_ptr filedisk_ptr = filedisk__get_ptr ( &disk_ptr->device );
   static PWCHAR hw_ids[disk__media_count] =
     { winvblock__literal_w L"\\FileFloppyDisk",
     winvblock__literal_w L"\\FileHardDisk",
@@ -200,9 +200,9 @@ irp__handler_decl ( filedisk__attach )
       filedisk.hash += *path_iterator++;
   }
   filedisk.disk.ops = &default_ops;
-  filedisk.disk.dev_ext.ops = &disk__dev_ops;
-  filedisk.disk.dev_ext.size = sizeof ( filedisk__type );
-  bus__add_child ( &filedisk.disk.dev_ext );
+  filedisk.disk.device.ops = &disk__dev_ops;
+  filedisk.disk.device.size = sizeof ( filedisk__type );
+  bus__add_child ( &filedisk.disk.device );
   return STATUS_SUCCESS;
 }
 
@@ -211,7 +211,7 @@ disk__close_decl (
   close
  )
 {
-  filedisk__type_ptr filedisk_ptr = filedisk__get_ptr ( &disk_ptr->dev_ext );
+  filedisk__type_ptr filedisk_ptr = filedisk__get_ptr ( &disk_ptr->device );
   ZwClose ( filedisk_ptr->file );
   return;
 }

diff --git a/src/winvblock/ramdisk/grub4dos.c b/src/winvblock/ramdisk/grub4dos.c
index 99ad7b6..744d3b2 100644 (file)
--- a/src/winvblock/ramdisk/grub4dos.c
+++ b/src/winvblock/ramdisk/grub4dos.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * Copyright (C) 2009-2010, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  *
  * This file is part of WinVBlock, derived from WinAoE.
  *
@@ -155,10 +155,10 @@ grub4dos__find (
                                         ramdisk.disk.Sectors );
          ramdisk.disk.BootDrive = TRUE;
          ramdisk.disk.ops = &ramdisk__default_ops;
-         ramdisk.disk.dev_ext.ops = &disk__dev_ops;
-         ramdisk.disk.dev_ext.size = sizeof ( ramdisk__type );
+         ramdisk.disk.device.ops = &disk__dev_ops;
+         ramdisk.disk.device.size = sizeof ( ramdisk__type );
          FoundGrub4DosMapping = TRUE;
-         bus__add_child ( &ramdisk.disk.dev_ext );
+         bus__add_child ( &ramdisk.disk.device );
        }
       InterruptVector = &SafeMbrHookPtr->PrevHook;
     }

diff --git a/src/winvblock/ramdisk/memdisk.c b/src/winvblock/ramdisk/memdisk.c
index 492c0f7..d107916 100644 (file)
--- a/src/winvblock/ramdisk/memdisk.c
+++ b/src/winvblock/ramdisk/memdisk.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
+ * Copyright (C) 2009-2010, Shao Miller <shao.miller@yrdsb.edu.on.ca>.
  *
  * This file is part of WinVBlock, derived from WinAoE.
  *
@@ -104,9 +104,9 @@ check_mbft (
   ramdisk.disk.Sectors = mBFT->mdi.sectors;
   ramdisk.disk.BootDrive = TRUE;
   ramdisk.disk.ops = &ramdisk__default_ops;
-  ramdisk.disk.dev_ext.ops = &disk__dev_ops;
-  ramdisk.disk.dev_ext.size = sizeof ( ramdisk__type );
-  bus__add_child ( &ramdisk.disk.dev_ext );
+  ramdisk.disk.device.ops = &disk__dev_ops;
+  ramdisk.disk.device.size = sizeof ( ramdisk__type );
+  bus__add_child ( &ramdisk.disk.device );
   AssociatedHook->Flags = 1;
   return TRUE;
 }

diff --git a/src/winvblock/ramdisk/ramdisk.c b/src/winvblock/ramdisk/ramdisk.c
index 6377b26..9b77615 100644 (file)
--- a/src/winvblock/ramdisk/ramdisk.c
+++ b/src/winvblock/ramdisk/ramdisk.c
@@ -106,7 +106,7 @@ disk__pnp_id_decl (
   query_id
  )
 {
-  ramdisk__type_ptr ramdisk_ptr = ramdisk__get_ptr ( &disk_ptr->dev_ext );
+  ramdisk__type_ptr ramdisk_ptr = ramdisk__get_ptr ( &disk_ptr->device );
   static PWCHAR hw_ids[disk__media_count] =
     { winvblock__literal_w L"\\RAMFloppyDisk",
     winvblock__literal_w L"\\RAMHardDisk",