[disk] Rename disk__removable to WvDiskIsRemovable
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Mon, 20 Dec 2010 21:05:25 +0000 (16:05 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Mon, 20 Dec 2010 21:05:25 +0000 (16:05 -0500)
src/include/disk.h
src/winvblock/disk/dev_ctl.c
src/winvblock/disk/disk.c
src/winvblock/disk/pnp.c

index c35c7a9..904a1be 100644 (file)
@@ -36,7 +36,7 @@ typedef enum WV_DISK_MEDIA_TYPE {
 
 typedef char disk__boot_sect_ptr[512];
 
-extern winvblock__bool disk__removable[WvDiskMediaTypes];
+extern winvblock__bool WvDiskIsRemovable[WvDiskMediaTypes];
 extern PWCHAR disk__compat_ids[WvDiskMediaTypes];
 
 enum _disk__io_mode
index 0b084d6..83c345b 100644 (file)
@@ -106,7 +106,7 @@ static NTSTATUS STDCALL disk_dev_ctl__storage_query_prop_(
         storage_dev_desc.Size = sizeof (STORAGE_DEVICE_DESCRIPTOR);
         storage_dev_desc.DeviceType = DIRECT_ACCESS_DEVICE;
         storage_dev_desc.DeviceTypeModifier = 0;
-        storage_dev_desc.RemovableMedia = disk__removable[disk->Media];
+        storage_dev_desc.RemovableMedia = WvDiskIsRemovable[disk->Media];
         storage_dev_desc.CommandQueueing = FALSE;
         storage_dev_desc.VendorIdOffset = 0;
         storage_dev_desc.ProductIdOffset = 0;
index 3ef6322..cf67cb0 100644 (file)
@@ -61,7 +61,7 @@ static WV_F_DEV_DISPATCH disk__sys_ctl_;
 /* Globals. */
 static LIST_ENTRY disk_list;
 static KSPIN_LOCK disk_list_lock;
-winvblock__bool disk__removable[WvDiskMediaTypes] = { TRUE, FALSE, TRUE };
+winvblock__bool WvDiskIsRemovable[WvDiskMediaTypes] = { TRUE, FALSE, TRUE };
 PWCHAR disk__compat_ids[WvDiskMediaTypes] =
   { L"GenSFloppy", L"GenDisk", L"GenCdRom" };
 WV_S_DEV_IRP_MJ disk__irp_mj_ = {
index 4ce52b3..2dc2a11 100644 (file)
@@ -257,7 +257,7 @@ static NTSTATUS STDCALL disk_pnp__query_capabilities_(
     DeviceCapabilities->D3Latency = 0;
     DeviceCapabilities->EjectSupported = FALSE;
     DeviceCapabilities->HardwareDisabled = FALSE;
-    DeviceCapabilities->Removable = disk__removable[disk->Media];
+    DeviceCapabilities->Removable = WvDiskIsRemovable[disk->Media];
     DeviceCapabilities->SurpriseRemovalOK = FALSE;
     DeviceCapabilities->UniqueID = FALSE;
     DeviceCapabilities->SilentInstall = FALSE;