Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-05 00:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Remove zeroing of PartialResourceList's fields (we allocate without that list).

Browse source 
- Sync SetupLDR's BIOS MMap-code with FreeLDR's, fixes the "Total: 0A (0 MB") problem in bootcds.

svn path=/trunk/; revision=31185
This commit is contained in:
Aleksey Bragin 2007-12-12 20:29:09 +00:00
parent 4556cc8f16
commit 6148b9b898
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
View file

@ -261,9 +261,6 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
memset(FullResourceDescriptor, 0, Size);
FullResourceDescriptor->InterfaceType = Internal;
FullResourceDescriptor->BusNumber = 0;
FullResourceDescriptor->PartialResourceList.Version = 0;
FullResourceDescriptor->PartialResourceList.Revision = 0;
FullResourceDescriptor->PartialResourceList.Count = 0;
/* Set 'Configuration Data' value */
FldrSetConfigurationData(BiosKey, FullResourceDescriptor, Size);
@ -340,9 +337,6 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
memset(FullResourceDescriptor, 0, Size);
FullResourceDescriptor->InterfaceType = PCIBus;
FullResourceDescriptor->BusNumber = i;
FullResourceDescriptor->PartialResourceList.Version = 0;
FullResourceDescriptor->PartialResourceList.Revision = 0;
FullResourceDescriptor->PartialResourceList.Count = 0;
/* Set 'Configuration Data' value */
FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size);

6
reactos/boot/freeldr/freeldr/reactos/setupldr.c
View file

@ -190,10 +190,13 @@ VOID RunLoader(VOID)
LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t);
if (LoaderBlock.MmapLength)
{
#ifdef _M_IX86
ULONG i;
#endif
LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO;
LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map;
reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
#ifdef _M_IX86
for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++)
{
if (BiosMemoryUsable == reactos_memory_map[i].type &&
@ -212,6 +215,7 @@ VOID RunLoader(VOID)
LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024;
}
}
#endif
}
#ifdef USE_UI