[bus] Rename WV_F_BUS_PNP to WVL_F_BUS_PNP

diff --git a/src/include/bus.h b/src/include/bus.h
index 36c239b..f0d569d 100644 (file)
--- a/src/include/bus.h
+++ b/src/include/bus.h
@@ -45,8 +45,8 @@ typedef WVL_F_BUS_THREAD * WVL_FP_BUS_THREAD;
  * @v irp               The IRP to process.
  * @ret NTSTATUS        The status of the operation.
  */
  * @v irp               The IRP to process.
  * @ret NTSTATUS        The status of the operation.
  */

-typedef NTSTATUS STDCALL WV_F_BUS_PNP(IN WV_SP_BUS_T, IN PIRP);
-typedef WV_F_BUS_PNP * WV_FP_BUS_PNP;
+typedef NTSTATUS STDCALL WVL_F_BUS_PNP(IN WV_SP_BUS_T, IN PIRP);
+typedef WVL_F_BUS_PNP * WVL_FP_BUS_PNP;

 
 /* Device state. */
 typedef enum WV_BUS_STATE {
 
 /* Device state. */
 typedef enum WV_BUS_STATE {


@@ -71,7 +71,7 @@ typedef struct WV_BUS_T {
     winvblock__bool Stop;
     WV_E_BUS_STATE OldState;
     WV_E_BUS_STATE State;
     winvblock__bool Stop;
     WV_E_BUS_STATE OldState;
     WV_E_BUS_STATE State;

-    WV_FP_BUS_PNP QueryDevText;
+    WVL_FP_BUS_PNP QueryDevText;

     struct {
         LIST_ENTRY Nodes;
         USHORT NodeCount;
     struct {
         LIST_ENTRY Nodes;
         USHORT NodeCount;

diff --git a/src/winvblock/driver.c b/src/winvblock/driver.c
index 56a4aa3..89bc7a4 100644 (file)
--- a/src/winvblock/driver.c
+++ b/src/winvblock/driver.c
@@ -85,7 +85,7 @@ static WV_F_DEV_DISPATCH WvDriverBusSysCtl_;
 static WV_F_DEV_CTL WvDriverBusDevCtl_;
 static WV_F_DEV_DISPATCH WvDriverBusPower_;
 static WV_F_DEV_PNP WvDriverBusPnp_;
 static WV_F_DEV_CTL WvDriverBusDevCtl_;
 static WV_F_DEV_DISPATCH WvDriverBusPower_;
 static WV_F_DEV_PNP WvDriverBusPnp_;

-static WV_F_BUS_PNP WvDriverBusPnpQueryDevText_;
+static WVL_F_BUS_PNP WvDriverBusPnpQueryDevText_;

 
 static LPWSTR STDCALL get_opt(IN LPWSTR opt_name) {
     LPWSTR our_opts, the_opt;
 
 static LPWSTR STDCALL get_opt(IN LPWSTR opt_name) {
     LPWSTR our_opts, the_opt;