Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBSTOR] Remove workarounds for old storage stack

Browse source
This commit is contained in:
Victor Perevertkin 2020-12-06 23:32:29 +03:00
parent aa05649902
commit 39c48a4d91
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
3 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/usb/usbstor/disk.c
View file

@ -173,13 +173,8 @@ USBSTOR_HandleInternalDeviceControl(
{ {
DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE / SRB_FUNCTION_SHUTDOWN\n"); DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE / SRB_FUNCTION_SHUTDOWN\n");
// HACK: don't flush pending requests
#if 0 // we really need a proper storage stack
//
// wait for pending requests to finish // wait for pending requests to finish
//
USBSTOR_QueueWaitForPendingRequests(PDODeviceExtension->LowerDeviceObject); USBSTOR_QueueWaitForPendingRequests(PDODeviceExtension->LowerDeviceObject);
#endif
Request->SrbStatus = SRB_STATUS_SUCCESS; Request->SrbStatus = SRB_STATUS_SUCCESS;
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;

10
drivers/usb/usbstor/fdo.c
View file

@ -327,15 +327,7 @@ USBSTOR_FdoHandlePnp(
case IRP_MN_QUERY_STOP_DEVICE: case IRP_MN_QUERY_STOP_DEVICE:
case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE:
{ {
#if 0 if (DeviceExtension->IrpPendingCount != 0 || DeviceExtension->ActiveSrb != NULL)
//
// we can if nothing is pending
//
if (DeviceExtension->IrpPendingCount != 0 ||
DeviceExtension->ActiveSrb != NULL)
#else
if (TRUE)
#endif
{ {
/* We have pending requests */ /* We have pending requests */
DPRINT1("Failing removal/stop request due to pending requests present\n"); DPRINT1("Failing removal/stop request due to pending requests present\n");

7
drivers/usb/usbstor/pdo.c
View file

@ -604,14 +604,7 @@ USBSTOR_PdoHandlePnp(
case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE:
case IRP_MN_QUERY_STOP_DEVICE: case IRP_MN_QUERY_STOP_DEVICE:
{ {
#if 0
//
// if we're not claimed it's ok
//
if (DeviceExtension->Claimed) if (DeviceExtension->Claimed)
#else
if (TRUE)
#endif
{ {
Status = STATUS_UNSUCCESSFUL; Status = STATUS_UNSUCCESSFUL;
DPRINT1("[USBSTOR] Request %x fails because device is still claimed\n", IoStack->MinorFunction); DPRINT1("[USBSTOR] Request %x fails because device is still claimed\n", IoStack->MinorFunction);