[BOOTLIB]: More debug print cleanups

[BOOTLIB]: Fix incorrect use of flag introduced a few revisions ago. This fixes <1MB RAM descriptors.
[BOOTLIB]: Enable BmFwMemoryInitialize, since it works now.
All (known) bugs are fixed, bootmgr is back on track.

svn path=/trunk/; revision=70516

diff --git a/reactos/boot/environ/app/bootmgr/bootmgr.c b/reactos/boot/environ/app/bootmgr/bootmgr.c
index 3a6cb39..3f6e628 100644 (file)
--- a/reactos/boot/environ/app/bootmgr/bootmgr.c
+++ b/reactos/boot/environ/app/bootmgr/bootmgr.c
@@ -1151,7 +1151,7 @@ BmMain (
     }
 
     /* Initialize firmware-specific memory regions */
-    //BmFwMemoryInitialize();
+    BmFwMemoryInitialize();
 
     /* Initialize the boot status data log (BSD) */
     BmpInitializeBootStatusDataLog();
@@ -1168,7 +1168,7 @@ BmMain (
 
     /* do more stuff!! */
     EfiPrintf(BlResourceFindMessage(BM_MSG_TEST));
-    EfiPrintf(Stylesheet);
+    //EfiPrintf(Stylesheet);
     EfiStall(10000000);
 
 //Failure:

diff --git a/reactos/boot/environ/include/bl.h b/reactos/boot/environ/include/bl.h
index 89a3a15..f2d69de 100644 (file)
--- a/reactos/boot/environ/include/bl.h
+++ b/reactos/boot/environ/include/bl.h
@@ -287,10 +287,11 @@ typedef enum _BL_MEMORY_ATTR
     //
     // Memory Allocation Attributes
     //
+    BlMemoryUnknown =           0x00010000,
     BlMemoryNonFixed =          0x00020000,
     BlMemoryFixed =             0x00040000,
     BlMemoryReserved =          0x00080000,
-    BlMemoryValidAllocationAttributes       = BlMemoryNonFixed | BlMemoryFixed | BlMemoryReserved,
+    BlMemoryValidAllocationAttributes       = BlMemoryNonFixed | BlMemoryFixed | BlMemoryReserved | BlMemoryUnknown,
     BlMemoryValidAllocationAttributeMask    = 0x00FF0000,
 
     //

diff --git a/reactos/boot/environ/lib/firmware/efi/firmware.c b/reactos/boot/environ/lib/firmware/efi/firmware.c
index d84d622..3ec3fdf 100644 (file)
--- a/reactos/boot/environ/lib/firmware/efi/firmware.c
+++ b/reactos/boot/environ/lib/firmware/efi/firmware.c
@@ -1269,7 +1269,8 @@ MmFwGetMemoryMap (
                 if (Descriptor->Type == BlConventionalMemory)
                 {
                     /* Set the reserved flag on the descriptor */
-                    Descriptor->Flags |= BlReservedMemory;
+                    EfiPrintf(L"Adding magic flag\r\n");
+                    Descriptor->Flags |= BlMemoryReserved;
                 }
 
                 /* Add this descriptor into the list */
@@ -1313,7 +1314,8 @@ MmFwGetMemoryMap (
         if ((Descriptor->Type == BlConventionalMemory) && (EndPage <= 0x100))
         {
             /* Set the reserved flag on the descriptor */
-            Descriptor->Flags |= BlReservedMemory;
+            EfiPrintf(L"Adding magic flag\r\n");
+            Descriptor->Flags |= BlMemoryReserved;
         }
 
         /* Add the descriptor to the list, requesting coalescing as asked */

diff --git a/reactos/boot/environ/lib/io/device.c b/reactos/boot/environ/lib/io/device.c
index 4dff2b5..ed2f4bf 100644 (file)
--- a/reactos/boot/environ/lib/io/device.c
+++ b/reactos/boot/environ/lib/io/device.c
@@ -301,7 +301,7 @@ BlockIopOperation (
     }
 
     Alignment = BlockDevice->Alignment;
-    if (!Alignment || !((Alignment - 1) & (ULONG_PTR)Buffer))
+    if (!(Alignment) || !((Alignment - 1) & (ULONG_PTR)Buffer))
     {
         Status = BlockIopFirmwareOperation(DeviceEntry,
                                            Buffer,
@@ -317,7 +317,6 @@ BlockIopOperation (
         return STATUS_SUCCESS;
     }
 
-    EfiPrintf(L"Firmware alignment fixup required\r\n");
     Status = BlockIopAllocateAlignedBuffer(&BlockIopAlignedBuffer,
                                            &BlockIopAlignedBufferSize,
                                            BufferSize,
@@ -821,11 +820,6 @@ BlockIoEfiGetBlockIoInformation (
     /* Get information on the block media */
     Media = BlockDevice->Protocol->Media;
 
-    EfiPrintf(L"Block I/O Info for Device 0x%p, 0x%lX\r\n", BlockDevice, BlockDevice->Handle);
-    EfiPrintf(L"Removable: %d Present: %d Last Block: %I64d BlockSize: %d IoAlign: %d MediaId: %d ReadOnly: %d\r\n",
-              Media->RemovableMedia, Media->MediaPresent, Media->LastBlock, Media->BlockSize, Media->IoAlign,
-              Media->MediaId, Media->ReadOnly);
-
     /* Set the appropriate device flags */
     BlockDevice->DeviceFlags = 0;
     if (Media->RemovableMedia)

diff --git a/reactos/boot/environ/lib/io/etfs.c b/reactos/boot/environ/lib/io/etfs.c
index a41a27f..61faea0 100644 (file)
--- a/reactos/boot/environ/lib/io/etfs.c
+++ b/reactos/boot/environ/lib/io/etfs.c
@@ -551,8 +551,6 @@ EtfsOpen (
     PRAW_DIR_REC DirEntry;
     BOOLEAN IsDirectory;
 
-    EfiPrintf(L"Attempting to open file %s in directory %s\r\n", FileName, Directory->FilePath);
-
     EtfsFile = Directory->FsSpecificData;
     DeviceId = EtfsFile->DeviceId;
     EtfsDevice = EtfsDeviceTable[DeviceId];

diff --git a/reactos/boot/environ/lib/io/file.c b/reactos/boot/environ/lib/io/file.c
index ffa1ba1..67cba01 100644 (file)
--- a/reactos/boot/environ/lib/io/file.c
+++ b/reactos/boot/environ/lib/io/file.c
@@ -426,8 +426,6 @@ FileIoOpen (
     Status = STATUS_SUCCESS;
     FileEntry->FileId = FileId;
 
-    EfiPrintf(L"File %s opened with ID: %lx\r\n", FileEntry->FilePath, FileId);
-
 FileOpened:
     /* Add a reference to the file entry, and see if this is the first one */
     if (++FileEntry->ReferenceCount == 1)
@@ -524,7 +522,6 @@ BlFileOpen (
     if (NT_SUCCESS(Status))
     {
         /* Return the file ID back to the caller */
-        EfiPrintf(L"File %s opened: %lx\r\n", FileName, FileEntry->FileId);
         *FileId = FileEntry->FileId;
     }
 

diff --git a/reactos/boot/environ/lib/mm/descriptor.c b/reactos/boot/environ/lib/mm/descriptor.c
index 8ccfe6c..58d68c8 100644 (file)
--- a/reactos/boot/environ/lib/mm/descriptor.c
+++ b/reactos/boot/environ/lib/mm/descriptor.c
@@ -742,9 +742,9 @@ MmMdFindSatisfyingRegion (
     }
 
     /* Bail out if the allocation flags don't match */
-    if (((Flags ^ Descriptor->Flags) & 0x190000))
+    if (((Flags ^ Descriptor->Flags) & (BlMemoryRuntime | BlMemoryReserved | BlMemoryUnknown)))
     {
-        EfiPrintf(L"Incorrect memory allocation flags\r\n");
+        //EfiPrintf(L"Incorrect memory allocation flags\r\n");
         return FALSE;
     }