From: Amine Khaldi Date: Mon, 3 Feb 2014 10:46:48 +0000 (+0000) Subject: [FLOPPY] X-Git-Tag: ReactOS-0.3.16-CLT2014~342 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=efc03277d43a50686f5e46b42d8789f7f342f207 [FLOPPY] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61948 --- diff --git a/reactos/drivers/storage/floppy/csqrtns.c b/reactos/drivers/storage/floppy/csqrtns.c index f50b1a51a11..579d6571d9c 100644 --- a/reactos/drivers/storage/floppy/csqrtns.c +++ b/reactos/drivers/storage/floppy/csqrtns.c @@ -40,6 +40,8 @@ #include "precomp.h" +#include + /* Global CSQ struct that the CSQ functions initialize and use */ IO_CSQ Csq; @@ -171,4 +173,3 @@ CsqInsertIrp(PIO_CSQ UnusedCsq, PIRP Irp) InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); } - diff --git a/reactos/drivers/storage/floppy/csqrtns.h b/reactos/drivers/storage/floppy/csqrtns.h index 2c3d507f333..2fe4092a47b 100644 --- a/reactos/drivers/storage/floppy/csqrtns.h +++ b/reactos/drivers/storage/floppy/csqrtns.h @@ -24,6 +24,8 @@ * 15-Feb-2004 vizzini - Created */ +#pragma once + #include /* @@ -51,4 +53,3 @@ CsqReleaseLock(PIO_CSQ Csq, KIRQL Irql); VOID NTAPI CsqCompleteCanceledIrp(PIO_CSQ Csq, PIRP Irp); - diff --git a/reactos/drivers/storage/floppy/floppy.c b/reactos/drivers/storage/floppy/floppy.c index e96c47abb0f..740fd9e18e4 100644 --- a/reactos/drivers/storage/floppy/floppy.c +++ b/reactos/drivers/storage/floppy/floppy.c @@ -42,6 +42,12 @@ #include "precomp.h" +#include +#include + +#include "ioctl.h" +#include "readwrite.h" + /* * Global controller info structures. Each controller gets one. Since the system * will probably have only one, with four being a very unlikely maximum, a static @@ -1192,4 +1198,3 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) return STATUS_SUCCESS; } - diff --git a/reactos/drivers/storage/floppy/floppy.h b/reactos/drivers/storage/floppy/floppy.h index 13f6a5ff8a4..e1d0efcd886 100644 --- a/reactos/drivers/storage/floppy/floppy.h +++ b/reactos/drivers/storage/floppy/floppy.h @@ -24,6 +24,8 @@ * 15-Feb-2004 vizzini - Created */ +#pragma once + #define MAX_DEVICE_NAME 255 #define MAX_ARC_PATH_LEN 255 #define MAX_DRIVES_PER_CONTROLLER 4 @@ -123,4 +125,3 @@ StopMotor(PCONTROLLER_INFO ControllerInfo); #define GEOMETRY_144_TRACKSPERCYLINDER 2 #define GEOMETRY_144_SECTORSPERTRACK 18 #define GEOMETRY_144_BYTESPERSECTOR 512 - diff --git a/reactos/drivers/storage/floppy/hardware.c b/reactos/drivers/storage/floppy/hardware.c index 2b22ec9630d..c163bba180b 100644 --- a/reactos/drivers/storage/floppy/hardware.c +++ b/reactos/drivers/storage/floppy/hardware.c @@ -49,11 +49,12 @@ #include "precomp.h" +#include + /* * Hardware Support Routines */ - static BOOLEAN NTAPI ReadyForWrite(PCONTROLLER_INFO ControllerInfo) /* @@ -1041,4 +1042,3 @@ HwDumpRegisters(PCONTROLLER_INFO ControllerInfo) INFO_(FLOPPY, "MAIN_STATUS_REGISTER =0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER)); INFO_(FLOPPY, "DIGITAL_INPUT_REGISTER = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER)); } - diff --git a/reactos/drivers/storage/floppy/hardware.h b/reactos/drivers/storage/floppy/hardware.h index 720c828d3f6..f36ec25ff52 100644 --- a/reactos/drivers/storage/floppy/hardware.h +++ b/reactos/drivers/storage/floppy/hardware.h @@ -34,6 +34,8 @@ * in favor of shifts or bitfields */ +#pragma once + #define FLOPPY_DEFAULT_IRQ 0x6 #define FDC_PORT_BYTES 0x8 @@ -350,4 +352,3 @@ HwDumpRegisters(PCONTROLLER_INFO ControllerInfo); NTSTATUS NTAPI HwTurnOffMotor(PCONTROLLER_INFO ControllerInfo); - diff --git a/reactos/drivers/storage/floppy/ioctl.c b/reactos/drivers/storage/floppy/ioctl.c index 1cb84322f67..88b3b39a80a 100644 --- a/reactos/drivers/storage/floppy/ioctl.c +++ b/reactos/drivers/storage/floppy/ioctl.c @@ -33,6 +33,7 @@ #include "precomp.h" +#include NTSTATUS NTAPI DeviceIoctl(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -267,4 +268,3 @@ DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp) StopMotor(DriveInfo->ControllerInfo); return; } - diff --git a/reactos/drivers/storage/floppy/ioctl.h b/reactos/drivers/storage/floppy/ioctl.h index 386d5db6a94..12774b2f8d6 100644 --- a/reactos/drivers/storage/floppy/ioctl.h +++ b/reactos/drivers/storage/floppy/ioctl.h @@ -24,6 +24,8 @@ * 15-Feb-2004 vizzini - Created */ +#pragma once + DRIVER_DISPATCH DeviceIoctl; NTSTATUS NTAPI @@ -31,4 +33,3 @@ DeviceIoctl(PDEVICE_OBJECT DeviceObject, PIRP Irp); VOID NTAPI DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp); - diff --git a/reactos/drivers/storage/floppy/precomp.h b/reactos/drivers/storage/floppy/precomp.h index c7238f804af..ede3e865221 100644 --- a/reactos/drivers/storage/floppy/precomp.h +++ b/reactos/drivers/storage/floppy/precomp.h @@ -1,9 +1,5 @@ -#include -#include +#include #include "floppy.h" #include "csqrtns.h" #include "hardware.h" -#include "csqrtns.h" -#include "ioctl.h" -#include "readwrite.h" diff --git a/reactos/drivers/storage/floppy/readwrite.c b/reactos/drivers/storage/floppy/readwrite.c index bafc2916c80..af5f218005e 100644 --- a/reactos/drivers/storage/floppy/readwrite.c +++ b/reactos/drivers/storage/floppy/readwrite.c @@ -54,6 +54,7 @@ #include "precomp.h" +#include static IO_ALLOCATION_ACTION NTAPI MapRegisterCallback(PDEVICE_OBJECT DeviceObject, @@ -759,4 +760,3 @@ ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp) IoCompleteRequest(Irp, IO_DISK_INCREMENT); StopMotor(DriveInfo->ControllerInfo); } - diff --git a/reactos/drivers/storage/floppy/readwrite.h b/reactos/drivers/storage/floppy/readwrite.h index c427a8086d5..1b17459e84b 100644 --- a/reactos/drivers/storage/floppy/readwrite.h +++ b/reactos/drivers/storage/floppy/readwrite.h @@ -24,6 +24,8 @@ * 15-Feb-2004 vizzini - Created */ +#pragma once + DRIVER_DISPATCH ReadWrite; NTSTATUS NTAPI @@ -31,4 +33,3 @@ ReadWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); VOID NTAPI ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp); -