Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some warnings

Browse source 
svn path=/trunk/; revision=30646
This commit is contained in:
Christoph von Wittich 2007-11-21 20:14:25 +00:00
parent 7353b246e9
commit c07289cdd1
2 changed files with 15 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
reactos/drivers/storage/class/cdrom/cdrom.c
View file

@ -231,7 +231,6 @@ typedef struct _CDROM_DATA {
#define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,'CscS') #define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,'CscS')
#endif #endif
NTSTATUS NTSTATUS
STDCALL STDCALL
DriverEntry( DriverEntry(
@ -278,6 +277,7 @@ CdRomDeviceControl(
IN PIRP Irp IN PIRP Irp
); );
IO_COMPLETION_ROUTINE CdRomDeviceControlCompletion;
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomDeviceControlCompletion( CdRomDeviceControlCompletion(
@ -286,6 +286,7 @@ CdRomDeviceControlCompletion(
IN PVOID Context IN PVOID Context
); );
IO_COMPLETION_ROUTINE CdRomSetVolumeIntermediateCompletion;
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomSetVolumeIntermediateCompletion( CdRomSetVolumeIntermediateCompletion(
@ -294,6 +295,7 @@ CdRomSetVolumeIntermediateCompletion(
IN PVOID Context IN PVOID Context
); );
IO_COMPLETION_ROUTINE CdRomSwitchModeCompletion;
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomSwitchModeCompletion( CdRomSwitchModeCompletion(
@ -302,6 +304,7 @@ CdRomSwitchModeCompletion(
IN PVOID Context IN PVOID Context
); );
IO_COMPLETION_ROUTINE CdRomXACompletion;
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomXACompletion( CdRomXACompletion(
@ -310,6 +313,7 @@ CdRomXACompletion(
IN PVOID Context IN PVOID Context
); );
IO_COMPLETION_ROUTINE CdRomClassIoctlCompletion;
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomClassIoctlCompletion( CdRomClassIoctlCompletion(
@ -383,6 +387,7 @@ HitachProcessError(
BOOLEAN *Retry BOOLEAN *Retry
); );
IO_COMPLETION_ROUTINE ToshibaProcessErrorCompletion;
VOID VOID
STDCALL STDCALL
ToshibaProcessError( ToshibaProcessError(
@ -451,7 +456,6 @@ FindScsiAdapter (
ULONG NoLoad = 0; ULONG NoLoad = 0;
NTSTATUS NTSTATUS
STDCALL STDCALL
DriverEntry( DriverEntry(
@ -519,7 +523,6 @@ Return Value:
} // end DriverEntry() } // end DriverEntry()
BOOLEAN BOOLEAN
STDCALL STDCALL
ScsiCdRomFindDevices( ScsiCdRomFindDevices(
@ -665,7 +668,6 @@ Return Value:
} // end FindScsiCdRoms() } // end FindScsiCdRoms()
VOID VOID
STDCALL STDCALL
CdRomCreateNamedEvent( CdRomCreateNamedEvent(
@ -699,7 +701,7 @@ Return Value:
NTSTATUS status; NTSTATUS status;
sprintf(eventNameBuffer,"\\Device\\MediaChangeEvent%d", sprintf(eventNameBuffer,"\\Device\\MediaChangeEvent%ld",
DeviceNumber); DeviceNumber);
RtlInitString(&eventNameString, RtlInitString(&eventNameString,
@ -728,7 +730,6 @@ Return Value:
RtlFreeUnicodeString(&unicodeString); RtlFreeUnicodeString(&unicodeString);
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
CreateCdRomDeviceObject( CreateCdRomDeviceObject(
@ -765,7 +766,6 @@ Return Value:
--*/ --*/
{ {
UCHAR ntNameBuffer[64]; UCHAR ntNameBuffer[64];
STRING ntNameString;
UNICODE_STRING ntUnicodeString; UNICODE_STRING ntUnicodeString;
NTSTATUS status; NTSTATUS status;
BOOLEAN changerDevice; BOOLEAN changerDevice;
@ -802,7 +802,7 @@ Return Value:
// //
sprintf(ntNameBuffer, sprintf(ntNameBuffer,
"\\Device\\CdRom%d", "\\Device\\CdRom%lu",
*DeviceCount); *DeviceCount);
status = ScsiClassCreateDeviceObject(DriverObject, status = ScsiClassCreateDeviceObject(DriverObject,
@ -1365,7 +1365,6 @@ CreateCdRomDeviceObjectExit:
} // end CreateCdRomDeviceObject() } // end CreateCdRomDeviceObject()
VOID VOID
STDCALL STDCALL
ScsiCdRomStartIo( ScsiCdRomStartIo(
@ -1382,7 +1381,6 @@ ScsiCdRomStartIo(
ULONG transferPages; ULONG transferPages;
ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; ULONG transferByteCount = currentIrpStack->Parameters.Read.Length;
ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength;
LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset;
PCDROM_DATA cdData; PCDROM_DATA cdData;
PSCSI_REQUEST_BLOCK srb = NULL; PSCSI_REQUEST_BLOCK srb = NULL;
PCDB cdb; PCDB cdb;
@ -1828,7 +1826,6 @@ ScsiCdRomStartIo(
if (cdData->RawAccess) { if (cdData->RawAccess) {
ULONG startingSector; ULONG startingSector;
UCHAR min, sec, frame;
// //
// Free the recently allocated irp, as we don't need it. // Free the recently allocated irp, as we don't need it.
@ -2404,8 +2401,6 @@ ScsiCdRomStartIo(
case IOCTL_CDROM_READ_Q_CHANNEL: { case IOCTL_CDROM_READ_Q_CHANNEL: {
PSUB_Q_CHANNEL_DATA userChannelData =
Irp->AssociatedIrp.SystemBuffer;
PCDROM_SUB_Q_DATA_FORMAT inputBuffer = PCDROM_SUB_Q_DATA_FORMAT inputBuffer =
Irp->AssociatedIrp.SystemBuffer; Irp->AssociatedIrp.SystemBuffer;
@ -2585,10 +2580,6 @@ ScsiCdRomStartIo(
} }
case IOCTL_CDROM_GET_CONTROL: { case IOCTL_CDROM_GET_CONTROL: {
PAUDIO_OUTPUT audioOutput;
PCDROM_AUDIO_CONTROL audioControl = Irp->AssociatedIrp.SystemBuffer;
// //
// Allocate buffer for volume control information. // Allocate buffer for volume control information.
// //
@ -2789,7 +2780,6 @@ ScsiCdRomStartIo(
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
ScsiCdRomReadVerification( ScsiCdRomReadVerification(
@ -2820,11 +2810,6 @@ Return Value:
PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp);
ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; ULONG transferByteCount = currentIrpStack->Parameters.Read.Length;
LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset;
PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension+1);
KIRQL irql;
SCSI_REQUEST_BLOCK srb;
PCDB cdb = (PCDB)srb.Cdb;
NTSTATUS status;
// //
// If the cd is playing music then reject this request. // If the cd is playing music then reject this request.
@ -2875,7 +2860,6 @@ Return Value:
} // end ScsiCdRomReadVerification() } // end ScsiCdRomReadVerification()
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomDeviceControlCompletion( CdRomDeviceControlCompletion(
@ -3443,7 +3427,6 @@ CdRomDeviceControlCompletion(
return STATUS_MORE_PROCESSING_REQUIRED; return STATUS_MORE_PROCESSING_REQUIRED;
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomSetVolumeIntermediateCompletion( CdRomSetVolumeIntermediateCompletion(
@ -3776,7 +3759,6 @@ CdRomSetVolumeIntermediateCompletion(
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomSwitchModeCompletion( CdRomSwitchModeCompletion(
@ -3788,7 +3770,6 @@ CdRomSwitchModeCompletion(
PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp);
PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension + 1); PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension + 1);
BOOLEAN use6Byte = cdData->XAFlags & XA_USE_6_BYTE;
PIO_STACK_LOCATION realIrpStack; PIO_STACK_LOCATION realIrpStack;
PIO_STACK_LOCATION realIrpNextStack; PIO_STACK_LOCATION realIrpNextStack;
PSCSI_REQUEST_BLOCK srb = Context; PSCSI_REQUEST_BLOCK srb = Context;
@ -3925,7 +3906,6 @@ CdRomSwitchModeCompletion(
ULONG maximumTransferLength; ULONG maximumTransferLength;
ULONG transferPages; ULONG transferPages;
UCHAR min, sec, frame;
// //
// Calculate starting offset. // Calculate starting offset.
@ -4145,7 +4125,6 @@ CdRomSwitchModeCompletion(
return STATUS_MORE_PROCESSING_REQUIRED; return STATUS_MORE_PROCESSING_REQUIRED;
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomXACompletion( CdRomXACompletion(
@ -4183,7 +4162,6 @@ Return Value:
PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp);
PIO_STACK_LOCATION irpNextStack = IoGetNextIrpStackLocation(Irp); PIO_STACK_LOCATION irpNextStack = IoGetNextIrpStackLocation(Irp);
PSCSI_REQUEST_BLOCK srb = Context; PSCSI_REQUEST_BLOCK srb = Context;
PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
NTSTATUS status; NTSTATUS status;
BOOLEAN retry; BOOLEAN retry;
@ -4304,7 +4282,6 @@ Return Value:
return status; return status;
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomDeviceControl( CdRomDeviceControl(
@ -4336,13 +4313,8 @@ Return Value:
PKEVENT deviceControlEvent; PKEVENT deviceControlEvent;
PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension+1); PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension+1);
BOOLEAN use6Byte = cdData->XAFlags & XA_USE_6_BYTE;
SCSI_REQUEST_BLOCK srb; SCSI_REQUEST_BLOCK srb;
PCDB cdb = (PCDB)srb.Cdb;
PVOID outputBuffer;
ULONG bytesTransferred = 0;
NTSTATUS status; NTSTATUS status;
NTSTATUS status2;
KIRQL irql; KIRQL irql;
ULONG ioctlCode; ULONG ioctlCode;
@ -4861,7 +4833,6 @@ RetryControl:
} // end ScsiCdRomDeviceControl() } // end ScsiCdRomDeviceControl()
VOID VOID
STDCALL STDCALL
ScanForSpecial( ScanForSpecial(
@ -5024,7 +4995,6 @@ Return Value:
return; return;
} }
VOID VOID
STDCALL STDCALL
HitachProcessError( HitachProcessError(
@ -5224,7 +5194,6 @@ Return Value:
} }
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
ToshibaProcessErrorCompletion( ToshibaProcessErrorCompletion(
@ -5288,7 +5257,6 @@ Return Value:
return STATUS_MORE_PROCESSING_REQUIRED; return STATUS_MORE_PROCESSING_REQUIRED;
} }
VOID VOID
STDCALL STDCALL
ToshibaProcessError( ToshibaProcessError(
@ -5463,7 +5431,6 @@ Return Value:
} }
} }
BOOLEAN BOOLEAN
STDCALL STDCALL
CdRomIsPlayActive( CdRomIsPlayActive(
@ -5555,8 +5522,7 @@ Return Value:
} }
IO_COMPLETION_ROUTINE CdRomMediaChangeCompletion;
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomMediaChangeCompletion( CdRomMediaChangeCompletion(
@ -5727,7 +5693,7 @@ Return Value:
return STATUS_MORE_PROCESSING_REQUIRED; return STATUS_MORE_PROCESSING_REQUIRED;
} }
VOID VOID
STDCALL STDCALL
CdRomTickHandler( CdRomTickHandler(
@ -5981,7 +5947,7 @@ Return Value:
heldIrpList = nextIrp; heldIrpList = nextIrp;
} }
} }
BOOLEAN BOOLEAN
STDCALL STDCALL
CdRomCheckRegistryForMediaChangeValue( CdRomCheckRegistryForMediaChangeValue(
@ -6070,7 +6036,7 @@ Return Value:
// the suffix for the path // the suffix for the path
// //
sprintf(buf, "\\Device%d", DeviceNumber); sprintf(buf, "\\Device%lu", DeviceNumber);
RtlInitAnsiString(&paramNum, buf); RtlInitAnsiString(&paramNum, buf);
// //
@ -6192,7 +6158,7 @@ Return Value:
return FALSE; return FALSE;
} }
BOOLEAN BOOLEAN
STDCALL STDCALL
IsThisASanyo( IsThisASanyo(
@ -6294,7 +6260,6 @@ Return Value:
return FALSE; return FALSE;
} }
BOOLEAN BOOLEAN
STDCALL STDCALL
IsThisAnAtapiChanger( IsThisAnAtapiChanger(
@ -6403,7 +6368,6 @@ Return Value:
return retVal; return retVal;
} }
BOOLEAN BOOLEAN
STDCALL STDCALL
IsThisAMultiLunDevice( IsThisAMultiLunDevice(
@ -6496,7 +6460,7 @@ Return Value:
} }
IO_COMPLETION_ROUTINE CdRomUpdateGeometryCompletion;
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomUpdateGeometryCompletion( CdRomUpdateGeometryCompletion(
@ -6749,7 +6713,6 @@ Return Value:
return STATUS_MORE_PROCESSING_REQUIRED; return STATUS_MORE_PROCESSING_REQUIRED;
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomUpdateCapacity( CdRomUpdateCapacity(
@ -6922,7 +6885,6 @@ Return Value:
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }
NTSTATUS NTSTATUS
STDCALL STDCALL
CdRomClassIoctlCompletion( CdRomClassIoctlCompletion(

1
reactos/drivers/storage/class/include/class2.h
View file

@ -146,6 +146,7 @@ typedef struct _COMPLETION_CONTEXT
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
IO_COMPLETION_ROUTINE ScsiClassAsynchronousCompletion;
NTSTATUS STDCALL NTSTATUS STDCALL
ScsiClassAsynchronousCompletion(IN PDEVICE_OBJECT DeviceObject, ScsiClassAsynchronousCompletion(IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp, IN PIRP Irp,