[ros-diffs] [fireball] 37608: - Make atapi compile warnings-free.
fireball at svn.reactos.org
fireball at svn.reactos.org
Mon Nov 24 11:04:05 CET 2008
Author: fireball
Date: Mon Nov 24 04:04:05 2008
New Revision: 37608
URL: http://svn.reactos.org/svn/reactos?rev=37608&view=rev
Log:
- Make atapi compile warnings-free.
Modified:
trunk/reactos/drivers/storage/ide/atapi/atapi.c
trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild
Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/atapi.c?rev=37608&r1=37607&r2=37608&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] Mon Nov 24 04:04:05 2008
@@ -198,7 +198,7 @@
VOID
STDCALL
AtapiZeroMemory(
- IN PCHAR Buffer,
+ IN PUCHAR Buffer,
IN ULONG Count
);
@@ -927,10 +927,10 @@
{
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;
//
@@ -1400,7 +1400,7 @@
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 '_'
@@ -1435,7 +1435,7 @@
// 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;
@@ -2138,8 +2138,8 @@
{
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;
@@ -2600,12 +2600,9 @@
--*/
{
- 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];
@@ -2668,8 +2665,8 @@
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",
@@ -2683,11 +2680,11 @@
// Compare strings.
//
- if (AtapiStringCmp(vendorString,
- VendorID,
+ if (AtapiStringCmp((PCHAR)vendorString,
+ (PCHAR)VendorID,
VendorIDLength) ||
- AtapiStringCmp(deviceString,
- DeviceID,
+ AtapiStringCmp((PCHAR)deviceString,
+ (PCHAR)DeviceID,
DeviceIDLength)) {
//
@@ -2803,17 +2800,17 @@
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;
@@ -3115,9 +3112,9 @@
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,
@@ -3515,7 +3512,6 @@
ULONG status;
ULONG i;
UCHAR statusByte,interruptReason;
- BOOLEAN commandComplete = FALSE;
BOOLEAN atapiDev = FALSE;
if (srb) {
@@ -4771,7 +4767,7 @@
{
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;
@@ -5759,7 +5755,6 @@
{
PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension;
- ULONG status;
PSENSE_DATA senseBuffer = (PSENSE_DATA)Srb->DataBuffer;
@@ -5968,7 +5963,7 @@
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",
@@ -6381,7 +6376,7 @@
VOID
STDCALL
AtapiZeroMemory(
- IN PCHAR Buffer,
+ IN PUCHAR Buffer,
IN ULONG Count
)
{
Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild?rev=37608&r1=37607&r2=37608&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] Mon Nov 24 04:04:05 2008
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys" allowwarnings="true">
+<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<include base="atapi">.</include>
<library>ntoskrnl</library>
More information about the Ros-diffs
mailing list