[ros-diffs] [cgutman] 55165: [USBSTOR] - Get the actual value for the removable media bit instead of hardcoding it to true

Author: cgutman
Date: Wed Jan 25 01:09:59 2012
New Revision: 55165

URL: http://svn.reactos.org/svn/reactos?rev=55165&view=rev
Log:
[USBSTOR]
- Get the actual value for the removable media bit instead of hardcoding it to true

Modified:
    branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c

Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us...
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] Wed Jan 25 01:09:59 2012
@@ -390,7 +390,7 @@
         DeviceDescriptor->Size = TotalLength;
         DeviceDescriptor->DeviceType = InquiryData->DeviceType;
         DeviceDescriptor->DeviceTypeModifier = (InquiryData->RMB & 0x7F);
-        DeviceDescriptor->RemovableMedia = TRUE;
+        DeviceDescriptor->RemovableMedia = (InquiryData->RMB & 0x80) ? TRUE : FALSE;
         DeviceDescriptor->CommandQueueing = FALSE;
         DeviceDescriptor->BusType = BusTypeUsb;
         DeviceDescriptor->VendorIdOffset = sizeof(STORAGE_DEVICE_DESCRIPTOR) - sizeof(UCHAR);
@@ -641,7 +641,7 @@
         ScsiInquiryData->DeviceTypeQualifier = (UFIInquiryResponse->RMB & 0x7F);

/* Hack for IoReadPartitionTable call in disk.sys */
-        ScsiInquiryData->RemovableMedia = (ScsiInquiryData->DeviceType != DIRECT_ACCESS_DEVICE) ? 1 : 0;
+        ScsiInquiryData->RemovableMedia = ((ScsiInquiryData->DeviceType != DIRECT_ACCESS_DEVICE) ? ((UFIInquiryResponse->RMB & 0x80) ? 1 : 0) : 0);

ScsiInquiryData->Versions = 0x04;
         ScsiInquiryData->ResponseDataFormat = 0x02;