projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[freeldr] Move custom.c, drivemap.c/h, miscboot.c/h to i386 directories
[reactos.git]
/
reactos
/
boot
/
freeldr
/
freeldr
/
include
/
freeldr.h
diff --git
a/reactos/boot/freeldr/freeldr/include/freeldr.h
b/reactos/boot/freeldr/freeldr/include/freeldr.h
index
ebbc93b
..
406e117
100644
(file)
--- a/
reactos/boot/freeldr/freeldr/include/freeldr.h
+++ b/
reactos/boot/freeldr/freeldr/include/freeldr.h
@@
-12,15
+12,22
@@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 675 Mass Ave, Cambridge, MA 02139,
USA.
+ * 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.
*/
#ifndef __FREELDR_H
#define __FREELDR_H
#define UINT64_C(val) val##ULL
*/
#ifndef __FREELDR_H
#define __FREELDR_H
#define UINT64_C(val) val##ULL
+#define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m)))
+
+#define ROUND_DOWN(n, align) \
+ (((ULONG)n) & ~((align) - 1l))
+
+#define ROUND_UP(n, align) \
+ ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
#define NTOSAPI
#define printf TuiPrintf
#define NTOSAPI
#define printf TuiPrintf
@@
-52,7
+59,6
@@
#include <reactos.h>
#include <registry.h>
#include <winldr.h>
#include <reactos.h>
#include <registry.h>
#include <winldr.h>
-#include <fsrec.h>
/* file system headers */
#include <fs/ext2.h>
#include <fs/fat.h>
/* file system headers */
#include <fs/ext2.h>
#include <fs/fat.h>
@@
-65,10
+71,13
@@
#include <ui/tui.h>
/* arch files */
#if defined(_M_IX86)
#include <ui/tui.h>
/* arch files */
#if defined(_M_IX86)
+#include <arch/i386/custom.h>
+#include <arch/i386/drivemap.h>
#include <arch/i386/hardware.h>
#include <arch/i386/i386.h>
#include <arch/i386/machpc.h>
#include <arch/i386/machxbox.h>
#include <arch/i386/hardware.h>
#include <arch/i386/i386.h>
#include <arch/i386/machpc.h>
#include <arch/i386/machxbox.h>
+#include <arch/i386/miscboot.h>
#include <internal/i386/intrin_i.h>
#include <internal/i386/ke.h>
#elif defined(_M_PPC)
#include <internal/i386/intrin_i.h>
#include <internal/i386/ke.h>
#elif defined(_M_PPC)
@@
-77,6
+86,9
@@
#include <arch/arm/hardware.h>
#elif defined(_M_MIPS)
#include <arch/mips/arcbios.h>
#include <arch/arm/hardware.h>
#elif defined(_M_MIPS)
#include <arch/mips/arcbios.h>
+#elif defined(_M_AMD64)
+#include <arch/amd64/hardware.h>
+#include <arch/amd64/machpc.h>
#endif
/* misc files */
#include <keycodes.h>
#endif
/* misc files */
#include <keycodes.h>
@@
-87,28
+99,21
@@
/* Needed by boot manager */
#include <bootmgr.h>
#include <oslist.h>
/* Needed by boot manager */
#include <bootmgr.h>
#include <oslist.h>
-#include <drivemap.h>
-#include <miscboot.h>
#include <options.h>
#include <linux.h>
/* Externals */
#include <reactos/rossym.h>
#include <reactos/buildno.h>
#include <options.h>
#include <linux.h>
/* Externals */
#include <reactos/rossym.h>
#include <reactos/buildno.h>
-#include <reactos/helper.h>
/* Needed if debuging is enabled */
#include <comm.h>
/* Swap */
#include <bytesex.h>
/* Needed if debuging is enabled */
#include <comm.h>
/* Swap */
#include <bytesex.h>
-/* arch defines */
-#ifdef _X86_
-#define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n")
-#endif
-
VOID BootMain(LPSTR CmdLine);
VOID RunLoader(VOID);
/* Special hack for ReactOS setup OS type */
VOID LoadReactOSSetup(VOID);
VOID BootMain(LPSTR CmdLine);
VOID RunLoader(VOID);
/* Special hack for ReactOS setup OS type */
VOID LoadReactOSSetup(VOID);
+VOID LoadReactOSSetup2(VOID);
#endif // defined __FREELDR_H
#endif // defined __FREELDR_H