Remove ntos.h and roskrnl.h from kernel-mode code.

svn path=/trunk/; revision=7900
2024-06-27 16:31:30 +00:00 · 2004-01-28 20:55:50 +00:00 · 2004-01-28 20:55:50 +00:00 · cdcb7ec378
parent eb980ec861
commit cdcb7ec378
17 changed files with 33 additions and 36 deletions
--- a/reactos/drivers/bus/acpi/include/platform/types.h
+++ b/reactos/drivers/bus/acpi/include/platform/types.h
@ -13,6 +13,6 @@
 #ifndef __INCLUDE_ACPI_TYPES_H
 #define __INCLUDE_ACPI_TYPES_H

-#include <ntos.h>
+#include <ddk/ntddk.h>

 #endif /* __INCLUDE_ACPI_TYPES_H */
--- a/reactos/drivers/dd/blue/blue.c
+++ b/reactos/drivers/dd/blue/blue.c
@ -1,4 +1,4 @@
-/* $Id: blue.c,v 1.42 2004/01/11 17:31:14 gvg Exp $
+/* $Id: blue.c,v 1.43 2004/01/28 20:51:44 ekohl Exp $
 *
 * COPYRIGHT:            See COPYING in the top level directory
 * PROJECT:              ReactOS kernel
@ -11,7 +11,8 @@

 /* INCLUDES ******************************************************************/

-#include <roskrnl.h>
+#include <ddk/ntddk.h>
+#include <ntos/halfuncs.h>
 #include <ddk/ntddblue.h>
 #include <rosrtl/string.h>
 #include <string.h>
--- a/reactos/drivers/fs/cdfs/fcb.c
+++ b/reactos/drivers/fs/cdfs/fcb.c
@ -16,7 +16,7 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-/* $Id: fcb.c,v 1.16 2003/11/13 15:25:08 ekohl Exp $
+/* $Id: fcb.c,v 1.17 2004/01/28 20:52:21 ekohl Exp $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
@ -29,7 +29,7 @@
 /* INCLUDES *****************************************************************/

 #include <ddk/ntddk.h>
-#include <ntos.h>
+#include <ntos/kefuncs.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/ntfs/attrib.c
+++ b/reactos/drivers/fs/ntfs/attrib.c
@ -16,7 +16,7 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-/* $Id: attrib.c,v 1.8 2003/11/13 15:26:34 ekohl Exp $
+/* $Id: attrib.c,v 1.9 2004/01/28 20:53:06 ekohl Exp $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
@ -30,7 +30,6 @@

 #include <ddk/ntddk.h>

-#include <ntos.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/fs/ntfs/fcb.c
+++ b/reactos/drivers/fs/ntfs/fcb.c
@ -16,7 +16,7 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-/* $Id: fcb.c,v 1.9 2003/08/07 11:47:32 silverblade Exp $
+/* $Id: fcb.c,v 1.10 2004/01/28 20:53:06 ekohl Exp $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
@ -28,13 +28,13 @@
 /* INCLUDES *****************************************************************/

 #include <ddk/ntddk.h>
+#include <ntos/kefuncs.h>
+
+#include "ntfs.h"

 //#define NDEBUG
 #include <debug.h>

-#include <ntos.h>
-
-#include "ntfs.h"


 /* MACROS *******************************************************************/
--- a/reactos/drivers/fs/vfat/fcb.c
+++ b/reactos/drivers/fs/vfat/fcb.c
@ -1,4 +1,4 @@
-/* $Id: fcb.c,v 1.36 2003/11/17 02:12:49 hyperion Exp $
+/* $Id: fcb.c,v 1.37 2004/01/28 20:53:46 ekohl Exp $
 *
 *
 * FILE:             drivers/fs/vfat/fcb.c
@ -13,9 +13,9 @@
 /*  -------------------------------------------------------  INCLUDES  */

 #include <ddk/ntddk.h>
+#include <ntos/kefuncs.h>
 #include <wchar.h>
 #include <limits.h>
-#include <ntos.h>
 #include <rosrtl/string.h>

 #define NDEBUG
--- a/reactos/drivers/fs/vfat/fsctl.c
+++ b/reactos/drivers/fs/vfat/fsctl.c
@ -16,7 +16,7 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-/* $Id: fsctl.c,v 1.26 2003/11/17 02:12:49 hyperion Exp $
+/* $Id: fsctl.c,v 1.27 2004/01/28 20:53:46 ekohl Exp $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
@ -27,11 +27,10 @@
 /* INCLUDES *****************************************************************/

 #include <ddk/ntddk.h>
+#include <ntos/kefuncs.h>
 #include <rosrtl/string.h>
 #include <wchar.h>

-#include <ntos.h>
-
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/fs/vfat/rw.c
+++ b/reactos/drivers/fs/vfat/rw.c
@ -1,5 +1,5 @@

