Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR]: Gently merge my local changes, part 1/x:

Browse source 
- Adjust the prototype of DiskGetBootPath;
- Add back 1 HW helper function.

svn path=/trunk/; revision=73610
This commit is contained in:
Hermès Bélusca-Maïto 2017-01-28 20:06:03 +00:00
parent 2c8cb9c285
commit ca27ff05fc
8 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/boot/freeldr/freeldr/arch/archwsup.c
View file

@ -22,24 +22,16 @@ ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[32];
/* FUNCTIONS ******************************************************************/
#define TAG_HW_COMPONENT_DATA 'DCwH'
#define TAG_HW_NAME 'mNwH'
#define TAG_HW_COMPONENT_DATA 'DCwH'
#define TAG_HW_NAME 'mNwH'
PVOID
NTAPI
FldrpHwHeapAlloc(IN SIZE_T Size)
{
/* Allocate memory from generic bootloader heap */
return FrLdrHeapAlloc(Size, 'pHwH');
}
static VOID
VOID
NTAPI
FldrSetIdentifier(IN PCONFIGURATION_COMPONENT_DATA ComponentData,
IN PCHAR IdentifierString)
{
SIZE_T IdentifierLength;
PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry;
SIZE_T IdentifierLength;
PCHAR Identifier;
/* Allocate memory for the identifier */
@ -55,6 +47,17 @@ FldrSetIdentifier(IN PCONFIGURATION_COMPONENT_DATA ComponentData,
Component->Identifier = Identifier;
}
VOID
NTAPI
FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData,
IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
IN ULONG Size)
{
/* Set component information */
ComponentData->ConfigurationData = ResourceList;
ComponentData->ComponentEntry.ConfigurationDataLength = Size;
}
VOID
NTAPI
FldrCreateSystemKey(OUT PCONFIGURATION_COMPONENT_DATA *SystemNode)
@ -155,10 +158,7 @@ FldrCreateComponentKey(IN PCONFIGURATION_COMPONENT_DATA SystemNode,
/* Set configuration data */
if (ResourceList)
{
ComponentData->ConfigurationData = ResourceList;
ComponentData->ComponentEntry.ConfigurationDataLength = Size;
}
FldrSetConfigurationData(ComponentData, ResourceList, Size);
/* Return the child */
*ComponentKey = ComponentData;

3
reactos/boot/freeldr/freeldr/arch/arm/macharm.c
View file

@ -97,8 +97,7 @@ ArmPrepareForReactOS(IN BOOLEAN Setup)
}
BOOLEAN
ArmDiskGetBootPath(OUT PCHAR BootPath,
IN unsigned Size)
ArmDiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size)
{
PCCH Path = "ramdisk(0)";

2
reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
View file

@ -386,7 +386,7 @@ PcDiskGetCacheableBlockCount(UCHAR DriveNumber)
}
BOOLEAN
PcDiskGetBootPath(char *BootPath, unsigned Size)
PcDiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size)
{
// FIXME: Keep it there, or put it in DiskGetBootPath?
// Or, abstract the notion of network booting to make

2
reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
View file

@ -247,7 +247,7 @@ ULONG PpcGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap,
return slots;
}
BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) {
BOOLEAN PpcDiskGetBootPath(PCHAR OutBootPath, ULONG Size) {
strncpy( OutBootPath, BootPath, Size );
return TRUE;
}

2
reactos/boot/freeldr/freeldr/disk/disk.c
View file

@ -102,7 +102,7 @@ BOOLEAN DiskIsDriveRemovable(UCHAR DriveNumber)
}
BOOLEAN
DiskGetBootPath(char *BootPath, unsigned Size)
DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size)
{
static char Path[] = "multi(0)disk(0)";
char Device[4];

15
reactos/boot/freeldr/freeldr/include/arch/archwsup.h
View file

@ -25,6 +25,21 @@
//
// ARC Component Configuration Routines
//
VOID
NTAPI
FldrSetIdentifier(
IN PCONFIGURATION_COMPONENT_DATA ComponentData,
IN PCHAR IdentifierString
);
VOID
NTAPI
FldrSetConfigurationData(
IN PCONFIGURATION_COMPONENT_DATA ComponentData,
IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
IN ULONG Size
);
VOID
NTAPI
FldrCreateSystemKey(

2
reactos/boot/freeldr/freeldr/include/disk.h
View file

@ -135,7 +135,7 @@ extern ULONG FrldrBootPartition;
extern PVOID DiskReadBuffer;
extern SIZE_T DiskReadBufferSize;
BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size);
BOOLEAN DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size);
///////////////////////////////////////////////////////////////////////////////////////

2
reactos/boot/freeldr/freeldr/include/machine.h
View file

@ -61,7 +61,7 @@ typedef struct tagMACHVTBL
FREELDR_MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(FREELDR_MEMORY_DESCRIPTOR* Current);
PFREELDR_MEMORY_DESCRIPTOR (*GetMemoryMap)(PULONG MaxMemoryMapSize);
BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size);
BOOLEAN (*DiskGetBootPath)(PCHAR BootPath, ULONG Size);
BOOLEAN (*DiskReadLogicalSectors)(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer);
BOOLEAN (*DiskGetDriveGeometry)(UCHAR DriveNumber, PGEOMETRY DriveGeometry);
ULONG (*DiskGetCacheableBlockCount)(UCHAR DriveNumber);