[ros-diffs] [akhaldi] 61950: [SCSIPORT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Feb  3 10:49:41 2014
New Revision: 61950

URL: http://svn.reactos.org/svn/reactos?rev=61950&view=rev
Log:
[SCSIPORT]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/drivers/storage/scsiport/precomp.h
    trunk/reactos/drivers/storage/scsiport/scsiport.c
    trunk/reactos/drivers/storage/scsiport/scsiport_int.h
    trunk/reactos/drivers/storage/scsiport/stubs.c

Modified: trunk/reactos/drivers/storage/scsiport/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/p…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/precomp.h	[iso-8859-1] Mon Feb  3 10:49:41
2014
@@ -1,10 +1 @@
-#include <ntddk.h>
-#include <srb.h>
-#include <scsi.h>
-#include <ntddscsi.h>
-#include <ntddstor.h>
-#include <ntdddisk.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "scsiport_int.h"
+#include <wdm.h>

Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.c	[iso-8859-1] Mon Feb  3 10:49:41
2014
@@ -29,16 +29,20 @@
 
 #include "precomp.h"
 
-#ifndef NDEBUG
+#include <ntddk.h>
+#include <stdio.h>
+#include <scsi.h>
+#include <ntddscsi.h>
+#include <ntdddisk.h>
+
 #define NDEBUG
-#endif
 #include <debug.h>
 
+#include "scsiport_int.h"
+
 ULONG InternalDebugLevel = 0x00;
 
 #undef ScsiPortMoveMemory
-
-/* TYPES *********************************************************************/
 
 /* GLOBALS *******************************************************************/
 
@@ -6407,5 +6411,4 @@
   return(Address.u.LowPart);
 }
 
-
 /* EOF */

Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport_int.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h	[iso-8859-1] Mon Feb  3 10:49:41
2014
@@ -4,6 +4,8 @@
  * DESCRIPTION
  *	An enumeration containing the states in the timer DFA
  */
+
+#pragma once
 
 #define VERSION "0.0.3"
 

Modified: trunk/reactos/drivers/storage/scsiport/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/stubs.c	[iso-8859-1] Mon Feb  3 10:49:41 2014
@@ -6,9 +6,9 @@
  * PROGRAMMER:      Timo Kreuzer (timo.kreuzer(a)reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "precomp.h"
+
+#include <srb.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -270,4 +270,3 @@
 {
     WRITE_REGISTER_ULONG(Register, Value);
 }
-