[bus] Rename bus__type to WV_S_BUS_T

Using the naming convention briefly detailed in
commit 6a99f82ba3.

diff --git a/src/aoe/bus.c b/src/aoe/bus.c
index ccf2bdb..6fe5e27 100644 (file)
--- a/src/aoe/bus.c
+++ b/src/aoe/bus.c
@@ -47,7 +47,7 @@ winvblock__bool aoe_bus__create(void);
 void aoe_bus__free(void);
 
 /* Globals. */
-struct bus__type * aoe_bus = NULL;
+WV_SP_BUS_T aoe_bus = NULL;
 
 static NTSTATUS STDCALL aoe_bus__dev_ctl_dispatch_(
     IN struct device__type * dev,
@@ -84,7 +84,7 @@ static NTSTATUS STDCALL aoe_bus__dev_ctl_dispatch_(
  * @ret         TRUE for success, else FALSE.
  */
 winvblock__bool aoe_bus__create(void) {
-    struct bus__type * new_bus;
+    WV_SP_BUS_T new_bus;
 
     /* We should only be called once. */
     if (aoe_bus) {

diff --git a/src/aoe/driver.c b/src/aoe/driver.c
index e053230..57fcab0 100644 (file)
--- a/src/aoe/driver.c
+++ b/src/aoe/driver.c
@@ -51,7 +51,7 @@ extern NTSTATUS STDCALL ZwWaitForSingleObject(
   );
 
 /* From aoe/bus.c */
-extern struct bus__type * aoe_bus;
+extern WV_SP_BUS_T aoe_bus;
 extern winvblock__bool aoe_bus__create(void);
 extern void aoe_bus__free(void);
 
@@ -717,7 +717,7 @@ NTSTATUS STDCALL DriverEntry(
     NTSTATUS Status;
     OBJECT_ATTRIBUTES ObjectAttributes;
     void * ThreadObject;
-    struct bus__type * bus_ptr;
+    WV_SP_BUS_T bus_ptr;
 
     DBG("Entry\n");
 
@@ -2156,7 +2156,7 @@ NTSTATUS STDCALL aoe__show(
   ) {
     winvblock__uint32 count;
     struct device__type * dev_walker;
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
     aoe__mount_disks_ptr disks;
     PIO_STACK_LOCATION io_stack_loc = IoGetCurrentIrpStackLocation(irp);
 

diff --git a/src/include/bus.h b/src/include/bus.h
index 91b8036..9112c77 100644 (file)
--- a/src/include/bus.h
+++ b/src/include/bus.h
@@ -35,10 +35,10 @@
  * If you implement your own bus thread routine, you should call
  * bus__process_work_items() within its loop.
  */
-typedef void STDCALL bus__thread_func(IN struct bus__type *);
+typedef void STDCALL bus__thread_func(IN WV_SP_BUS_T);
 
 /* The bus type. */
-struct bus__type {
+typedef struct WV_BUS_T {
     struct device__type * device;
     PDEVICE_OBJECT LowerDeviceObject;
     PDEVICE_OBJECT PhysicalDeviceObject;
@@ -60,14 +60,14 @@ struct bus__type {
         LIST_ENTRY Nodes;
         USHORT NodeCount;
       } BusPrivate_;
-  };
+  } WV_S_BUS_T, * WV_SP_BUS_T;
 
 /* A child PDO node on a bus.  Treat this as an opaque type. */
 typedef struct WV_BUS_NODE {
     struct {
         LIST_ENTRY Link;
         PDEVICE_OBJECT Pdo;
-        struct bus__type * Bus;
+        WV_SP_BUS_T Bus;
       } BusPrivate_;
   } WV_S_BUS_NODE, * WV_SP_BUS_NODE;
 
@@ -78,21 +78,21 @@ extern NTSTATUS STDCALL bus__get_dev_capabilities(
   );
 extern NTSTATUS bus__module_init(void);
 extern void bus__module_shutdown(void);
-extern winvblock__lib_func void bus__init(struct bus__type *);
-extern winvblock__lib_func struct bus__type * bus__create(void);
+extern winvblock__lib_func void bus__init(WV_SP_BUS_T);
+extern winvblock__lib_func WV_SP_BUS_T bus__create(void);
 extern winvblock__lib_func winvblock__bool STDCALL bus__add_child(
-    IN OUT struct bus__type *,
+    IN OUT WV_SP_BUS_T,
     IN struct device__type *
   );
-extern winvblock__lib_func struct bus__type * bus__get(struct device__type *);
-extern winvblock__lib_func void bus__process_work_items(struct bus__type *);
-extern winvblock__lib_func NTSTATUS bus__start_thread(struct bus__type *);
+extern winvblock__lib_func WV_SP_BUS_T bus__get(struct device__type *);
+extern winvblock__lib_func void bus__process_work_items(WV_SP_BUS_T);
+extern winvblock__lib_func NTSTATUS bus__start_thread(WV_SP_BUS_T);
 extern winvblock__lib_func winvblock__bool STDCALL WvBusInitNode(
     OUT WV_SP_BUS_NODE,
     IN PDEVICE_OBJECT
   );
 extern winvblock__lib_func NTSTATUS STDCALL WvBusAddNode(
-    struct bus__type *,
+    WV_SP_BUS_T,
     WV_SP_BUS_NODE
   );
 extern winvblock__lib_func NTSTATUS STDCALL WvBusRemoveNode(WV_SP_BUS_NODE);

diff --git a/src/include/driver.h b/src/include/driver.h
index 25dc8fb..bdd5526 100644 (file)
--- a/src/include/driver.h
+++ b/src/include/driver.h
@@ -44,7 +44,7 @@ extern PDRIVER_OBJECT driver__obj_ptr;
 extern winvblock__lib_func void STDCALL Driver_CompletePendingIrp(IN PIRP);
 /* Note the exception to the function naming convention. */
 extern winvblock__lib_func NTSTATUS STDCALL Error(IN PCHAR, IN NTSTATUS);
-extern winvblock__lib_func struct bus__type * driver__bus(void);
+extern winvblock__lib_func struct WV_BUS_T * driver__bus(void);
 /* Note the exception to the function naming convention. */
 extern NTSTATUS STDCALL DriverEntry(
     IN PDRIVER_OBJECT,

diff --git a/src/winvblock/bus/bus.c b/src/winvblock/bus/bus.c
index 73fdea8..4c0dd70 100644 (file)
--- a/src/winvblock/bus/bus.c
+++ b/src/winvblock/bus/bus.c
@@ -63,10 +63,10 @@ static device__dispatch_func bus__sys_ctl_;
 static device__pnp_func bus__pnp_dispatch_;
 static bus__thread_func bus__default_thread_;
 static winvblock__bool bus__add_work_item_(
-    struct bus__type *,
+    WV_SP_BUS_T,
     WV_SP_BUS_WORK_ITEM_
   );
-static WV_SP_BUS_WORK_ITEM_ bus__get_work_item_(struct bus__type *);
+static WV_SP_BUS_WORK_ITEM_ bus__get_work_item_(WV_SP_BUS_T);
 
 /* Globals. */
 struct device__irp_mj bus__irp_mj_ = {
@@ -85,7 +85,7 @@ struct device__irp_mj bus__irp_mj_ = {
  * @ret                 TRUE for success, FALSE for failure.
  */
 winvblock__lib_func winvblock__bool STDCALL bus__add_child(
-    IN OUT struct bus__type * bus_ptr,
+    IN OUT WV_SP_BUS_T bus_ptr,
     IN OUT struct device__type * dev_ptr
   ) {
     /* The new node's device object. */
@@ -161,7 +161,7 @@ static NTSTATUS STDCALL bus__sys_ctl_(
     IN struct device__type * dev,
     IN PIRP irp
   ) {
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     PDEVICE_OBJECT lower = bus->LowerDeviceObject;
 
     if (lower) {
@@ -176,7 +176,7 @@ static NTSTATUS STDCALL bus__power_(
     IN struct device__type * dev,
     IN PIRP irp
   ) {
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     PDEVICE_OBJECT lower = bus->LowerDeviceObject;
 
     PoStartNextPowerIrp(irp);
@@ -251,7 +251,7 @@ static winvblock__bool STDCALL bus__init_(IN struct device__type * dev) {
  *
  * @v bus               Points to the bus to initialize with defaults.
  */
-winvblock__lib_func void bus__init(struct bus__type * bus) {
+winvblock__lib_func void bus__init(WV_SP_BUS_T bus) {
     struct device__type * dev = bus->device;
 
     RtlZeroMemory(bus, sizeof *bus);
@@ -278,12 +278,12 @@ winvblock__lib_func void bus__init(struct bus__type * bus) {
  *
  * This function should not be confused with a PDO creation routine, which is
  * actually implemented for each device type.  This routine will allocate a
- * bus__type, track it in a global list, as well as populate the bus
+ * WV_S_BUS_T, track it in a global list, as well as populate the bus
  * with default values.
  */
-winvblock__lib_func struct bus__type * bus__create(void) {
+winvblock__lib_func WV_SP_BUS_T bus__create(void) {
     struct device__type * dev;
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
 
     /* Try to create a device. */
     dev = device__create();
@@ -319,7 +319,7 @@ winvblock__lib_func struct bus__type * bus__create(void) {
  */
 static PDEVICE_OBJECT STDCALL bus__create_pdo_(IN struct device__type * dev) {
     PDEVICE_OBJECT pdo = NULL;
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
     NTSTATUS status;
 
     /* Note the bus device needing a PDO. */
@@ -382,7 +382,7 @@ static PDEVICE_OBJECT STDCALL bus__create_pdo_(IN struct device__type * dev) {
  * @v dev_ptr           Points to the bus device to delete.
  */
 static void STDCALL bus__free_(IN struct device__type * dev_ptr) {
-    struct bus__type * bus_ptr = bus__get(dev_ptr);
+    WV_SP_BUS_T bus_ptr = bus__get(dev_ptr);
     /* Free the "inherited class". */
     bus_ptr->prev_free(dev_ptr);
 
@@ -395,7 +395,7 @@ static void STDCALL bus__free_(IN struct device__type * dev_ptr) {
  * @v dev       A pointer to a device.
  * @ret         A pointer to the device's associated bus.
  */
-extern winvblock__lib_func struct bus__type * bus__get(
+extern winvblock__lib_func WV_SP_BUS_T bus__get(
     struct device__type * dev
   ) {
     return dev->ext;
@@ -411,7 +411,7 @@ extern winvblock__lib_func struct bus__type * bus__get(
  * Note that this function will initialize the work item's completion signal.
  */
 static winvblock__bool bus__add_work_item_(
-    struct bus__type * bus,
+    WV_SP_BUS_T bus,
     WV_SP_BUS_WORK_ITEM_ work_item
   ) {
     ExInterlockedInsertTailList(
@@ -430,7 +430,7 @@ static winvblock__bool bus__add_work_item_(
  * @ret bus__work_item_         The work item, or NULL for an empty queue.
  */
 static WV_SP_BUS_WORK_ITEM_ bus__get_work_item_(
-    struct bus__type * bus
+    WV_SP_BUS_T bus
   ) {
     PLIST_ENTRY list_entry;
 
@@ -449,7 +449,7 @@ static WV_SP_BUS_WORK_ITEM_ bus__get_work_item_(
  *
  * @v bus               The bus to process its work items.
  */
-winvblock__lib_func void bus__process_work_items(struct bus__type * bus) {
+winvblock__lib_func void bus__process_work_items(WV_SP_BUS_T bus) {
     WV_SP_BUS_WORK_ITEM_ work_item;
     WV_SP_BUS_NODE node;
 
@@ -485,7 +485,7 @@ winvblock__lib_func void bus__process_work_items(struct bus__type * bus) {
 
 /* The device__type::ops.free implementation for a threaded bus. */
 static void STDCALL bus__thread_free_(IN struct device__type * dev) {
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
 
     bus->thread = (bus__thread_func *) 0;
     KeSetEvent(&bus->work_signal, 0, FALSE);
@@ -499,7 +499,7 @@ static void STDCALL bus__thread_free_(IN struct device__type * dev) {
  *                      the bus that the thread should use in processing.
  */
 static void STDCALL bus__thread_(IN void * context) {
-    struct bus__type * bus = context;
+    WV_SP_BUS_T bus = context;
 
     if (!bus || !bus->thread) {
         DBG("No bus or no thread!\n");
@@ -522,7 +522,7 @@ static void STDCALL bus__thread_(IN void * context) {
  * If you implement your own thread routine, you are also responsible
  * for freeing the bus.
  */
-static void STDCALL bus__default_thread_(IN struct bus__type * bus) {
+static void STDCALL bus__default_thread_(IN WV_SP_BUS_T bus) {
     LARGE_INTEGER timeout;
 
     /* Wake up at least every 30 seconds. */
@@ -564,7 +564,7 @@ static void STDCALL bus__default_thread_(IN struct bus__type * bus) {
  * specify your own thread routine, then call this function to start it.
  */
 winvblock__lib_func NTSTATUS bus__start_thread(
-    struct bus__type * bus
+    WV_SP_BUS_T bus
   ) {
     OBJECT_ATTRIBUTES obj_attrs;
     HANDLE thread_handle;
@@ -623,7 +623,7 @@ winvblock__lib_func winvblock__bool STDCALL WvBusInitNode(
  * node will be added.  This is usually from the bus' thread.
  */
 winvblock__lib_func NTSTATUS STDCALL WvBusAddNode(
-    struct bus__type * Bus,
+    WV_SP_BUS_T Bus,
     WV_SP_BUS_NODE Node
   ) {
     WV_SP_BUS_WORK_ITEM_ work_item;
@@ -664,7 +664,7 @@ winvblock__lib_func NTSTATUS STDCALL WvBusAddNode(
 winvblock__lib_func NTSTATUS STDCALL WvBusRemoveNode(
     WV_SP_BUS_NODE Node
   ) {
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
     WV_SP_BUS_WORK_ITEM_ work_item;
 
     if (!Node || !(bus = Node->BusPrivate_.Bus))

diff --git a/src/winvblock/bus/dev_ctl.c b/src/winvblock/bus/dev_ctl.c
index 0b67760..90b2fde 100644 (file)
--- a/src/winvblock/bus/dev_ctl.c
+++ b/src/winvblock/bus/dev_ctl.c
@@ -48,7 +48,7 @@ static NTSTATUS STDCALL bus_dev_ctl__disk_detach_(
     winvblock__uint32 disk_num = *(winvblock__uint32_ptr) buffer;
     struct device__type * dev_walker;
     disk__type_ptr disk_walker = NULL, prev_disk_walker;
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
 
     DBG("Request to detach disk: %d\n", disk_num);
     bus = bus__get(dev);

diff --git a/src/winvblock/bus/pnp.c b/src/winvblock/bus/pnp.c
index 6b0b99c..3e6e581 100644 (file)
--- a/src/winvblock/bus/pnp.c
+++ b/src/winvblock/bus/pnp.c
@@ -64,7 +64,7 @@ static NTSTATUS STDCALL bus_pnp__start_dev_(
   ) {
     NTSTATUS status;
     KEVENT event;
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     PDEVICE_OBJECT lower = bus->LowerDeviceObject;
 
     if (!lower)
@@ -100,7 +100,7 @@ static NTSTATUS STDCALL bus_pnp__remove_dev_(
     IN PIRP irp
   ) {
     NTSTATUS status = STATUS_SUCCESS;
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     PDEVICE_OBJECT lower = bus->LowerDeviceObject;
     struct device__type * walker, * next;
 
@@ -139,7 +139,7 @@ static NTSTATUS STDCALL bus_pnp__query_dev_relations_(
     IN PIRP irp
   ) {
     NTSTATUS status;
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     PDEVICE_OBJECT lower = bus->LowerDeviceObject;
     PIO_STACK_LOCATION io_stack_loc = IoGetCurrentIrpStackLocation(irp);
     winvblock__uint32 count;
@@ -205,7 +205,7 @@ static NTSTATUS STDCALL bus_pnp__query_capabilities_(
     PDEVICE_CAPABILITIES DeviceCapabilities =
       io_stack_loc->Parameters.DeviceCapabilities.Capabilities;
     NTSTATUS status;
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     DEVICE_CAPABILITIES ParentDeviceCapabilities;
     PDEVICE_OBJECT lower;
 
@@ -233,7 +233,7 @@ static NTSTATUS STDCALL bus_pnp__query_dev_text_(
     IN struct device__type * dev,
     IN PIRP irp
   ) {
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     WCHAR (*str)[512];
     PIO_STACK_LOCATION io_stack_loc = IoGetCurrentIrpStackLocation(irp);
     NTSTATUS status;
@@ -347,7 +347,7 @@ static NTSTATUS STDCALL bus_pnp__simple_(
     IN UCHAR code
   ) {
     NTSTATUS status;
-    struct bus__type * bus = bus__get(dev);
+    WV_SP_BUS_T bus = bus__get(dev);
     PDEVICE_OBJECT lower = bus->LowerDeviceObject;
 
     switch (code) {

diff --git a/src/winvblock/disk/pnp.c b/src/winvblock/disk/pnp.c
index 713c41b..5283a85 100644 (file)
--- a/src/winvblock/disk/pnp.c
+++ b/src/winvblock/disk/pnp.c
@@ -204,7 +204,7 @@ static NTSTATUS STDCALL disk_pnp__query_capabilities_(
       io_stack_loc->Parameters.DeviceCapabilities.Capabilities;
     NTSTATUS status;
     disk__type_ptr disk;
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
     DEVICE_CAPABILITIES ParentDeviceCapabilities;
     PDEVICE_OBJECT bus_lower;
 

diff --git a/src/winvblock/driver.c b/src/winvblock/driver.c
index be51397..a319c23 100644 (file)
--- a/src/winvblock/driver.c
+++ b/src/winvblock/driver.c
@@ -126,7 +126,7 @@ static NTSTATUS STDCALL driver__attach_fdo_(
     KIRQL irql;
     NTSTATUS status;
     PLIST_ENTRY walker;
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
     PUNICODE_STRING dev_name = NULL;
     PDEVICE_OBJECT fdo = NULL;
     struct device__type * dev_ptr;
@@ -239,7 +239,7 @@ static NTSTATUS STDCALL driver__attach_fdo_(
 
 /* Create the root-enumerated, main bus device. */
 NTSTATUS STDCALL driver__create_bus_(void) {
-    struct bus__type * bus;
+    WV_SP_BUS_T bus;
     NTSTATUS status;
     PDEVICE_OBJECT bus_pdo = NULL;
 
@@ -565,7 +565,7 @@ winvblock__lib_func NTSTATUS STDCALL Error(
  *
  * @ret         A pointer to the driver bus, or NULL.
  */
-winvblock__lib_func struct bus__type * driver__bus(void) {
+winvblock__lib_func WV_SP_BUS_T driver__bus(void) {
     if (!driver__bus_fdo_) {
         DBG("No driver bus device!\n");
         return NULL;