[bus] Don't use winvblock__def_struct for bus__type

diff --git a/src/aoe/driver.c b/src/aoe/driver.c
index 83ab43b..92fbfd8 100644 (file)
--- a/src/aoe/driver.c
+++ b/src/aoe/driver.c
@@ -810,7 +810,7 @@ NTSTATUS STDCALL DriverEntry(
       }
   
     {
-      bus__type_ptr bus_ptr = bus__boot (  );
+      struct bus__type * bus_ptr = bus__boot();
       if ( !bus_ptr )
         {
        DBG ( "Unable to register for IOCTLs!\n" );
@@ -917,7 +917,7 @@ static void STDCALL aoe__unload_(IN PDRIVER_OBJECT DriverObject)
     /* Release the global spin-lock. */
     KeReleaseSpinLock ( &aoe__spinlock_, Irql );
     {
-      bus__type_ptr bus_ptr = bus__boot (  );
+      struct bus__type * bus_ptr = bus__boot();
       if ( !bus_ptr )
         {
        DBG ( "Unable to un-register IOCTLs!\n" );
@@ -2176,7 +2176,7 @@ static NTSTATUS STDCALL show(
   {
     winvblock__uint32 count;
     device__type_ptr dev_walker;
-    bus__type_ptr bus_ptr;
+    struct bus__type * bus_ptr;
     aoe__mount_disks_ptr disks;
   
     DBG ( "Got IOCTL_AOE_SHOW...\n" );

diff --git a/src/include/bus.h b/src/include/bus.h
index e545f45..cf724a0 100644 (file)
--- a/src/include/bus.h
+++ b/src/include/bus.h
@@ -27,7 +27,7 @@
  * Bus specifics.
  */
 
-winvblock__def_struct(bus__type) {
+struct bus__type {
     device__type_ptr device;
     PDEVICE_OBJECT LowerDeviceObject;
     PDEVICE_OBJECT PhysicalDeviceObject;
@@ -69,7 +69,7 @@ extern void bus__finalize(void);
  * bus__type, track it in a global list, as well as populate the bus
  * with default values.
  */
-extern winvblock__lib_func bus__type_ptr bus__create(void);
+extern winvblock__lib_func struct bus__type * bus__create(void);
 
 /**
  * Add a child node to the bus.
@@ -80,7 +80,7 @@ extern winvblock__lib_func bus__type_ptr bus__create(void);
  * Returns TRUE for success, FALSE for failure.
  */
 extern winvblock__lib_func winvblock__bool STDCALL bus__add_child(
-    IN OUT bus__type_ptr bus_ptr,
+    IN OUT struct bus__type * bus_ptr,
     IN device__type_ptr dev_ptr
   );
 
@@ -89,8 +89,8 @@ extern winvblock__lib_func winvblock__bool STDCALL bus__add_child(
  *
  * @ret         A pointer to the bus device's extension space, or NULL.
  */
-extern winvblock__lib_func bus__type_ptr bus__boot(void);
+extern winvblock__lib_func struct bus__type * bus__boot(void);
 
-extern winvblock__lib_func bus__type_ptr bus__get(device__type_ptr dev);
+extern winvblock__lib_func struct bus__type * bus__get(device__type_ptr dev);
 
 #endif  /* _BUS_H */

diff --git a/src/winvblock/bus/bus.c b/src/winvblock/bus/bus.c
index 368051f..2efb932 100644 (file)
--- a/src/winvblock/bus/bus.c
+++ b/src/winvblock/bus/bus.c
@@ -71,7 +71,7 @@ void bus__finalize(void) {
  * @ret                 TRUE for success, FALSE for failure.
  */
 winvblock__lib_func winvblock__bool STDCALL bus__add_child(
-    IN OUT bus__type_ptr bus_ptr,
+    IN OUT struct bus__type * bus_ptr,
     IN OUT device__type_ptr dev_ptr
   ) {
     /**
@@ -128,7 +128,7 @@ static NTSTATUS STDCALL sys_ctl(
     IN struct _device__type * dev_ptr,
     OUT winvblock__bool_ptr completion_ptr
   ) {
-    bus__type_ptr bus_ptr = bus__get(dev_ptr);
+    struct bus__type * bus_ptr = bus__get(dev_ptr);
     DBG("...\n");
     IoSkipCurrentIrpStackLocation(Irp);
     *completion_ptr = TRUE;
@@ -142,7 +142,7 @@ static NTSTATUS STDCALL power(
     IN struct _device__type * dev_ptr,
     OUT winvblock__bool_ptr completion_ptr
   ) {
-    bus__type_ptr bus_ptr = bus__get(dev_ptr);
+    struct bus__type * bus_ptr = bus__get(dev_ptr);
     PoStartNextPowerIrp(Irp);
     IoSkipCurrentIrpStackLocation(Irp);
     *completion_ptr = TRUE;
@@ -208,7 +208,7 @@ static NTSTATUS STDCALL attach_fdo(
     IN PDEVICE_OBJECT PhysicalDeviceObject
   ) {
     PLIST_ENTRY walker;
-    bus__type_ptr bus_ptr;
+    struct bus__type * bus_ptr;
     NTSTATUS status;
     PUNICODE_STRING dev_name = NULL;
     PDEVICE_OBJECT fdo = NULL;
@@ -218,7 +218,7 @@ static NTSTATUS STDCALL attach_fdo(
     /* Search for the associated bus. */
     walker = bus__list_.Flink;
     while (walker != &bus__list_) {
-        bus_ptr = CONTAINING_RECORD(walker, bus__type, tracking);
+        bus_ptr = CONTAINING_RECORD(walker, struct bus__type, tracking);
         if (bus_ptr->PhysicalDeviceObject == PhysicalDeviceObject)
           break;
         walker = walker->Flink;
@@ -354,9 +354,9 @@ static NTSTATUS STDCALL bus_dispatch(
  *
  * See the header file for additional details.
  */
-winvblock__lib_func bus__type_ptr bus__create(void) {
+winvblock__lib_func struct bus__type * bus__create(void) {
     device__type_ptr dev_ptr;
-    bus__type_ptr bus_ptr;
+    struct bus__type * bus_ptr;
   
     /* Try to create a device. */
     dev_ptr = device__create();
@@ -401,7 +401,7 @@ winvblock__lib_func bus__type_ptr bus__create(void) {
  */
 static device__create_pdo_decl(bus__create_pdo_) {
     PDEVICE_OBJECT pdo_ptr = NULL;
-    bus__type_ptr bus_ptr;
+    struct bus__type * bus_ptr;
     NTSTATUS status;
   
     /* Note the bus device needing a PDO. */
@@ -409,7 +409,7 @@ static device__create_pdo_decl(bus__create_pdo_) {
         DBG("No device passed\n");
         return NULL;
       }
-    bus_ptr = (bus__type_ptr) dev_ptr->ext;
+    bus_ptr = bus__get(dev_ptr);
     /* Always create the root-enumerated bus device. */
     IoReportDetectedDevice(
         driver__obj_ptr,
@@ -454,7 +454,7 @@ static device__create_pdo_decl(bus__create_pdo_) {
  * @ret ntstatus        STATUS_SUCCESS or the NTSTATUS for a failure.
  */
 NTSTATUS bus__init(void) {
-    bus__type_ptr boot_bus_ptr;
+    struct bus__type * boot_bus_ptr;
   
     /* Initialize the global list of devices. */
     InitializeListHead(&bus__list_);
@@ -490,7 +490,7 @@ NTSTATUS bus__init(void) {
  * @v dev_ptr           Points to the bus device to delete.
  */
 static void STDCALL bus__free_(IN device__type_ptr dev_ptr) {
-    bus__type_ptr bus_ptr = bus__get(dev_ptr);
+    struct bus__type * bus_ptr = bus__get(dev_ptr);
     /* Free the "inherited class". */
     bus_ptr->prev_free(dev_ptr);
     /*
@@ -508,7 +508,7 @@ static void STDCALL bus__free_(IN device__type_ptr dev_ptr) {
  *
  * @ret         A pointer to the boot bus, or NULL.
  */
-winvblock__lib_func bus__type_ptr bus__boot(void) {
+winvblock__lib_func struct bus__type * bus__boot(void) {
     if (!bus__boot_fdo_) {
         DBG("No boot bus device!\n");
         return NULL;
@@ -521,6 +521,6 @@ winvblock__lib_func bus__type_ptr bus__boot(void) {
  *
  * @v dev       A pointer to a device.
  */
-extern winvblock__lib_func bus__type_ptr bus__get(device__type_ptr dev) {
+extern winvblock__lib_func struct bus__type * bus__get(device__type_ptr dev) {
     return dev->ext;
   }

diff --git a/src/winvblock/bus/dev_ctl.c b/src/winvblock/bus/dev_ctl.c
index c26105f..f8c2dd3 100644 (file)
--- a/src/winvblock/bus/dev_ctl.c
+++ b/src/winvblock/bus/dev_ctl.c
@@ -50,7 +50,7 @@ static NTSTATUS STDCALL disk_detach(
   device__type_ptr dev_walker;
   disk__type_ptr disk_walker = NULL,
     prev_disk_walker;
-  bus__type_ptr bus_ptr;
+  struct bus__type * bus_ptr;
 
   DBG ( "Request to detach disk: %d\n", *( winvblock__uint32_ptr ) buffer );
   bus_ptr = bus__get(dev_ptr);

diff --git a/src/winvblock/bus/pnp.c b/src/winvblock/bus/pnp.c
index 7ba92d6..e6b4177 100644 (file)
--- a/src/winvblock/bus/pnp.c
+++ b/src/winvblock/bus/pnp.c
@@ -59,7 +59,7 @@ NTSTATUS STDCALL bus_pnp__start_dev(
 {
   NTSTATUS status;
   KEVENT event;
-  bus__type_ptr bus_ptr;
+  struct bus__type * bus_ptr;
 
   bus_ptr = bus__get(dev_ptr);
   KeInitializeEvent ( &event, NotificationEvent, FALSE );
@@ -94,7 +94,7 @@ NTSTATUS STDCALL bus_pnp__remove_dev(
   )
 {
   NTSTATUS status;
-  bus__type_ptr bus_ptr;
+  struct bus__type * bus_ptr;
   device__type_ptr walker,
    next;
 
@@ -132,7 +132,7 @@ NTSTATUS STDCALL bus_pnp__query_dev_relations(
   )
 {
   NTSTATUS status;
-  bus__type_ptr bus_ptr;
+  struct bus__type * bus_ptr;
   winvblock__uint32 count;
   device__type_ptr walker;
   PDEVICE_RELATIONS dev_relations;
@@ -197,7 +197,7 @@ NTSTATUS STDCALL bus_pnp__simple(
   )
 {
   NTSTATUS status;
-  bus__type_ptr bus_ptr;
+  struct bus__type * bus_ptr;
 
   bus_ptr = bus__get(dev_ptr);
   switch ( Stack->MinorFunction )

diff --git a/src/winvblock/disk/pnp.c b/src/winvblock/disk/pnp.c
index 5b968f5..e99e105 100644 (file)
--- a/src/winvblock/disk/pnp.c
+++ b/src/winvblock/disk/pnp.c
@@ -266,7 +266,7 @@ NTSTATUS STDCALL disk_pnp__query_capabilities(
     Stack->Parameters.DeviceCapabilities.Capabilities;
   NTSTATUS status;
   disk__type_ptr disk_ptr;
-  bus__type_ptr bus_ptr;
+  struct bus__type * bus_ptr;
   DEVICE_CAPABILITIES ParentDeviceCapabilities;
 
   if ( DeviceCapabilities->Version != 1