-/* $Id: rw.c,v 1.63 2003/11/12 15:26:44 ekohl Exp $
+/* $Id: rw.c,v 1.64 2004/01/28 20:53:46 ekohl Exp $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
@ -13,11 +13,10 @@
 /* INCLUDES *****************************************************************/

 #include <ddk/ntddk.h>
+#include <ntos/kefuncs.h>
 #include <wchar.h>
 #include <ntos/minmax.h>

-#include <ntos.h>
-
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/net/afd/include/afd.h
+++ b/reactos/drivers/net/afd/include/afd.h
@ -13,7 +13,6 @@
 #include <net/tdikrnl.h>
 #include <net/tdiinfo.h>
 #include <afd/shared.h>
-#include <ntos.h>
 #include <debug.h>

 /* Forward declarations */
--- a/reactos/drivers/net/afd/makefile
+++ b/reactos/drivers/net/afd/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.7 2004/01/11 20:46:05 navaraf Exp $
+# $Id: makefile,v 1.8 2004/01/28 20:54:18 ekohl Exp $

 PATH_TO_TOP = ../../..

@ -6,7 +6,7 @@ TARGET_TYPE = driver

 TARGET_NAME = afd

-TARGET_CFLAGS = -I./include -DDBG -D__USE_W32API -Werror -Wall
+TARGET_CFLAGS = -I./include -DDBG -Werror -Wall

 TARGET_OBJECTS = \
  afd/afd.o \
--- a/reactos/drivers/net/tdi/cte/string.c
+++ b/reactos/drivers/net/tdi/cte/string.c
@ -1,7 +1,7 @@
-/* $Id: string.c,v 1.4 2003/07/10 19:54:13 chorns Exp $
+/* $Id: string.c,v 1.5 2004/01/28 20:55:18 ekohl Exp $
 *
 */
-#include <ntos.h>
+#include <ddk/ntddk.h>

 /*
 * @unimplemented
--- a/reactos/drivers/net/tdi/cte/stubs.c
+++ b/reactos/drivers/net/tdi/cte/stubs.c
@ -1,7 +1,7 @@
-/* $Id: stubs.c,v 1.5 2003/07/10 19:54:13 chorns Exp $
+/* $Id: stubs.c,v 1.6 2004/01/28 20:55:18 ekohl Exp $
 *
 */
-#include <ntos.h>
+#include <ddk/ntddk.h>


 /*
--- a/reactos/drivers/net/tdi/misc/main.c
+++ b/reactos/drivers/net/tdi/misc/main.c
@ -1,8 +1,8 @@
-/* $Id: main.c,v 1.4 2002/09/08 10:22:19 chorns Exp $
+/* $Id: main.c,v 1.5 2004/01/28 20:55:36 ekohl Exp $
 *
 * DESCRIPTION: Entry point for TDI.SYS
 */
-#include <ntos.h>
+#include <ddk/ntddk.h>

 NTSTATUS
 STDCALL
--- a/reactos/drivers/net/tdi/tdi/dereg.c
+++ b/reactos/drivers/net/tdi/tdi/dereg.c
@ -1,7 +1,7 @@
-/* $Id: dereg.c,v 1.6 2003/11/14 17:13:29 weiden Exp $
+/* $Id: dereg.c,v 1.7 2004/01/28 20:55:50 ekohl Exp $
 *
 */
-#include <ntos.h>
+#include <ddk/ntddk.h>
 #include <net/tdi.h>

 /* De-/Register Action IDs for TdiDeRegister */
--- a/reactos/drivers/net/tdi/tdi/handler.c
+++ b/reactos/drivers/net/tdi/tdi/handler.c
@ -1,8 +1,8 @@
-/* $Id: handler.c,v 1.5 2003/07/10 19:54:13 chorns Exp $
+/* $Id: handler.c,v 1.6 2004/01/28 20:55:50 ekohl Exp $
 *
 * DESCRIPTION: Default TDI event handlers.
 */
-#include <ntos.h>
+#include <ddk/ntddk.h>
 #include <net/tdi.h>


--- a/reactos/drivers/net/tdi/tdi/obsolete.c
+++ b/reactos/drivers/net/tdi/tdi/obsolete.c
@ -1,8 +1,8 @@
-/* $Id: obsolete.c,v 1.6 2003/07/10 19:54:13 chorns Exp $
+/* $Id: obsolete.c,v 1.7 2004/01/28 20:55:50 ekohl Exp $
 *
 */

-#include <ntos.h>
+#include <ddk/ntddk.h>

 /*
 * @unimplemented
--- a/reactos/drivers/net/tdi/tdi/stubs.c
+++ b/reactos/drivers/net/tdi/tdi/stubs.c
@ -1,8 +1,8 @@

-/* $Id: stubs.c,v 1.7 2003/07/10 19:54:13 chorns Exp $
+/* $Id: stubs.c,v 1.8 2004/01/28 20:55:50 ekohl Exp $
 *
 */
-#include <ntos.h>
+#include <ddk/ntddk.h>
 #include <net/tdi.h>

 /*