[ros-diffs] [sginsberg] 37795: - Don't redefine PKSYSTEM_ROUTINE - Don't include x86 headers for all architectures - Don't use system_header - Add a note for ARM team

Author: sginsberg
Date: Mon Dec  1 10:27:58 2008
New Revision: 37795

URL: http://svn.reactos.org/svn/reactos?rev=37795&view=rev
Log:
- Don't redefine PKSYSTEM_ROUTINE
- Don't include x86 headers for all architectures
- Don't use system_header
- Add a note for ARM team

Modified:
    trunk/reactos/ntoskrnl/include/internal/arm/ke.h
    trunk/reactos/ntoskrnl/include/internal/arm/mm.h
    trunk/reactos/ntoskrnl/include/internal/i386/ke.h
    trunk/reactos/ntoskrnl/include/internal/i386/mm.h
    trunk/reactos/ntoskrnl/include/internal/kbd.h
    trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h

Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Mon Dec  1 10:27:58
2008
@@ -1,10 +1,5 @@
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
 
 //
 //Lockdown TLB entries

Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Mon Dec  1 10:27:58
2008
@@ -1,9 +1,5 @@
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 //
 // Number of bits corresponding to the area that a PDE entry represents (1MB)
@@ -15,7 +11,7 @@
 // Number of bits corresponding to the area that a coarse page table entry represents
(4KB)
 //
 #define PTE_SHIFT 12
-#define PAGE_SIZE (1 << PTE_SHIFT)
+//#define PAGE_SIZE (1 << PTE_SHIFT) // FIXME: This conflicts with
ndk/arm/mmtypes.h which does #define PAGE_SIZE 0x1000 -- use PTE_SIZE here instead?
 
 //
 // Number of bits corresponding to the area that a coarse page table occupies (1KB)

Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Dec  1 10:27:58
2008
@@ -1,15 +1,12 @@
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 #define FRAME_EDITED        0xFFF8
 
 #ifndef __ASM__
 
 #include "intrin_i.h"
+#include "v86m.h"
 
 #define KeArchFnInit() Ke386FnInit()
 #define KeArchHaltProcessor() Ke386HaltProcessor()
@@ -72,11 +69,6 @@
 VOID
 KeCreateApplicationProcessorIdleThread(ULONG Id);
 
-typedef
-VOID
-(NTAPI*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine,
-                    PVOID StartContext);
-
 VOID
 NTAPI
 Ke386InitThreadWithContext(PKTHREAD Thread,

Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Mon Dec  1 10:27:58
2008
@@ -4,8 +4,6 @@
 
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H
-
-#ifdef _M_IX86
 
 struct _EPROCESS;
 PULONG MmGetPageDirectory(VOID);
@@ -30,6 +28,4 @@
 /* Easy accessing PFN in PTE */
 #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber)
 
-#endif
-
 #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */

Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/kbd.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/kbd.h [iso-8859-1] Mon Dec  1 10:27:58 2008
@@ -1,8 +1,4 @@
 #define __KBD_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Mon Dec  1 10:27:58
2008
@@ -41,8 +41,6 @@
 #define InterlockedAnd               _InterlockedAnd
 
 #include "ke.h"
-#include "i386/mm.h"
-#include "i386/v86m.h"
 #include "ob.h"
 #include "mm.h"
 #include "ex.h"