[ros-diffs] [fireball] 31984: - Change hardware.c to the new heap allocation mm-apis.

Author: fireball
Date: Fri Jan 25 14:35:51 2008
New Revision: 31984

URL: http://svn.reactos.org/svn/reactos?rev=31984&view=rev
Log:
- Change hardware.c to the new heap allocation mm-apis.

Modified:
    trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Fri Jan 25 14:35:51 2008
@@ -256,7 +256,7 @@
 
     /* Set 'Configuration Data' value */
   Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + (NodeSize * NodeCount);
-  PartialResourceList = MmAllocateMemory(Size);
+  PartialResourceList = MmHeapAlloc(Size);
   if (PartialResourceList == NULL)
     {
       DbgPrint((DPRINT_HWDETECT,
@@ -321,7 +321,7 @@
   DbgPrint((DPRINT_HWDETECT, "Resource size: %u\n", Size));
   
     FldrSetConfigurationData(BusKey, PartialResourceList, Size);
-    MmFreeMemory(PartialResourceList);
+    MmHeapFree(PartialResourceList);
 }
 
 
@@ -339,7 +339,7 @@
   /* Set 'Configuration Data' value */
   Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
 	 sizeof(CM_DISK_GEOMETRY_DEVICE_DATA);
-  PartialResourceList = MmAllocateMemory(Size);
+  PartialResourceList = MmHeapAlloc(Size);
   if (PartialResourceList == NULL)
     {
       DbgPrint((DPRINT_HWDETECT,
@@ -380,7 +380,7 @@
   else
     {
       DbgPrint((DPRINT_HWDETECT, "Reading disk geometry failed\n"));
-      MmFreeMemory(PartialResourceList);
+      MmHeapFree(PartialResourceList);
       return;
     }
   DbgPrint((DPRINT_HWDETECT,
@@ -392,7 +392,7 @@
 	   DiskGeometry->BytesPerSector));
 
   FldrSetConfigurationData(DiskKey, PartialResourceList, Size);
-  MmFreeMemory(PartialResourceList);
+  MmHeapFree(PartialResourceList);
 }
 
 
@@ -545,7 +545,7 @@
 
     Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
 	   sizeof(CM_FLOPPY_DEVICE_DATA);
-    PartialResourceList = MmAllocateMemory(Size);
+    PartialResourceList = MmHeapAlloc(Size);
     if (PartialResourceList == NULL)
     {
       DbgPrint((DPRINT_HWDETECT,
@@ -576,7 +576,7 @@
 
     /* Set 'Configuration Data' value */
     FldrSetConfigurationData(PeripheralKey, PartialResourceList, Size);
-    MmFreeMemory(PartialResourceList);
+    MmHeapFree(PartialResourceList);
 
     /* Set 'Identifier' value */
     swprintf(Identifier, L"FLOPPY%u", FloppyNumber + 1);
@@ -601,7 +601,7 @@
   
   Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
 	 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-  PartialResourceList = MmAllocateMemory(Size);
+  PartialResourceList = MmHeapAlloc(Size);
   if (PartialResourceList == NULL)
     {
       DbgPrint((DPRINT_HWDETECT,
@@ -643,7 +643,7 @@
 
   /* Set 'Configuration Data' value */
   FldrSetConfigurationData(ControllerKey, PartialResourceList, Size);
-  MmFreeMemory(PartialResourceList);
+  MmHeapFree(PartialResourceList);
 
   if (FloppyCount) DetectBiosFloppyPeripheral(ControllerKey);
 }
@@ -710,7 +710,7 @@
     /* Allocate resource descriptor */
     Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
         sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount;
-    PartialResourceList = MmAllocateMemory(Size);
+    PartialResourceList = MmHeapAlloc(Size);
     if (PartialResourceList == NULL)
     {
         DbgPrint((DPRINT_HWDETECT,
@@ -753,7 +753,7 @@
     
     /* Set 'Configuration Data' value */
     FldrSetConfigurationData(SystemKey, PartialResourceList, Size);
-    MmFreeMemory(PartialResourceList);
+    MmHeapFree(PartialResourceList);
     
     /* Create and fill subkey for each harddisk */
     for (i = 0; i < DiskCount; i++)
@@ -1170,7 +1170,7 @@
       Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
 	     2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) +
 	     sizeof(CM_SERIAL_DEVICE_DATA);
-      PartialResourceList = MmAllocateMemory(Size);
+      PartialResourceList = MmHeapAlloc(Size);
       if (PartialResourceList == NULL)
 	{
 	  DbgPrint((DPRINT_HWDETECT,
@@ -1215,7 +1215,7 @@
 
       /* Set 'Configuration Data' value */
       FldrSetConfigurationData(ControllerKey, PartialResourceList, Size);
-      MmFreeMemory(PartialResourceList);
+      MmHeapFree(PartialResourceList);
 
       /* Set 'Identifier' value */
       swprintf(Buffer, L"COM%u", i + 1);
@@ -1283,7 +1283,7 @@
       if (Irq[i] != (ULONG)-1)
 	Size += sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
 
-      PartialResourceList = MmAllocateMemory(Size);
+      PartialResourceList = MmHeapAlloc(Size);
       if (PartialResourceList == NULL)
 	{
 	  DbgPrint((DPRINT_HWDETECT,
@@ -1320,7 +1320,7 @@
 
       /* Set 'Configuration Data' value */
       FldrSetConfigurationData(ControllerKey, PartialResourceList, Size);
-      MmFreeMemory(PartialResourceList);
+      MmHeapFree(PartialResourceList);
 
       /* Set 'Identifier' value */
       swprintf(Buffer, L"PARALLEL%u", i + 1);
@@ -1437,7 +1437,7 @@
     /* Set 'Configuration Data' value */
     Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
 	   sizeof(CM_KEYBOARD_DEVICE_DATA);
-    PartialResourceList = MmAllocateMemory(Size);
+    PartialResourceList = MmHeapAlloc(Size);
     if (PartialResourceList == NULL)
     {
       DbgPrint((DPRINT_HWDETECT,
@@ -1465,7 +1465,7 @@
 
     /* Set 'Configuration Data' value */
     FldrSetConfigurationData(PeripheralKey, PartialResourceList, Size);
-    MmFreeMemory(PartialResourceList);
+    MmHeapFree(PartialResourceList);
 
     /* Set 'Identifier' value */
     FldrSetIdentifier(PeripheralKey, L"PCAT_ENHANCED");
@@ -1499,7 +1499,7 @@
   /* Set 'Configuration Data' value */
   Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
 	  2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-  PartialResourceList = MmAllocateMemory(Size);
+  PartialResourceList = MmHeapAlloc(Size);
   if (PartialResourceList == NULL)
     {
       DbgPrint((DPRINT_HWDETECT,
@@ -1542,7 +1542,7 @@
 
   /* Set 'Configuration Data' value */
   FldrSetConfigurationData(ControllerKey, PartialResourceList, Size);
-  MmFreeMemory(PartialResourceList);
+  MmHeapFree(PartialResourceList);
  
   DetectKeyboardPeripheral(ControllerKey);
 }
@@ -1826,7 +1826,7 @@
   /* Set 'Configuration Data' value */
   Size = sizeof(CM_PARTIAL_RESOURCE_LIST) -
 	 sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-  PartialResourceList = MmAllocateMemory(Size);
+  PartialResourceList = MmHeapAlloc(Size);
   if (PartialResourceList == NULL)
     {
       DbgPrint((DPRINT_HWDETECT,
@@ -1842,7 +1842,7 @@
 
   /* Set 'Configuration Data' value */
   FldrSetConfigurationData(BusKey, PartialResourceList, Size);
-  MmFreeMemory(PartialResourceList);
+  MmHeapFree(PartialResourceList);
 
   /* Detect ISA/BIOS devices */
   DetectBiosDisks(SystemKey, BusKey);