VOID
STDCALL
AtapiZeroMemory(
- IN PCHAR Buffer,
+ IN PUCHAR Buffer,
IN ULONG Count
);
{
PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension;
PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[Srb->TargetId >> 1];
- PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1];
+ //PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1];
ULONG i;
UCHAR errorByte;
- UCHAR srbStatus;
+ UCHAR srbStatus = SRB_STATUS_ERROR;
UCHAR scsiStatus;
//
vendorId[j+1] = ((PUCHAR)deviceExtension->IdentifyData[i].ModelNumber)[j];
}
- if (!AtapiStringCmp (vendorId, "CD-ROM CDR", 11)) {
+ if (!AtapiStringCmp ((PCHAR)vendorId, "CD-ROM CDR", 11)) {
//
// Inquiry string for older model had a '-', newer is '_'
// is clear and then just wait for an arbitrary amount of time!
//
if (deviceExtension->DeviceFlags[i] & DFLAGS_ATAPI_DEVICE) {
- PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[i >> 1];
+ //PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[i >> 1];
PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[i >> 1];
ULONG waitCount;
{
PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension;
PULONG adapterCount = (PULONG)Context;
- PUCHAR ioSpace;
- ULONG i,j;
+ PUCHAR ioSpace = NULL;
+ ULONG i;
ULONG irq;
ULONG portBase;
ULONG retryCount;
--*/
{
- PHW_DEVICE_EXTENSION deviceExtension = DeviceExtension;
- ULONG rangeNumber = 0;
ULONG pciBuffer;
ULONG slotNumber;
ULONG functionNumber;
- ULONG status;
PCI_SLOT_NUMBER slotData;
PPCI_COMMON_CONFIG pciData;
UCHAR vendorString[5];
vendorStrPtr = vendorString;
deviceStrPtr = deviceString;
- AtapiHexToString(pciData->VendorID, &vendorStrPtr);
- AtapiHexToString(pciData->DeviceID, &deviceStrPtr);
+ AtapiHexToString(pciData->VendorID, (PCHAR*)&vendorStrPtr);
+ AtapiHexToString(pciData->DeviceID, (PCHAR*)&deviceStrPtr);
DebugPrint((2,
"FindBrokenController: Bus %x Slot %x Function %x Vendor %s Product %s\n",
// Compare strings.
//
- if (AtapiStringCmp(vendorString,
- VendorID,
+ if (AtapiStringCmp((PCHAR)vendorString,
+ (PCHAR)VendorID,
VendorIDLength) ||
- AtapiStringCmp(deviceString,
- DeviceID,
+ AtapiStringCmp((PCHAR)deviceString,
+ (PCHAR)DeviceID,
DeviceIDLength)) {
//
vendorStrPtr = vendorString;
deviceStrPtr = deviceString;
- AtapiHexToString(pciData.VendorID, &vendorStrPtr);
- AtapiHexToString(pciData.DeviceID, &deviceStrPtr);
+ AtapiHexToString(pciData.VendorID, (PCHAR*)&vendorStrPtr);
+ AtapiHexToString(pciData.DeviceID, (PCHAR*)&deviceStrPtr);
//
// Compare strings.
//
- if (AtapiStringCmp(vendorString,
+ if (AtapiStringCmp((PCHAR)vendorString,
NativeModeAdapters[nativeModeAdapterTableIndex].VendorId,
NativeModeAdapters[nativeModeAdapterTableIndex].VendorIdLength) ||
- AtapiStringCmp(deviceString,
+ AtapiStringCmp((PCHAR)deviceString,
NativeModeAdapters[nativeModeAdapterTableIndex].DeviceId,
NativeModeAdapters[nativeModeAdapterTableIndex].DeviceIdLength)) {
continue;
lastSlot = FALSE;
if (FindBrokenController(deviceExtension,
- BrokenAdapters[i].VendorId,
+ (PUCHAR)BrokenAdapters[i].VendorId,
BrokenAdapters[i].VendorIdLength,
- BrokenAdapters[i].DeviceId,
+ (PUCHAR)BrokenAdapters[i].DeviceId,
BrokenAdapters[i].DeviceIdLength,
&functionNumber,
&slotNumber,
ULONG status;
ULONG i;
UCHAR statusByte,interruptReason;
- BOOLEAN commandComplete = FALSE;
BOOLEAN atapiDev = FALSE;
if (srb) {
{
PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension;
PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[Srb->TargetId >> 1];
- PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1];
+ //PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1];
ULONG startingSector;
ULONG sectors;
ULONG endSector;
{
PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension;
- ULONG status;
PSENSE_DATA senseBuffer = (PSENSE_DATA)Srb->DataBuffer;
deviceExtension->CurrentSrb = Srb;
- if (AtapiStringCmp( ((PSRB_IO_CONTROL)(Srb->DataBuffer))->Signature,"SCSIDISK",strlen("SCSIDISK"))) {
+ if (AtapiStringCmp( (PCHAR)((PSRB_IO_CONTROL)(Srb->DataBuffer))->Signature,"SCSIDISK",strlen("SCSIDISK"))) {
DebugPrint((1,
"AtapiStartIo: IoControl signature incorrect. Send %s, expected %s\n",
VOID
STDCALL
AtapiZeroMemory(
- IN PCHAR Buffer,
+ IN PUCHAR Buffer,
IN ULONG Count
)
{