Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c
Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -30,6 +30,7 @@
#include "../../reactos/registry.h"
#include "hardware.h"
+#include "machpc.h"
#define MILLISEC (10)
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -89,8 +89,8 @@
// second list. In some cases, only a "stub" VBE may be present, supporting
// only AX=4F00h; this case may be assumed if the list of supported video modes
// is empty (consisting of a single word of FFFFh)
-
-VOID BiosSetVideoFont8x16(VOID)
+#if 0
+static VOID BiosSetVideoFont8x16(VOID)
{
REGS Regs;
@@ -106,11 +106,11 @@
Int386(0x10, &Regs, &Regs);
}
-VOID VideoSetTextCursorPosition(ULONG X, ULONG Y)
+static VOID VideoSetTextCursorPosition(ULONG X, ULONG Y)
{
}
-ULONG VideoGetTextCursorPositionX(VOID)
+static ULONG VideoGetTextCursorPositionX(VOID)
{
REGS Regs;
@@ -135,7 +135,7 @@
return Regs.b.dl;
}
-ULONG VideoGetTextCursorPositionY(VOID)
+static ULONG VideoGetTextCursorPositionY(VOID)
{
REGS Regs;
@@ -159,6 +159,7 @@
return Regs.b.dh;
}
+#endif
USHORT BiosIsVesaSupported(VOID)
{
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -249,7 +249,8 @@
Int386(0x10, &Regs, &Regs);
}
-VOID PcVideoSelectAlternatePrintScreen(VOID)
+static VOID
+PcVideoSelectAlternatePrintScreen(VOID)
{
REGS Regs;
@@ -272,7 +273,8 @@
Int386(0x10, &Regs, &Regs);
}
-VOID PcVideoDisableCursorEmulation(VOID)
+static VOID
+PcVideoDisableCursorEmulation(VOID)
{
REGS Regs;
--- trunk/reactos/boot/freeldr/freeldr/cache/cache.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -23,6 +23,7 @@
#include <mm.h>
#include <disk.h>
#include <machine.h>
+#include <cache.h>
#include <rtl.h>
#include <debug.h>
--- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -616,7 +616,7 @@
return FALSE;
}
-BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer)
+static BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer)
{
ULONG EntryCount;
ULONG CurrentEntry;
--- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -45,7 +45,7 @@
PNTFS_MFT_RECORD NtfsMasterFileTable;
NTFS_ATTR_CONTEXT NtfsMFTContext;
-PUCHAR NtfsDecodeRun(PUCHAR DataRun, LONGLONG *DataRunOffset, ULONGLONG *DataRunLength)
+static PUCHAR NtfsDecodeRun(PUCHAR DataRun, LONGLONG *DataRunOffset, ULONGLONG *DataRunLength)
{
UCHAR DataRunOffsetSize;
UCHAR DataRunLengthSize;
@@ -87,7 +87,7 @@
}
/* FIXME: Add support for attribute lists! */
-BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, PWCHAR Name)
+static BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, PWCHAR Name)
{
PNTFS_ATTR_RECORD AttrRecord;
PNTFS_ATTR_RECORD AttrRecordEnd;
@@ -148,7 +148,7 @@
}
/* FIXME: Optimize for multisector reads. */
-BOOL NtfsDiskRead(ULONGLONG Offset, ULONGLONG Length, PCHAR Buffer)
+static BOOL NtfsDiskRead(ULONGLONG Offset, ULONGLONG Length, PCHAR Buffer)
{
USHORT ReadLength;
@@ -190,7 +190,7 @@
return TRUE;
}
-ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset, PCHAR Buffer, ULONGLONG Length)
+static ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset, PCHAR Buffer, ULONGLONG Length)
{
ULONGLONG LastLCN;
PUCHAR DataRun;
@@ -314,7 +314,7 @@
return AlreadyRead;
}
-BOOL NtfsFixupRecord(PNTFS_RECORD Record)
+static BOOL NtfsFixupRecord(PNTFS_RECORD Record)
{
USHORT *USA;
USHORT USANumber;
@@ -338,7 +338,7 @@
return TRUE;
}
-BOOL NtfsReadMftRecord(ULONG MFTIndex, PNTFS_MFT_RECORD Buffer)
+static BOOL NtfsReadMftRecord(ULONG MFTIndex, PNTFS_MFT_RECORD Buffer)
{
ULONGLONG BytesRead;
@@ -369,7 +369,7 @@
}
#endif
-BOOL NtfsCompareFileName(PCHAR FileName, PNTFS_INDEX_ENTRY IndexEntry)
+static BOOL NtfsCompareFileName(PCHAR FileName, PNTFS_INDEX_ENTRY IndexEntry)
{
PWCHAR EntryFileName;
UCHAR EntryFileNameLength;
@@ -402,7 +402,7 @@
return TRUE;
}
-BOOL NtfsFindMftRecord(ULONG MFTIndex, PCHAR FileName, ULONG *OutMFTIndex)
+static BOOL NtfsFindMftRecord(ULONG MFTIndex, PCHAR FileName, ULONG *OutMFTIndex)
{
PNTFS_MFT_RECORD MftRecord;
ULONG Magic;
@@ -563,7 +563,7 @@
return FALSE;
}
-BOOL NtfsLookupFile(PCHAR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext)
+static BOOL NtfsLookupFile(PCHAR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext)
{
ULONG NumberOfPathParts;
CHAR PathPart[261];
--- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-10-06 19:24:15 UTC (rev 18298)
@@ -76,6 +76,43 @@
extern MACHVTBL MachVtbl;
+VOID MachConsPutChar(int Ch);
+BOOL MachConsKbHit();
+int MachConsGetCh();
+VOID MachVideoClearScreen(UCHAR Attr);
+VIDEODISPLAYMODE MachVideoSetDisplayMode(char *DisplayMode, BOOL Init);
+VOID MachVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth);
+ULONG MachVideoGetBufferSize(VOID);
+VOID MachVideoSetTextCursorPosition(ULONG X, ULONG Y);
+VOID MachVideoHideShowTextCursor(BOOL Show);
+VOID MachVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y);
+VOID MachVideoCopyOffScreenBufferToVRAM(PVOID Buffer);
+BOOL MachVideoIsPaletteFixed(VOID);
+VOID MachVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue);
+VOID MachVideoGetPaletteColor(UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue);
+VOID MachVideoSync(VOID);
+VOID MachVideoPrepareForReactOS(VOID);
+ULONG MachGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize);
+BOOL MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType);
+BOOL
+MachDiskGetSystemVolume(char *SystemPath,
+ char *RemainingPath,
+ PULONG Device,
+ PULONG DriveNumber,
+ PULONGLONG StartSector,
+ PULONGLONG SectorCount,
+ int *FsType);
+BOOL MachDiskGetBootPath(char *BootPath, unsigned Size);
+VOID MachDiskGetBootDevice(PULONG BootDevice);
+BOOL MachDiskBootingFromFloppy();
+BOOL MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size);
+BOOL MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer);
+BOOL MachDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry);
+BOOL MachDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry);
+ULONG MachDiskGetCacheableBlockCount(ULONG DriveNumber);
+VOID MachRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second);
+VOID MachHwDetect(VOID);
+
#define MachConsPutChar(Ch) MachVtbl.ConsPutChar(Ch)
#define MachConsKbHit() MachVtbl.ConsKbHit()
#define MachConsGetCh() MachVtbl.ConsGetCh()
--- trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-10-06 19:24:15 UTC (rev 18298)
@@ -48,8 +48,8 @@
int isdigit(int c);
int isxdigit(int c);
-char * convert_to_ascii(char *buf, int c, ...);
-char * convert_i64_to_ascii(char *buf, int c, ...);
+char * convert_to_ascii(char *buf, int c, int num);
+char * convert_i64_to_ascii(char *buf, int c, unsigned long long num);
void beep(void);
void delay(unsigned msec);
--- trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-10-06 19:24:15 UTC (rev 18298)
@@ -55,6 +55,7 @@
//
///////////////////////////////////////////////////////////////////////////////////////
BOOL UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface
+BOOL SetupUiInitialize(VOID); // Initialize User-Interface
VOID UiUnInitialize(PCHAR BootText); // Un-initialize User-Interface
VOID UiDrawBackdrop(VOID); // Fills the entire screen with a backdrop
VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr
--- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -1256,7 +1256,7 @@
}
-BOOL
+static BOOL
CmiExportHive (PREGISTRY_HIVE Hive,
PCHAR KeyName)
{
--- trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -231,7 +231,7 @@
* will be used by the Kernel.
*
*--*/
-VOID
+static VOID
FASTCALL
FrLdrGetKernelBase(VOID)
{
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -34,7 +34,7 @@
unsigned long reactos_memory_map_descriptor_size;
memory_map_t reactos_memory_map[32]; // Memory map
-BOOL
+static BOOL
STDCALL
FrLdrLoadKernel(PCHAR szFileName,
INT nPos)
@@ -144,7 +144,7 @@
return TRUE;
}
-BOOL
+static BOOL
FrLdrLoadNlsFile(PCHAR szFileName,
PCHAR szModuleName)
{
@@ -183,7 +183,7 @@
return(TRUE);
}
-BOOL
+static BOOL
FrLdrLoadNlsFiles(PCHAR szSystemRoot,
PCHAR szErrorOut)
{
@@ -301,7 +301,7 @@
return(TRUE);
}
-BOOL
+static BOOL
FrLdrLoadDriver(PCHAR szFileName,
INT nPos)
{
@@ -344,7 +344,7 @@
return(TRUE);
}
-VOID
+static VOID
FrLdrLoadBootDrivers(PCHAR szSystemRoot,
INT nPos)
{
--- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -308,8 +308,6 @@
return(TRUE);
}
-BOOL SetupUiInitialize(VOID);
-
VOID RunLoader(VOID)
{
ULONG_PTR Base;
--- trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c 2005-10-06 18:51:52 UTC (rev 18297)
+++ trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c 2005-10-06 19:24:15 UTC (rev 18298)
@@ -17,6 +17,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <rtl.h>
+
/*
* convert_to_ascii() - converts a number to it's ascii equivalent
* from: