Fix CORE-7042.

svn path=/trunk/; revision=60831
This commit is contained in:
Dmitry Gorbachev 2013-11-02 13:54:48 +00:00
parent bbac15c931
commit 14d4a4fd26

View file

@ -243,7 +243,7 @@ int
ata_send_ioctl( ata_send_ioctl(
HANDLE h, HANDLE h,
PSCSI_ADDRESS addr, PSCSI_ADDRESS addr,
PCHAR Signature, PCCH Signature,
ULONG Ioctl, ULONG Ioctl,
PVOID inBuffer, PVOID inBuffer,
ULONG inBufferLength, ULONG inBufferLength,
@ -731,7 +731,7 @@ ata_check_unit(
addr.PathId = inquiryData->PathId; addr.PathId = inquiryData->PathId;
addr.TargetId = inquiryData->TargetId; addr.TargetId = inquiryData->TargetId;
addr.Lun = inquiryData->Lun; addr.Lun = inquiryData->Lun;
status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", status = ata_send_ioctl(h, &addr, "-UNIATA-",
IOCTL_SCSI_MINIPORT_UNIATA_GET_MODE, IOCTL_SCSI_MINIPORT_UNIATA_GET_MODE,
NULL, 0, NULL, 0,
&IoMode, sizeof(IoMode), &IoMode, sizeof(IoMode),
@ -753,7 +753,7 @@ ata_check_unit(
// probably, we shall change this in future to support SATA splitters // probably, we shall change this in future to support SATA splitters
pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId; pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId;
status = ata_send_ioctl(h, NULL, (PCHAR)"SCSIDISK", status = ata_send_ioctl(h, NULL, "SCSIDISK",
IOCTL_SCSI_MINIPORT_IDENTIFY, IOCTL_SCSI_MINIPORT_IDENTIFY,
&pin, sizeof(pin), &pin, sizeof(pin),
buff, sizeof(buff), buff, sizeof(buff),
@ -767,7 +767,7 @@ ata_check_unit(
// probably, we shall change this in future to support SATA splitters // probably, we shall change this in future to support SATA splitters
pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId; pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId;
status = ata_send_ioctl(h, NULL, (PCHAR)"SCSIDISK", status = ata_send_ioctl(h, NULL, "SCSIDISK",
IOCTL_SCSI_MINIPORT_IDENTIFY, IOCTL_SCSI_MINIPORT_IDENTIFY,
&pin, sizeof(pin), &pin, sizeof(pin),
buff, sizeof(buff), buff, sizeof(buff),
@ -999,7 +999,7 @@ ata_adapter_info(
} }
memset(AdapterInfo, 0, len); memset(AdapterInfo, 0, len);
status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", status = ata_send_ioctl(h, &addr, "-UNIATA-",
IOCTL_SCSI_MINIPORT_UNIATA_ADAPTER_INFO, IOCTL_SCSI_MINIPORT_UNIATA_ADAPTER_INFO,
AdapterInfo, len, AdapterInfo, len,
AdapterInfo, len, AdapterInfo, len,
@ -1121,7 +1121,7 @@ ata_mode(
// IoMode.ApplyImmediately = TRUE; // IoMode.ApplyImmediately = TRUE;
IoMode.OrigMode = mode; IoMode.OrigMode = mode;
status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", status = ata_send_ioctl(h, &addr, "-UNIATA-",
IOCTL_SCSI_MINIPORT_UNIATA_SET_MAX_MODE, IOCTL_SCSI_MINIPORT_UNIATA_SET_MAX_MODE,
&IoMode, sizeof(IoMode), &IoMode, sizeof(IoMode),
NULL, 0, NULL, 0,
@ -1225,7 +1225,7 @@ ata_hide(
if(lock) { if(lock) {
printf("ATTENTION: you have %d seconds to disconnect cable\n", lock); printf("ATTENTION: you have %d seconds to disconnect cable\n", lock);
} }
status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", status = ata_send_ioctl(h, &addr, "-UNIATA-",
IOCTL_SCSI_MINIPORT_UNIATA_DELETE_DEVICE, IOCTL_SCSI_MINIPORT_UNIATA_DELETE_DEVICE,
&to, sizeof(to), &to, sizeof(to),
NULL, 0, NULL, 0,
@ -1280,7 +1280,7 @@ ata_scan(
if(lock) { if(lock) {
printf("You have %d seconds to connect device.\n", lock); printf("You have %d seconds to connect device.\n", lock);
} }
status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", status = ata_send_ioctl(h, &addr, "-UNIATA-",
IOCTL_SCSI_MINIPORT_UNIATA_FIND_DEVICES, IOCTL_SCSI_MINIPORT_UNIATA_FIND_DEVICES,
&to, sizeof(to), &to, sizeof(to),
NULL, 0, NULL, 0,
@ -1425,7 +1425,7 @@ ata_bblk(
addr.TargetId = (UCHAR)(dev_id >> 8); addr.TargetId = (UCHAR)(dev_id >> 8);
addr.Lun = (UCHAR)(dev_id); addr.Lun = (UCHAR)(dev_id);
status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", status = ata_send_ioctl(h, &addr, "-UNIATA-",
IOCTL_SCSI_MINIPORT_UNIATA_RESETBB, IOCTL_SCSI_MINIPORT_UNIATA_RESETBB,
NULL, 0, NULL, 0,
NULL, 0, NULL, 0,