Fixed build process for SETUPLDR.SYS.
svn path=/trunk/; revision=3445
+Changes in v1.7.6 (8/31/2002) (ekohl)
+
+- bootsect/isoboot.asm: Reduced read transfer size to ensure that
+ the read buffer for an int13/ah=42h (exended read) does not
+ cross a segment boundary.
+- freeldr.c, bootmgr.c, setupldr.c, makefile: Renamed
+ LoadBootManager() and ReactOSRunSetupLoader() to RunLoader().
+ Either bootmgr.o or setupldr.o is used to build freeldr.sys or
+ setupldr.sys
+
Changes in v1.7.5 (8/21/2002) (brianp)
- biosvid.S (BiosVideoDisableBlinkBit): Added code to
Changes in v1.7.5 (8/21/2002) (brianp)
- biosvid.S (BiosVideoDisableBlinkBit): Added code to
COMPILER_DEBUG_DEFINES =
endif
COMPILER_DEBUG_DEFINES =
endif
-ifeq ($(MAKECMDGOALS),setupldr)
-COMPILER_SETUPLDR_DEFINES = -D__SETUPLDR__
-else
-COMPILER_SETUPLDR_DEFINES =
-endif
-
-COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) $(COMPILER_SETUPLDR_DEFINES)
+COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES)
#############################################
# INCLUDE DIRECTORY OPTIONS
#############################################
# INCLUDE DIRECTORY OPTIONS
arcname.o \
hwdetect.o \
reghive.o \
arcname.o \
hwdetect.o \
reghive.o \
- registry.o \
- setupldr.o
COMM_OBJS = rs232.o \
portio.o
COMM_OBJS = rs232.o \
portio.o
# This code was taken from the GCC v3.1 source
MATH_OBJS = libgcc2.o
# This code was taken from the GCC v3.1 source
MATH_OBJS = libgcc2.o
-FREELDR_OBJS= freeldr.o \
- miscboot.o \
- options.o \
- linuxboot.o \
+BASE_OBJS = freeldr.o \
+ debug.o \
+ drivemap.o \
- debug.o \
- oslist.o \
- bootmgr.o \
- drivemap.o \
-#############################################
-# ALL THE OBJECTS
-#
-OBJS = $(ARCH_OBJS) \
+FREELDR_OBJS= bootmgr.o \
+ miscboot.o \
+ options.o \
+ linuxboot.o \
+ oslist.o
+
+SETUPLDR_OBJS= setupldr.o
+
+COMMON_OBJS = $(ARCH_OBJS) \
$(RTL_OBJS) \
$(FS_OBJS) \
$(UI_OBJS) \
$(RTL_OBJS) \
$(FS_OBJS) \
$(UI_OBJS) \
$(INIFILE_OBJS) \
$(VIDEO_OBJS) \
$(MATH_OBJS) \
$(INIFILE_OBJS) \
$(VIDEO_OBJS) \
$(MATH_OBJS) \
+ $(BASE_OBJS)
+
+F_OBJS = $(COMMON_OBJS) \
+S_OBJS = $(COMMON_OBJS) \
+ $(SETUPLDR_OBJS)
+
+#############################################
+# ALL THE OBJECTS
+#
+ALL_OBJS = $(COMMON_OBJS) \
+ $(FREELDR_OBJS) \
+ $(SETUPLDR_OBJS)
+
+
#############################################
# SET THE VPATH SO MAKE CAN FIND THE SOURCE FILES
#
#############################################
# SET THE VPATH SO MAKE CAN FIND THE SOURCE FILES
#
#############################################
#############################################
+all : freeldr.sys setupldr.sys
@echo Make ALL done.
#############################################
@echo Make ALL done.
#############################################
+freeldr.sys : $(ALL_OBJS)
@echo ===================================================== LINKING $@
@echo ===================================================== LINKING $@
-# @$(LD) -N -Ttext=0x8000 --oformat=binary -s -o freeldr.sys $(OBJS)
- @$(LD) $(LFLAGS) -Map freeldr.map -o freeldr.exe $(OBJS)
-# @$(CC) -Wl,-Ttext=0x8000,-N,-Map,freeldr.map -o freeldr.exe $(OBJS)
+# @$(LD) -N -Ttext=0x8000 --oformat=binary -s -o freeldr.sys $(F_OBJS)
+ @$(LD) $(LFLAGS) -Map freeldr.map -o freeldr.exe $(F_OBJS)
+# @$(CC) -Wl,-Ttext=0x8000,-N,-Map,freeldr.map -o freeldr.exe $(F_OBJS)
@$(NM) --numeric-sort freeldr.exe > freeldr.sym
@$(OBJCOPY) -O binary freeldr.exe freeldr.sys
#############################################
@$(NM) --numeric-sort freeldr.exe > freeldr.sym
@$(OBJCOPY) -O binary freeldr.exe freeldr.sys
#############################################
-setupldr : setupldr.sys
- @echo Make SETUPLDR done.
-
-#############################################
-
-setupldr.sys : $(OBJS)
+setupldr.sys : $(ALL_OBJS)
@echo ===================================================== LINKING $@
@echo ===================================================== LINKING $@
-# @$(LD) -N -Ttext=0x8000 --oformat=binary -s -o setupldr.sys $(OBJS)
- @$(LD) $(LFLAGS) -Map setupldr.map -o setupldr.exe $(OBJS)
+# @$(LD) -N -Ttext=0x8000 --oformat=binary -s -o setupldr.sys $(S_OBJS)
+ @$(LD) $(LFLAGS) -Map setupldr.map -o setupldr.exe $(S_OBJS)
@$(NM) --numeric-sort setupldr.exe > setupldr.sym
@$(OBJCOPY) -O binary setupldr.exe setupldr.sys
@$(NM) --numeric-sort setupldr.exe > setupldr.sym
@$(OBJCOPY) -O binary setupldr.exe setupldr.sys
#############################################
# Include the automagically generated dependencies
#############################################
# Include the automagically generated dependencies
--include $(OBJS:%.o=%.d)
+-include $(ALL_OBJS:%.o=%.d)
#############################################
#############################################
#include <bootmgr.h>
#include <drivemap.h>
#include <bootmgr.h>
#include <drivemap.h>
-VOID RunBootManager(VOID)
{
UCHAR SettingName[80];
UCHAR SettingValue[80];
{
UCHAR SettingName[80];
UCHAR SettingValue[80];
-#ifdef __SETUPLDR__
- ReactOSRunSetupLoader();
-#else
- RunBootManager();
-#endif // defined __SETUPLDR__
-VOID RunBootManager(VOID);
U32 GetDefaultOperatingSystem(PUCHAR OperatingSystemList[], U32 OperatingSystemCount);
S32 GetTimeOut(VOID);
U32 GetDefaultOperatingSystem(PUCHAR OperatingSystemList[], U32 OperatingSystemCount);
S32 GetTimeOut(VOID);
extern BOOL UserInterfaceUp; // Tells us if the user interface is displayed
void BootMain(void);
extern BOOL UserInterfaceUp; // Tells us if the user interface is displayed
void BootMain(void);
#endif // defined __FREELDR_H
#endif // defined __FREELDR_H
-#define VERSION "FreeLoader v1.7.5"
+#define VERSION "FreeLoader v1.7.6"
#define COPYRIGHT "Copyright (C) 1998-2002 Brian Palmer <brianp@sginet.com>"
#define AUTHOR_EMAIL "<brianp@sginet.com>"
#define BY_AUTHOR "by Brian Palmer"
#define COPYRIGHT "Copyright (C) 1998-2002 Brian Palmer <brianp@sginet.com>"
#define AUTHOR_EMAIL "<brianp@sginet.com>"
#define BY_AUTHOR "by Brian Palmer"
//
#define FREELOADER_MAJOR_VERSION 1
#define FREELOADER_MINOR_VERSION 7
//
#define FREELOADER_MAJOR_VERSION 1
#define FREELOADER_MINOR_VERSION 7
-#define FREELOADER_PATCH_VERSION 5
+#define FREELOADER_PATCH_VERSION 6
PUCHAR GetFreeLoaderVersionString(VOID);
PUCHAR GetFreeLoaderVersionString(VOID);
#include "registry.h"
#include "hwdetect.h"
#include "registry.h"
#include "hwdetect.h"
-VOID ReactOSRunSetupLoader(VOID)
+ printf("RunLoader() called!\n");
+ printf("*** System stopped ***\n");
+ for(;;);