Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c
Modified: trunk/reactos/drivers/fs/np/fsctrl.c
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c
Modified: trunk/reactos/drivers/input/mouclass/mouclass.c
Modified: trunk/reactos/drivers/storage/atapi/atapi.c
Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c
Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c
Modified: trunk/reactos/drivers/storage/floppy/floppy.c
Modified: trunk/reactos/drivers/storage/floppy/hardware.c
Modified: trunk/reactos/drivers/storage/floppy/ioctl.c
Modified: trunk/reactos/drivers/storage/floppy/readwrite.c
--- trunk/reactos/drivers/bus/isapnp/isapnp.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/bus/isapnp/isapnp.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -433,10 +433,10 @@
}
#endif
}
-
+#if 0
DPRINT("Tag = 0x%X, Type = 0x%X, Size = %d (%s)\n",
tag, *Type, *Size, TagName(*Type, *Small));
-
+#endif
/* Probably invalid data */
if ((*Type == 0xff) && (*Size == 0xffff)) {
DPRINT("Invalid data (Type 0x%X Size 0x%X)\n", *Type, *Size);
--- trunk/reactos/drivers/fs/np/fsctrl.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -464,7 +464,7 @@
break;
default:
- DPRINT("IoControlCode: %x\n", IoStack->Parameters.FileSystemControl.FsControlCode)
+ DPRINT("IoControlCode: %x\n", IoStack->Parameters.FileSystemControl.FsControlCode);
Status = STATUS_UNSUCCESSFUL;
}
--- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -572,7 +572,7 @@
}
if (!DevExt->KeyboardExists) {
- DPRINT("Keyboard not detected\n")
+ DPRINT("Keyboard not detected\n");
if (DevExt->Settings.Headless)
/* Act as if it exists regardless */
DevExt->KeyboardExists = TRUE;
--- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -94,7 +94,7 @@
KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql);
(*ConsumedCount) += ReadSize;
} else {
- DPRINT("MouseClassCallBack() entered, InputCount = %d - DOING NOTHING\n", *InputCount);
+ DPRINT("MouseClassCallBack() entered, InputCount = %d - DOING NOTHING\n", InputCount);
}
DPRINT("Leaving MouseClassCallBack\n");
--- trunk/reactos/drivers/storage/atapi/atapi.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -2054,7 +2054,7 @@
CylinderLow[1] = 0;
CylinderHigh[1] = 0;
DrvHead = (Srb->TargetId ? IDE_DH_DRV1 : 0) | IDE_DH_LBA;
-
+#if 0
DPRINT("%s:BUS=%04x:DRV=%d:LBA48=1:BLK=%08d:SC=%02x:CM=%02x\n",
(Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE",
DeviceExtension->CommandPortBase,
@@ -2063,6 +2063,7 @@
(CylinderHigh[0] << 16) + (CylinderLow[0] << 8) + DectorNumberLow[0],
SectorCount,
Command);
+#endif
}
else if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED)
{
--- trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -371,7 +371,9 @@
*FunctionNameList + 2);
Hint = *(PWORD)((DWORD)DriverBase + *FunctionNameList);
}
+#if 0
DPRINT(" Hint:%04x Name:%s\n", Hint, pName);
+#endif
for (i = 0; i < (sizeof(DiskDumpExports) / sizeof(DiskDumpExports[0])); i++)
{
--- trunk/reactos/drivers/storage/floppy/csqrtns.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/storage/floppy/csqrtns.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -70,7 +70,7 @@
*/
{
UNREFERENCED_PARAMETER(UnusedCsq);
- DPRINT(("CSQ: Removing IRP 0x%x\n", Irp));
+ DPRINT("CSQ: Removing IRP 0x%x\n", Irp);
RemoveEntryList(&Irp->Tail.Overlay.ListEntry);
}
@@ -148,7 +148,7 @@
*/
{
UNREFERENCED_PARAMETER(UnusedCsq);
- DPRINT(("CSQ: Canceling irp 0x%x\n", Irp));
+ DPRINT("CSQ: Canceling irp 0x%x\n", Irp);
Irp->IoStatus.Status = STATUS_CANCELLED;
Irp->IoStatus.Information = 0;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
@@ -173,7 +173,7 @@
*/
{
UNREFERENCED_PARAMETER(UnusedCsq);
- DPRINT(("CSQ: Inserting IRP 0x%x\n", Irp));
+ DPRINT("CSQ: Inserting IRP 0x%x\n", Irp);
InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry);
KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE);
}
--- trunk/reactos/drivers/storage/floppy/floppy.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/storage/floppy/floppy.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -88,7 +88,7 @@
ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
ASSERT(ControllerInfo);
- DPRINT(("floppy: MotorStopDpcFunc called\n"));
+ DPRINT("floppy: MotorStopDpcFunc called\n");
HwTurnOffMotor(ControllerInfo);
ControllerInfo->StopDpcQueued = FALSE;
@@ -115,21 +115,21 @@
PAGED_CODE();
ASSERT(DriveInfo);
- DPRINT(("floppy: StartMotor called\n"));
+ DPRINT("floppy: StartMotor called\n");
if(DriveInfo->ControllerInfo->StopDpcQueued && !KeCancelTimer(&DriveInfo->ControllerInfo->MotorTimer))
{
/* Motor turner-offer is already running; wait for it to finish */
- DPRINT(("floppy: StartMotor: motor turner-offer is already running; waiting for it\n"));
+ DPRINT("floppy: StartMotor: motor turner-offer is already running; waiting for it\n");
KeWaitForSingleObject(&DriveInfo->ControllerInfo->MotorStoppedEvent, Executive, KernelMode, FALSE, NULL);
- DPRINT(("floppy: StartMotor: wait satisfied\n"));
+ DPRINT("floppy: StartMotor: wait satisfied\n");
}
DriveInfo->ControllerInfo->StopDpcQueued = FALSE;
if(HwTurnOnMotor(DriveInfo) != STATUS_SUCCESS)
{
- DPRINT(("floppy: StartMotor(): warning: HwTurnOnMotor failed\n"));
+ DPRINT("floppy: StartMotor(): warning: HwTurnOnMotor failed\n");
}
}
@@ -149,7 +149,7 @@
ASSERT(ControllerInfo);
- DPRINT(("floppy: StopMotor called\n"));
+ DPRINT("floppy: StopMotor called\n");
/* one relative second, in 100-ns units */
StopTime.QuadPart = 10000000;
@@ -202,7 +202,7 @@
{
UNREFERENCED_PARAMETER(DeviceObject);
- DPRINT(("floppy: CreateClose called\n"));
+ DPRINT("floppy: CreateClose called\n");
Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = FILE_OPENED;
@@ -237,10 +237,10 @@
StartMotor(DriveInfo);
/* set the data rate */
- DPRINT(("floppy: FIXME: UN-HARDCODE DATA RATE\n"));
+ DPRINT("floppy: FIXME: UN-HARDCODE DATA RATE\n");
if(HwSetDataRate(DriveInfo->ControllerInfo, 0) != STATUS_SUCCESS)
{
- DPRINT(("floppy: Recalibrate: HwSetDataRate failed\n"));
+ DPRINT("floppy: Recalibrate: HwSetDataRate failed\n");
StopMotor(DriveInfo->ControllerInfo);
return STATUS_IO_DEVICE_ERROR;
}
@@ -258,7 +258,7 @@
Status = HwRecalibrate(DriveInfo);
if(Status != STATUS_SUCCESS)
{
- DPRINT(("floppy: Recalibrate: HwRecalibrate returned error\n"));
+ DPRINT("floppy: Recalibrate: HwRecalibrate returned error\n");
continue;
}
@@ -268,7 +268,7 @@
Status = HwRecalibrateResult(DriveInfo->ControllerInfo);
if(Status != STATUS_SUCCESS)
{
- DPRINT(("floppy: Recalibrate: HwRecalibrateResult returned error\n"));
+ DPRINT("floppy: Recalibrate: HwRecalibrateResult returned error\n");
break;
}
}
@@ -303,7 +303,7 @@
PAGED_CODE();
ASSERT(DriveInfo);
- DPRINT(("floppy: ResetChangeFlag called\n"));
+ DPRINT("floppy: ResetChangeFlag called\n");
/* Try to recalibrate. We don't care if it works. */
Recalibrate(DriveInfo);
@@ -317,7 +317,7 @@
/* Seek to 1 */
if(HwSeek(DriveInfo, 1) != STATUS_SUCCESS)
{
- DPRINT(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"));
+ DPRINT("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n");
StopMotor(DriveInfo->ControllerInfo);
return STATUS_IO_DEVICE_ERROR;
}
@@ -326,7 +326,7 @@
if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS)
{
- DPRINT(("floppy: ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n"));
+ DPRINT("floppy: ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n");
StopMotor(DriveInfo->ControllerInfo);
return STATUS_IO_DEVICE_ERROR;
}
@@ -334,7 +334,7 @@
/* Seek back to 0 */
if(HwSeek(DriveInfo, 0) != STATUS_SUCCESS)
{
- DPRINT(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"));
+ DPRINT("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n");
StopMotor(DriveInfo->ControllerInfo);
return STATUS_IO_DEVICE_ERROR;
}
@@ -343,7 +343,7 @@
if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS)
{
- DPRINT(("floppy: ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n"));
+ DPRINT("floppy: ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n");
StopMotor(DriveInfo->ControllerInfo);
return STATUS_IO_DEVICE_ERROR;
}
@@ -351,7 +351,7 @@
/* Check the change bit */
if(HwDiskChanged(DriveInfo, &DiskChanged) != STATUS_SUCCESS)
{
- DPRINT(("floppy: ResetChangeFlag(): HwDiskChagned failed; returning STATUS_IO_DEVICE_ERROR\n"));
+ DPRINT("floppy: ResetChangeFlag(): HwDiskChagned failed; returning STATUS_IO_DEVICE_ERROR\n");
StopMotor(DriveInfo->ControllerInfo);
return STATUS_IO_DEVICE_ERROR;
}
@@ -379,7 +379,7 @@
PAGED_CODE();
UNREFERENCED_PARAMETER(DriverObject);
- DPRINT(("floppy: unloading\n"));
+ DPRINT("floppy: unloading\n");
KeSetEvent(&QueueThreadTerminate, 0, FALSE);
KeWaitForSingleObject(QueueThreadObject, Executive, KernelMode, FALSE, 0);
@@ -414,7 +414,7 @@
/* Power down the controller */
if(HwPowerOff(&gControllerInfo[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: unload: warning: HwPowerOff failed\n"));
+ DPRINT("floppy: unload: warning: HwPowerOff failed\n");
}
}
}
@@ -483,7 +483,7 @@
UNREFERENCED_PARAMETER(PathName);
- DPRINT(("floppy: ConfigCallback called with ControllerNumber %d\n", ControllerNumber));
+ DPRINT("floppy: ConfigCallback called with ControllerNumber %d\n", ControllerNumber);
gControllerInfo[gNumberOfControllers].ControllerNumber = ControllerNumber;
gControllerInfo[gNumberOfControllers].InterfaceType = BusType;
@@ -514,7 +514,7 @@
if(!HalTranslateBusAddress(BusType, BusNumber, PartialDescriptor->u.Port.Start, &AddressSpace, &TranslatedAddress))
{
- DPRINT(("floppy: HalTranslateBusAddress failed; returning\n"));
+ DPRINT("floppy: HalTranslateBusAddress failed; returning\n");
return STATUS_IO_DEVICE_ERROR;
}
@@ -606,7 +606,7 @@
ASSERT(ControllerInfo);
- DPRINT(("floppy: ISR called\n"));
+ DPRINT("floppy: ISR called\n");
/*
* Due to the stupidity of the drive/controller relationship on the floppy drive, only one device object
@@ -650,7 +650,7 @@
ASSERT(ControllerInfo);
- DPRINT(("floppy: DpcForIsr called\n"));
+ DPRINT("floppy: DpcForIsr called\n");
KeSetEvent(&ControllerInfo->SynchEvent, EVENT_INCREMENT, FALSE);
}
@@ -674,29 +674,29 @@
PAGED_CODE();
ASSERT(ControllerInfo);
- DPRINT(("floppy: InitController called with Controller 0x%x\n", ControllerInfo));
+ DPRINT("floppy: InitController called with Controller 0x%x\n", ControllerInfo);
KeClearEvent(&ControllerInfo->SynchEvent);
- DPRINT(("floppy: InitController: resetting the controller\n"));
+ DPRINT("floppy: InitController: resetting the controller\n");
/* Reset the controller */
if(HwReset(ControllerInfo) != STATUS_SUCCESS)
{
- DPRINT(("floppy: InitController: unable to reset controller\n"));
+ DPRINT("floppy: InitController: unable to reset controller\n");
return STATUS_IO_DEVICE_ERROR;
}
- DPRINT(("floppy: InitController: setting data rate\n"));
+ DPRINT("floppy: InitController: setting data rate\n");
/* Set data rate */
if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS)
{
- DPRINT(("floppy: InitController: unable to set data rate\n"));
+ DPRINT("floppy: InitController: unable to set data rate\n");
return STATUS_IO_DEVICE_ERROR;
}
- DPRINT(("floppy: InitController: waiting for initial interrupt\n"));
+ DPRINT("floppy: InitController: waiting for initial interrupt\n");
/* Wait for an interrupt */
WaitForControllerInterrupt(ControllerInfo);
@@ -704,16 +704,16 @@
/* Reset means you have to clear each of the four interrupts (one per drive) */
for(i = 0; i < MAX_DRIVES_PER_CONTROLLER; i++)
{
- DPRINT(("floppy: InitController: Sensing interrupt %d\n", i));
+ DPRINT("floppy: InitController: Sensing interrupt %d\n", i);
if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS)
{
- DPRINT(("floppy: InitController: Unable to clear interrupt 0x%x\n", i));
+ DPRINT("floppy: InitController: Unable to clear interrupt 0x%x\n", i);
return STATUS_IO_DEVICE_ERROR;
}
}
- DPRINT(("floppy: InitController: done sensing interrupts\n"));
+ DPRINT("floppy: InitController: done sensing interrupts\n");
/* Next, see if we have the right version to do implied seek */
if(HwGetVersion(ControllerInfo) == VERSION_ENHANCED)
@@ -721,12 +721,12 @@
/* If so, set that up -- all defaults below except first TRUE for EIS */
if(HwConfigure(ControllerInfo, TRUE, TRUE, FALSE, 0, 0) != STATUS_SUCCESS)
{
- DPRINT(("floppy: InitController: unable to set up implied seek\n"));
+ DPRINT("floppy: InitController: unable to set up implied seek\n");
ControllerInfo->ImpliedSeeks = FALSE;
}
else
{
- DPRINT(("floppy: InitController: implied seeks set!\n"));
+ DPRINT("floppy: InitController: implied seeks set!\n");
ControllerInfo->ImpliedSeeks = TRUE;
}
@@ -753,23 +753,23 @@
}
else
{
- DPRINT(("floppy: InitController: enhanced version not supported; disabling implied seeks\n"));
+ DPRINT("floppy: InitController: enhanced version not supported; disabling implied seeks\n");
ControllerInfo->ImpliedSeeks = FALSE;
ControllerInfo->Model30 = FALSE;
}
/* Specify */
- DPRINT(("FLOPPY: FIXME: Figure out speed\n"));
+ DPRINT("FLOPPY: FIXME: Figure out speed\n");
HeadLoadTime = SPECIFY_HLT_500K;
HeadUnloadTime = SPECIFY_HUT_500K;
StepRateTime = SPECIFY_SRT_500K;
- DPRINT(("floppy: InitController: issuing specify command to controller\n"));
+ DPRINT("floppy: InitController: issuing specify command to controller\n");
/* Don't disable DMA --> enable dma (dumb & confusing) */
if(HwSpecify(ControllerInfo, HeadLoadTime, HeadUnloadTime, StepRateTime, FALSE) != STATUS_SUCCESS)
{
- DPRINT(("floppy: InitController: unable to specify options\n"));
+ DPRINT("floppy: InitController: unable to specify options\n");
return STATUS_IO_DEVICE_ERROR;
}
@@ -785,11 +785,11 @@
*/
for(i = 0; i < ControllerInfo->NumberOfDrives; i++)
{
- DPRINT(("floppy: InitController: recalibrating drive 0x%x on controller 0x%x\n", i, ControllerInfo));
+ DPRINT("floppy: InitController: recalibrating drive 0x%x on controller 0x%x\n", i, ControllerInfo);
Recalibrate(&ControllerInfo->DriveInfo[i]);
}
- DPRINT(("floppy: InitController: done initializing; returning STATUS_SUCCESS\n"));
+ DPRINT("floppy: InitController: done initializing; returning STATUS_SUCCESS\n");
return STATUS_SUCCESS;
}
@@ -831,7 +831,7 @@
*/
if(!gControllerInfo[0].Populated)
{
- DPRINT(("floppy: AddControllers: failed to get controller info from registry\n"));
+ DPRINT("floppy: AddControllers: failed to get controller info from registry\n");
return FALSE;
}
@@ -849,15 +849,15 @@
/* Must set up the DPC before we connect the interrupt */
KeInitializeDpc(&gControllerInfo[i].Dpc, DpcForIsr, &gControllerInfo[i]);
- DPRINT(("floppy: Connecting interrupt %d to controller%d (object 0x%x)\n", gControllerInfo[i].MappedVector,
- i, &gControllerInfo[i]));
+ DPRINT("floppy: Connecting interrupt %d to controller%d (object 0x%x)\n", gControllerInfo[i].MappedVector,
+ i, &gControllerInfo[i]);
/* NOTE: We cannot share our interrupt, even on level-triggered buses. See Isr() for details. */
if(IoConnectInterrupt(&gControllerInfo[i].InterruptObject, Isr, &gControllerInfo[i], 0, gControllerInfo[i].MappedVector,
gControllerInfo[i].MappedLevel, gControllerInfo[i].MappedLevel, gControllerInfo[i].InterruptMode,
FALSE, Affinity, 0) != STATUS_SUCCESS)
{
- DPRINT(("floppy: AddControllers: unable to connect interrupt\n"));
+ DPRINT("floppy: AddControllers: unable to connect interrupt\n");
continue;
}
@@ -876,7 +876,7 @@
if(!gControllerInfo[i].AdapterObject)
{
- DPRINT(("floppy: AddControllers: unable to allocate an adapter object\n"));
+ DPRINT("floppy: AddControllers: unable to allocate an adapter object\n");
IoDisconnectInterrupt(gControllerInfo[i].InterruptObject);
continue;
}
@@ -884,7 +884,7 @@
/* 2b: Initialize the new controller */
if(InitController(&gControllerInfo[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: AddControllers():Unable to set up controller %d - initialization failed\n", i));
+ DPRINT("floppy: AddControllers():Unable to set up controller %d - initialization failed\n", i);
IoDisconnectInterrupt(gControllerInfo[i].InterruptObject);
continue;
}
@@ -901,7 +901,7 @@
UNICODE_STRING ArcPath;
UCHAR DriveNumber;
- DPRINT(("floppy: AddControllers(): Configuring drive %d on controller %d\n", i, j));
+ DPRINT("floppy: AddControllers(): Configuring drive %d on controller %d\n", i, j);
/*
* 3a: create a device object for the drive
@@ -925,12 +925,12 @@
FILE_DEVICE_DISK, FILE_REMOVABLE_MEDIA | FILE_FLOPPY_DISKETTE, FALSE,
&gControllerInfo[i].DriveInfo[j].DeviceObject) != STATUS_SUCCESS)
{
- DPRINT(("floppy: AddControllers: unable to register a Device object\n"));
+ DPRINT("floppy: AddControllers: unable to register a Device object\n");
IoDisconnectInterrupt(gControllerInfo[i].InterruptObject);
continue; /* continue on to next drive */
}
- DPRINT(("floppy: AddControllers: New device: %S (0x%x)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject));
+ DPRINT("floppy: AddControllers: New device: %S (0x%x)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject);
/* 3b.5: Create an ARC path in case we're booting from this drive */
swprintf(gControllerInfo[i].DriveInfo[j].ArcPathBuffer,
@@ -947,7 +947,7 @@
RtlInitUnicodeString(&LinkName, gControllerInfo[i].DriveInfo[j].SymLinkBuffer);
if(IoCreateSymbolicLink(&LinkName, &DeviceName) != STATUS_SUCCESS)
{
- DPRINT(("floppy: AddControllers: Unable to create a symlink for drive %d\n", DriveNumber));
+ DPRINT("floppy: AddControllers: Unable to create a symlink for drive %d\n", DriveNumber);
IoDisconnectInterrupt(gControllerInfo[i].InterruptObject);
IoDeassignArcName(&ArcPath);
continue; /* continue to next drive */
@@ -970,7 +970,7 @@
}
}
- DPRINT(("floppy: AddControllers: --------------------------------------------> finished adding controllers\n"));
+ DPRINT("floppy: AddControllers: --------------------------------------------> finished adding controllers\n");
return TRUE;
}
@@ -991,7 +991,7 @@
{
PDRIVE_INFO DriveInfo = DeviceObject->DeviceExtension;
- DPRINT(("floppy: SignalMediaChanged called\n"));
+ DPRINT("floppy: SignalMediaChanged called\n");
DriveInfo->DiskChangeCount++;
@@ -1044,18 +1044,18 @@
if(KeReadStateEvent(&QueueThreadTerminate))
{
- DPRINT(("floppy: QueueThread terminating\n"));
+ DPRINT("floppy: QueueThread terminating\n");
return;
}
- DPRINT(("floppy: QueueThread: servicing an IRP\n"));
+ DPRINT("floppy: QueueThread: servicing an IRP\n");
Irp = IoCsqRemoveNextIrp(&Csq, 0);
/* we won't get an irp if it was canceled */
if(!Irp)
{
- DPRINT(("floppy: QueueThread: IRP queue empty\n"));
+ DPRINT("floppy: QueueThread: IRP queue empty\n");
continue;
}
@@ -1078,7 +1078,7 @@
break;
default:
- DPRINT(("floppy: QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction));
+ DPRINT("floppy: QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction);
Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
Irp->IoStatus.Information = 0;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
@@ -1155,13 +1155,13 @@
*/
if(PsCreateSystemThread(&ThreadHandle, 0, 0, 0, 0, QueueThread, 0) != STATUS_SUCCESS)
{
- DPRINT(("floppy: Unable to create system thread; failing init\n"));
+ DPRINT("floppy: Unable to create system thread; failing init\n");
return STATUS_INSUFFICIENT_RESOURCES;
}
if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS)
{
- DPRINT(("floppy: Unable to reference returned thread handle; failing init\n"));
+ DPRINT("floppy: Unable to reference returned thread handle; failing init\n");
return STATUS_UNSUCCESSFUL;
}
--- trunk/reactos/drivers/storage/floppy/hardware.c 2005-07-29 09:25:26 UTC (rev 16851)
+++ trunk/reactos/drivers/storage/floppy/hardware.c 2005-07-29 09:30:41 UTC (rev 16852)
@@ -82,7 +82,7 @@
{
UCHAR Status = READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER);
- if((Status & MSR_IO_DIRECTION)) /* 0 for out */
+ if(Status & MSR_IO_DIRECTION) /* 0 for out */
return FALSE;
if(!(Status & MSR_DATA_REG_READY_FOR_IO))
@@ -183,7 +183,7 @@
return STATUS_SUCCESS;
}
- DPRINT(("floppy: Send_Byte: timed out trying to write\n"));
+ DPRINT("floppy: Send_Byte: timed out trying to write\n");
HwDumpRegisters(ControllerInfo);
return STATUS_UNSUCCESSFUL;
}
@@ -252,7 +252,7 @@
return STATUS_SUCCESS;
}
- DPRINT(("floppy: Get_Byte: timed out trying to read\n"));
+ DPRINT("floppy: Get_Byte: timed out trying to read\n");
HwDumpRegisters(ControllerInfo);
return STATUS_UNSUCCESSFUL;
}
@@ -269,7 +269,7 @@
* STATUS_SUCCESS
*/
{
- DPRINT(("floppy: HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER));
+ DPRINT("floppy: HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER);
WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DataRate);
@@ -290,7 +290,7 @@
* - Called at DISPATCH_LEVEL
*/
{
- DPRINT(("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER));
+ DPRINT("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER);
WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE);
@@ -332,7 +332,7 @@
else if (Unit == 3)
Buffer |= DOR_FLOPPY_MOTOR_ON_D;
- DPRINT(("floppy: HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER));
+ DPRINT("floppy: HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER);
WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, Buffer);
return STATUS_SUCCESS;
@@ -357,7 +357,7 @@
PAGED_CODE();
- DPRINT(("floppy: HwSenseDriveStatus called\n"));
+ DPRINT("floppy: HwSenseDriveStatus called\n");
Buffer[0] = COMMAND_SENSE_DRIVE_STATUS;
Buffer[1] = DriveInfo->UnitNumber; /* hard-wired to head 0 for now */
@@ -365,7 +365,7 @@
for(i = 0; i < 2; i++)
if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwSenseDriveStatus: failed to write FIFO\n"));
+ DPRINT("floppy: HwSenseDriveStatus: failed to write FIFO\n");
return STATUS_UNSUCCESSFUL;
}
@@ -431,11 +431,11 @@
/* Send the command */
for(i = 0; i < 9; i++)
{
- DPRINT(("floppy: HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i]));
+ DPRINT("floppy: HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i]);
if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("HwReadWriteData: Unable to write to the FIFO\n"));
+ DPRINT("HwReadWriteData: Unable to write to the FIFO\n");
return STATUS_UNSUCCESSFUL;
}
}
@@ -467,19 +467,19 @@
if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwRecalibrateResult: Unable to write the controller\n"));
+ DPRINT("floppy: HwRecalibrateResult: Unable to write the controller\n");
return STATUS_UNSUCCESSFUL;
}
for(i = 0; i < 2; i++)
if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwRecalibrateResult: unable to read FIFO\n"));
+ DPRINT("floppy: HwRecalibrateResult: unable to read FIFO\n");
return STATUS_UNSUCCESSFUL;
}
/* Validate that it did what we told it to */
- DPRINT(("floppy: HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1]));
+ DPRINT("floppy: HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1]);
/*
* Buffer[0] = ST0
@@ -489,20 +489,20 @@
/* Is the PCN 0? */
if(Buffer[1] != 0)
{
- DPRINT(("floppy: HwRecalibrateResult: PCN not 0\n"));
+ DPRINT("floppy: HwRecalibrateResult: PCN not 0\n");
return STATUS_UNSUCCESSFUL;
}
/* test seek complete */
if((Buffer[0] & SR0_SEEK_COMPLETE) != SR0_SEEK_COMPLETE)
{
- DPRINT(("floppy: HwRecalibrateResult: Failed to complete the seek\n"));
+ DPRINT("floppy: HwRecalibrateResult: Failed to complete the seek\n");
return STATUS_UNSUCCESSFUL;
}
/* Is the equipment check flag set? Could be no disk in drive... */
if((Buffer[0] & SR0_EQUIPMENT_CHECK) == SR0_EQUIPMENT_CHECK)
- DPRINT(("floppy: HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n"));
+ DPRINT("floppy: HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n");
return STATUS_SUCCESS;
}
@@ -532,13 +532,13 @@
for(i = 0; i < 7; i++)
if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwReadWriteResult: unable to read fifo\n"));
+ DPRINT("floppy: HwReadWriteResult: unable to read fifo\n");
return STATUS_UNSUCCESSFUL;
}
/* Validate that it did what we told it to */
- DPRINT(("floppy: HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3],
- Buffer[4], Buffer[5], Buffer[6]));
+ DPRINT("floppy: HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3],
+ Buffer[4], Buffer[5], Buffer[6]);
/* Last command successful? */
if((Buffer[0] & SR0_LAST_COMMAND_STATUS) != SR0_LCS_SUCCESS)
@@ -565,7 +565,7 @@
UCHAR Buffer[2];
int i;
- DPRINT(("floppy: HwRecalibrate called\n"));
+ DPRINT("floppy: HwRecalibrate called\n");
PAGED_CODE();
@@ -575,7 +575,7 @@
for(i = 0; i < 2; i++)
if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwRecalibrate: unable to write FIFO\n"));
+ DPRINT("floppy: HwRecalibrate: unable to write FIFO\n");
return STATUS_UNSUCCESSFUL;
}
@@ -600,7 +600,7 @@
if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwSenseInterruptStatus: failed to write controller\n"));
+ DPRINT("floppy: HwSenseInterruptStatus: failed to write controller\n");
return STATUS_UNSUCCESSFUL;
}
@@ -608,12 +608,12 @@
{
if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwSenseInterruptStatus: failed to read controller\n"));
+ DPRINT("floppy: HwSenseInterruptStatus: failed to read controller\n");
return STATUS_UNSUCCESSFUL;
}
}
- DPRINT(("floppy: HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1]));
+ DPRINT("floppy: HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1]);
return STATUS_SUCCESS;
}
@@ -635,7 +635,7 @@
UCHAR Buffer[2];
int i;
- DPRINT(("floppy: HwReadId called\n"));
+ DPRINT("floppy: HwReadId called\n");
PAGED_CODE();
@@ -645,7 +645,7 @@
for(i = 0; i < 2; i++)
if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwReadId: unable to send bytes to fifo\n"));
+ DPRINT("floppy: HwReadId: unable to send bytes to fifo\n");
return STATUS_UNSUCCESSFUL;
}
@@ -678,7 +678,7 @@
UCHAR Buffer[6];
int i;
- DPRINT(("floppy: HwFormatTrack called\n"));
+ DPRINT("floppy: HwFormatTrack called\n");
PAGED_CODE();
@@ -692,7 +692,7 @@
for(i = 0; i < 6; i++)
if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwFormatTrack: unable to send bytes to floppy\n"));
+ DPRINT("floppy: HwFormatTrack: unable to send bytes to floppy\n");
return STATUS_UNSUCCESSFUL;
}
@@ -718,7 +718,7 @@
UCHAR Buffer[3];
int i;
- DPRINT(("floppy: HwSeek called for cyl 0x%x\n", Cylinder));
+ DPRINT("floppy: HwSeek called for cyl 0x%x\n", Cylinder);
PAGED_CODE();
@@ -729,7 +729,7 @@
for(i = 0; i < 3; i++)
if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwSeek: failed to write fifo\n"));
+ DPRINT("floppy: HwSeek: failed to write fifo\n");
return STATUS_UNSUCCESSFUL;
}
@@ -769,7 +769,7 @@
UCHAR Buffer[4];
int i;
- DPRINT(("floppy: HwConfigure called\n"));
+ DPRINT("floppy: HwConfigure called\n");
PAGED_CODE();
@@ -781,7 +781,7 @@
for(i = 0; i < 4; i++)
if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwConfigure: failed to write the fifo\n"));
+ DPRINT("floppy: HwConfigure: failed to write the fifo\n");
return STATUS_UNSUCCESSFUL;
}
@@ -809,17 +809,17 @@
if(Send_Byte(ControllerInfo, COMMAND_VERSION) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwGetVersion: unable to write fifo\n"));
+ DPRINT("floppy: HwGetVersion: unable to write fifo\n");
return STATUS_UNSUCCESSFUL;
}
if(Get_Byte(ControllerInfo, &Buffer) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwGetVersion: unable to write fifo\n"));
+ DPRINT("floppy: HwGetVersion: unable to write fifo\n");
return STATUS_UNSUCCESSFUL;
}
- DPRINT(("floppy: HwGetVersion returning version 0x%x\n", Buffer));
+ DPRINT("floppy: HwGetVersion returning version 0x%x\n", Buffer);
return Buffer;
}
@@ -843,18 +843,18 @@
Buffer = READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER);
- DPRINT(("floppy: HwDiskChanged: read 0x%x from DIR\n", Buffer));
+ DPRINT("floppy: HwDiskChanged: read 0x%x from DIR\n", Buffer);
if(ControllerInfo->Model30)
{
if(!(Buffer & DIR_DISKETTE_CHANGE))
{
- DPRINT(("floppy: HdDiskChanged - Model30 - returning TRUE\n"));
+ DPRINT("floppy: HdDiskChanged - Model30 - returning TRUE\n");
*DiskChanged = TRUE;
}
else
{
- DPRINT(("floppy: HdDiskChanged - Model30 - returning FALSE\n"));
+ DPRINT("floppy: HdDiskChanged - Model30 - returning FALSE\n");
*DiskChanged = FALSE;
}
}
@@ -862,12 +862,12 @@
{
if(Buffer & DIR_DISKETTE_CHANGE)
{
- DPRINT(("floppy: HdDiskChanged - PS2 - returning TRUE\n"));
+ DPRINT("floppy: HdDiskChanged - PS2 - returning TRUE\n");
*DiskChanged = TRUE;
}
else
{
- DPRINT(("floppy: HdDiskChanged - PS2 - returning FALSE\n"));
+ DPRINT("floppy: HdDiskChanged - PS2 - returning FALSE\n");
*DiskChanged = FALSE;
}
}
@@ -893,11 +893,11 @@
if(Get_Byte(ControllerInfo, Status) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwSenseDriveStatus: unable to read fifo\n"));
+ DPRINT("floppy: HwSenseDriveStatus: unable to read fifo\n");
return STATUS_UNSUCCESSFUL;
}
- DPRINT(("floppy: HwSenseDriveStatusResult: ST3: 0x%x\n", *Status));
+ DPRINT("floppy: HwSenseDriveStatusResult: ST3: 0x%x\n", *Status);
return STATUS_SUCCESS;
}
@@ -931,25 +931,25 @@
for(i = 0; i < 7; i++)
if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: ReadIdResult(): can't read from the controller\n"));
+ DPRINT("floppy: ReadIdResult(): can't read from the controller\n");
return STATUS_UNSUCCESSFUL;
}
/* Validate that it did what we told it to */
- DPRINT(("floppy: ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3],
- Buffer[4], Buffer[5], Buffer[6]));
+ DPRINT("floppy: ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3],
+ Buffer[4], Buffer[5], Buffer[6]);
/* Last command successful? */
if((Buffer[0] & SR0_LAST_COMMAND_STATUS) != SR0_LCS_SUCCESS)
{
- DPRINT(("floppy: ReadId didn't return last command success\n"));
+ DPRINT("floppy: ReadId didn't return last command success\n");
return STATUS_UNSUCCESSFUL;
}
/* ID mark found? */
if(Buffer[1] & SR1_CANNOT_FIND_ID_ADDRESS)
{
- DPRINT(("floppy: ReadId didn't find an address mark\n"));
+ DPRINT("floppy: ReadId didn't find an address mark\n");
return STATUS_UNSUCCESSFUL;
}
@@ -996,13 +996,13 @@
Buffer[1] = 0xdf;
Buffer[2] = 0x2;
- //DPRINT(("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2]));
- DPRINT(("FLOPPY: HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n"));
+ //DPRINT("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2]);
+ DPRINT("FLOPPY: HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n");
for(i = 0; i < 3; i++)
if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS)
{
- DPRINT(("floppy: HwSpecify: unable to write to controller\n"));
+ DPRINT("floppy: HwSpecify: unable to write to controller\n");
return STATUS_UNSUCCESSFUL;
}
@@ -1021,7 +1021,7 @@
* - Generates an interrupt that must be serviced four times (one per drive)
*/
{
- DPRINT(("floppy: HwReset called\n"));
+ DPRINT("floppy: HwReset called\n");
/* Write the reset bit in the DRSR */
WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_SW_RESET);
@@ -1030,13 +1030,13 @@
if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET))
{
HwDumpRegisters(ControllerInfo);
- DPRINT(("floppy: HwReset: Setting Enable bit\n"));
+ DPRINT("floppy: HwReset: Setting Enable bit\n");
WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_DMA_IO_INTERFACE_ENABLE|DOR_RESET);
HwDumpRegisters(ControllerInfo);
if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET))
{
- DPRINT(("floppy: HwReset: failed to set the DOR enable bit!\n"));
+ DPRINT("floppy: HwReset: failed to set the DOR enable bit!\n");
HwDumpRegisters(ControllerInfo);
return STATUS_UNSUCCESSFUL;
}
@@ -1057,7 +1057,7 @@
* - Wake up with a hardware reset
*/
{
- DPRINT(("floppy: HwPowerOff called on controller 0x%x\n", ControllerInfo));
+ DPRINT("floppy: HwPowerOff called on controller 0x%x\n", ControllerInfo);
WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_POWER_DOWN);
@@ -1073,11 +1073,11 @@
{
UNREFERENCED_PARAMETER(ControllerInfo);
[truncated at 1000 lines; 513 more skipped]