[driver] Rename driver__dev_ext to WV_S_DEV_EXT
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:31:16 +0000 (00:31 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:31:26 +0000 (00:31 -0500)
src/include/driver.h
src/winvblock/device.c
src/winvblock/disk/disk.c
src/winvblock/driver.c

index fd6ce75..1172013 100644 (file)
@@ -51,9 +51,9 @@ extern NTSTATUS STDCALL DriverEntry(
   );
 
 /* The physical/function device object's (PDO's/FDO's) DeviceExtension */
-winvblock__def_struct(driver__dev_ext) {
+typedef struct WV_DEV_EXT {
     struct WV_DEV_T * device;
-  };
+  } WV_S_DEV_EXT, * WV_SP_DEV_EXT;
 
 /* The prototype for a device IRP dispatch. */
 typedef NTSTATUS STDCALL driver__dispatch_func(
index c6b8231..50d7bd6 100644 (file)
@@ -206,7 +206,7 @@ static void STDCALL WvDevFreeDev_(IN WV_SP_DEV_T dev) {
  * @ret                 Returns a pointer to the device on success, else NULL.
  */
 WVL_M_LIB WV_SP_DEV_T WvDevFromDevObj(PDEVICE_OBJECT dev_obj) {
-    driver__dev_ext_ptr dev_ext;
+    WV_SP_DEV_EXT dev_ext;
 
     if (!dev_obj)
       return NULL;
@@ -221,7 +221,7 @@ WVL_M_LIB WV_SP_DEV_T WvDevFromDevObj(PDEVICE_OBJECT dev_obj) {
  * @v dev               Points to the device to associate with.
  */
 WVL_M_LIB void WvDevForDevObj(PDEVICE_OBJECT dev_obj, WV_SP_DEV_T dev) {
-    driver__dev_ext_ptr dev_ext = dev_obj->DeviceExtension;
+    WV_SP_DEV_EXT dev_ext = dev_obj->DeviceExtension;
     dev_ext->device = dev;
     return;
   }
index 5cf33f3..f4abbca 100644 (file)
@@ -144,7 +144,7 @@ static PDEVICE_OBJECT STDCALL create_pdo(IN WV_SP_DEV_T dev_ptr) {
     /* Create the disk PDO. */
     status = IoCreateDevice(
         WvDriverObj,
-        sizeof (driver__dev_ext),
+        sizeof (WV_S_DEV_EXT),
         NULL,
         disk_types[disk_ptr->Media],
         FILE_AUTOGENERATED_DEVICE_NAME |
index 2955745..914e323 100644 (file)
@@ -171,7 +171,7 @@ static NTSTATUS STDCALL driver__attach_fdo_(
     /* Create the bus FDO. */
     status = IoCreateDevice(
         DriverObject,
-        sizeof (driver__dev_ext),
+        sizeof (WV_S_DEV_EXT),
         &WvDriverBusName_,
         FILE_DEVICE_CONTROLLER,
         FILE_DEVICE_SECURE_OPEN,
@@ -910,7 +910,7 @@ static void STDCALL WvDriverAddDummy_(void * context) {
 
     status = IoCreateDevice(
         WvDriverObj,
-        sizeof (driver__dev_ext),
+        sizeof (WV_S_DEV_EXT),
         NULL,
         dummy_context->DevType,
         dummy_context->DevCharacteristics,