[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
2026-09-02 12:23:31 +00:00 · 2014-02-03 10:46:48 +00:00
parent 142e6c06b4
commit efc03277d4
11 changed files with 23 additions and 16 deletions
@@ -40,6 +40,8 @@

 #include "precomp.h"

+#include <debug.h>
+
 /* 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);
 }
-
@@ -24,6 +24,8 @@
 *                  15-Feb-2004 vizzini - Created
 */

+#pragma once
+
 #include <csq.h>

 /*
@@ -51,4 +53,3 @@ CsqReleaseLock(PIO_CSQ Csq, KIRQL Irql);

 VOID NTAPI
 CsqCompleteCanceledIrp(PIO_CSQ Csq, PIRP Irp);
-
@@ -42,6 +42,12 @@

 #include "precomp.h"

+#include <ntddk.h>
+#include <debug.h>
+
+#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;
 }
-
@@ -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
-
@@ -49,11 +49,12 @@

 #include "precomp.h"

+#include <debug.h>
+
 /*
 * 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));
 }
-
@@ -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);
-
@@ -33,6 +33,7 @@

 #include "precomp.h"

+#include <debug.h>

 NTSTATUS NTAPI
 DeviceIoctl(PDEVICE_OBJECT DeviceObject, PIRP Irp)
@@ -267,4 +268,3 @@ DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp)
    StopMotor(DriveInfo->ControllerInfo);
    return;
 }
-
@@ -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);
-
@@ -1,9 +1,5 @@
-#include <ntddk.h>
-#include <debug.h>
+#include <wdm.h>

 #include "floppy.h"
 #include "csqrtns.h"
 #include "hardware.h"
-#include "csqrtns.h"
-#include "ioctl.h"
-#include "readwrite.h"
@@ -54,6 +54,7 @@

 #include "precomp.h"

+#include <debug.h>

 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);
 }
-
@@ -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);
-