[ros-diffs] [tkreuzer] 53885: [FREELDR] - Remove pointless NTKRNLAPI - remove unneeded include - delete deprecated file amd64/loader.c - add an #ifef __REACTOS__ around public header includes to make it possib...

Author: tkreuzer
Date: Wed Sep 28 18:33:25 2011
New Revision: 53885

URL: http://svn.reactos.org/svn/reactos?rev=53885&view=rev
Log:
[FREELDR]
- Remove pointless NTKRNLAPI
- remove unneeded include
- delete deprecated file amd64/loader.c
- add an #ifef __REACTOS__ around public header includes to make it possible to use an
alternative header set from ntsup.h

Removed:
    trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
Modified:
    trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
    trunk/reactos/boot/freeldr/freeldr/disk/partition.c
    trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
    trunk/reactos/boot/freeldr/freeldr/mm/heap.c
    trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c

Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Sep 28 18:33:25
2011
@@ -121,7 +121,6 @@
     list(APPEND FREELDR_COMMON_SOURCE
         arch/amd64/entry.S
         arch/amd64/int386.S
-        arch/amd64/loader.c
         arch/amd64/pnpbios.S
         arch/i386/hardware.c
         arch/i386/hwacpi.c

Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c (removed)
@@ -1,63 +1,0 @@
-/*
- *  FreeLoader
- *  Copyright (C) 2008 - 2009 Timo Kreuzer (timo.kreuzer(a)reactor.org)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#include <freeldr.h>
-
-#define NDEBUG
-#include <debug.h>
-
-/* Page Directory and Tables for non-PAE Systems */
-extern ULONG_PTR NextModuleBase;
-extern ULONG_PTR KernelBase;
-ULONG_PTR GdtBase, IdtBase, TssBase;
-extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint;
-
-PVOID pIdt, pGdt;
-
-/* FUNCTIONS *****************************************************************/
-
-void
-EnableA20()
-{
-    /* Already done */
-}
-
-/*++
- * FrLdrStartup
- * INTERNAL
- *
- *     Prepares the system for loading the Kernel.
- *
- * Params:
- *     Magic - Multiboot Magic
- *
- * Returns:
- *     None.
- *
- * Remarks:
- *     None.
- *
- *--*/
-VOID
-NTAPI
-FrLdrStartup(ULONG Magic)
-{
-	DbgPrint("ReactOS loader is unsupported! Halting.\n", KernelEntryPoint);
-    for(;;);
-}
-

Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] Wed Sep 28 18:33:25
2011
@@ -289,7 +289,6 @@
     return TRUE;
 }
 
-NTKERNELAPI
 NTSTATUS
 FASTCALL
 IoReadPartitionTable(

Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Sep 28 18:33:25
2011
@@ -30,6 +30,7 @@
     ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
 
 /* public headers */
+#ifdef __REACTOS__
 #define NTOSAPI
 #define printf TuiPrintf
 #include <ntddk.h>
@@ -48,8 +49,10 @@
 #include <ntdddisk.h>
 #include <internal/hal.h>
 #include <drivers/pci/pci.h>
-
 #include <winerror.h>
+#else
+#include <ntsup.h>
+#endif
 
 /* internal headers */
 #include <arcemul.h>

Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Wed Sep 28 18:33:25 2011
@@ -90,7 +90,6 @@
 
 
 #undef ExAllocatePoolWithTag
-NTKERNELAPI
 PVOID
 NTAPI
 ExAllocatePoolWithTag(
@@ -102,7 +101,6 @@
 }
 
 #undef ExFreePool
-NTKERNELAPI
 VOID
 NTAPI
 ExFreePool(
@@ -112,7 +110,6 @@
 }
 
 #undef ExFreePoolWithTag
-NTKERNELAPI
 VOID
 NTAPI
 ExFreePoolWithTag(

Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Wed Sep 28 18:33:25
2011
@@ -10,7 +10,6 @@
 
 #include <freeldr.h>
 
-#include <ndk/asm.h>
 #include <debug.h>
 
 DBG_DEFAULT_CHANNEL(WINDOWS);