Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CLASS2]

Browse source 
- Fix boot from HDD with USB drive present
- Fix USB drive failure with no HDD present

svn path=/branches/usb-bringup-trunk/; revision=55526
This commit is contained in:
Cameron Gutman 2012-02-10 17:14:39 +00:00
parent 6c4befe209
commit 4c47e234d1
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/storage/class/class2/class2.c
View file

@ -12,6 +12,10 @@
#include <include/class2.h> #include <include/class2.h>
#include <stdio.h> #include <stdio.h>
/* Part of the drive letter hack */
#include <ntifs.h>
#include <ketypes.h>
//#define NDEBUG //#define NDEBUG
#include <debug.h> #include <debug.h>
@ -371,8 +375,16 @@ ScsiClassAddDevice(
/* Attach it to the PDO */ /* Attach it to the PDO */
DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject);
/* Assign a drive letter */ /* Check that the kernel has already assigned drive letters */
ScsiClassAssignDriveLetter(DeviceInfo); if (KeLoaderBlock == NULL)
{
/* Assign a drive letter */
ScsiClassAssignDriveLetter(DeviceInfo);
}
else
{
/* The kernel will handle it */
}
/* Move to the next port number */ /* Move to the next port number */
DriverExtension->PortNumber++; DriverExtension->PortNumber++;
@ -533,7 +545,8 @@ Return Value:
} while(NT_SUCCESS(status)); } while(NT_SUCCESS(status));
return deviceFound ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE; /* We don't want to fail init just because we don't have devices right now */
return STATUS_SUCCESS; /*deviceFound ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE;*/
} }