[ros-diffs] [fireball] 31185: - Remove zeroing of PartialResourceList's fields (we allocate without that list). - Sync SetupLDR's BIOS MMap-code with FreeLDR's, fixes the "Total: 0A (0 MB") problem in bootcds.

Author: fireball
Date: Wed Dec 12 23:29:09 2007
New Revision: 31185

URL: http://svn.reactos.org/svn/reactos?rev=31185&view=rev
Log:
- Remove zeroing of PartialResourceList's fields (we allocate without that list).
- Sync SetupLDR's BIOS MMap-code with FreeLDR's, fixes the "Total: 0A (0
MB") problem in bootcds.

Modified:
    trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
    trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Wed Dec 12 23:29:09 2007
@@ -261,9 +261,6 @@
       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 @@
               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);

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Dec 12 23:29:09 2007
@@ -190,10 +190,13 @@
   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 @@
               LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low +
reactos_memory_map[i].length_low) / 1024 - 1024;
           }
       }
+#endif
   }
 
 #ifdef USE_UI