mirror of
https://github.com/reactos/reactos.git
synced 2024-08-06 11:24:58 +00:00
[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 svn path=/trunk/; revision=53885
This commit is contained in:
parent
b4d8554d47
commit
5c4044777c
|
@ -121,7 +121,6 @@ elseif(ARCH MATCHES amd64)
|
|||
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
|
||||
|
|
|
@ -1,63 +0,0 @@
|
|||
/*
|
||||
* FreeLoader
|
||||
* Copyright (C) 2008 - 2009 Timo Kreuzer (timo.kreuzer@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(;;);
|
||||
}
|
||||
|
|
@ -289,7 +289,6 @@ IopCopyPartitionRecord(
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
NTKERNELAPI
|
||||
NTSTATUS
|
||||
FASTCALL
|
||||
IoReadPartitionTable(
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -90,7 +90,6 @@ VOID MmHeapFree(PVOID MemoryPointer)
|
|||
|
||||
|
||||
#undef ExAllocatePoolWithTag
|
||||
NTKERNELAPI
|
||||
PVOID
|
||||
NTAPI
|
||||
ExAllocatePoolWithTag(
|
||||
|
@ -102,7 +101,6 @@ ExAllocatePoolWithTag(
|
|||
}
|
||||
|
||||
#undef ExFreePool
|
||||
NTKERNELAPI
|
||||
VOID
|
||||
NTAPI
|
||||
ExFreePool(
|
||||
|
@ -112,7 +110,6 @@ ExFreePool(
|
|||
}
|
||||
|
||||
#undef ExFreePoolWithTag
|
||||
NTKERNELAPI
|
||||
VOID
|
||||
NTAPI
|
||||
ExFreePoolWithTag(
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
#include <freeldr.h>
|
||||
|
||||
#include <ndk/asm.h>
|
||||
#include <debug.h>
|
||||
|
||||
DBG_DEFAULT_CHANNEL(WINDOWS);
|
||||
|
|
Loading…
Reference in a new issue