Skip to content

Commit a1a169f

Browse files
committed
[FREELDR] Fix pc98 build
1 parent 2b71c73 commit a1a169f

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

boot/freeldr/freeldr/arch/arcemul.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,14 @@ VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers)
6161
MachVtbl.VideoGetFontsFromFirmware(RomFontPointers);
6262
}
6363

64+
ULONG
65+
MachGetBootSectorLoadAddress(IN UCHAR DriveNumber)
66+
{
67+
#if defined(SARCH_PC98)
68+
return Pc98GetBootSectorLoadAddress(DriveNumber);
69+
#else
70+
return 0x7C00;
71+
#endif
72+
}
73+
6474
/* EOF */

boot/freeldr/freeldr/freeldr.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
@ cdecl Relocator16Boot()
120120
@ stdcall RtlAssert(ptr ptr long ptr)
121121
@ cdecl StallExecutionProcessor()
122+
@ cdecl MachGetBootSectorLoadAddress()
122123

123124
# Additional stuff for scsiport
124125
@ stdcall CpDoesPortExist(ptr)

boot/freeldr/freeldr/include/machine.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ VOID MachInit(const char *CmdLine);
130130
#define MachHwIdle() \
131131
MachVtbl.HwIdle()
132132

133+
133134
/* ARC FUNCTIONS **************************************************************/
134135

135136
TIMEINFO* ArcGetTime(VOID);
@@ -139,5 +140,6 @@ PCONFIGURATION_COMPONENT_DATA MachHwDetect(_In_opt_ PCSTR Options);
139140
VOID MachPrepareForReactOS(VOID);
140141
VOID MachGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize);
141142
VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers);
143+
ULONG MachGetBootSectorLoadAddress(IN UCHAR DriveNumber);
142144

143145
/* EOF */

boot/freeldr/freeldr/miscboot.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,7 @@ LoadAndBootSector(
161161
return Status;
162162
}
163163

164-
#if defined(SARCH_PC98)
165-
LoadAddress = Pc98GetBootSectorLoadAddress(BiosDriveNumber);
166-
#else
167-
LoadAddress = 0x7C00;
168-
#endif
164+
LoadAddress = MachGetBootSectorLoadAddress(BiosDriveNumber);
169165

170166
/*
171167
* Now try to load the boot sector: disk MBR (when PartitionNumber == 0),

0 commit comments

Comments
 (0)