[REACTOS] Improve how some ASSERTMSG() message values are printed: enforce ending...

[reactos.git] / drivers / bus / pcix / enum.c

diff --git a/drivers/bus/pcix/enum.c b/drivers/bus/pcix/enum.c
index e4735cf..edb8a26 100644 (file)
--- a/drivers/bus/pcix/enum.c
+++ b/drivers/bus/pcix/enum.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -500,7 +501,7 @@ PciQueryResources(IN PPCI_PDO_EXTENSION PdoExtension,
         }
     }
 
-    /* Return the resouce list */
+    /* Return the resource list */
     *Buffer = ResourceList;
     return STATUS_SUCCESS;
 }
@@ -537,6 +538,9 @@ NTAPI
 PciQueryEjectionRelations(IN PPCI_PDO_EXTENSION PdoExtension,
                           IN OUT PDEVICE_RELATIONS *pDeviceRelations)
 {
+    UNREFERENCED_PARAMETER(PdoExtension);
+    UNREFERENCED_PARAMETER(pDeviceRelations);
+
     /* Not yet implemented */
     UNIMPLEMENTED_DBGBREAK();
     return STATUS_NOT_IMPLEMENTED;
@@ -549,6 +553,10 @@ PciBuildRequirementsList(IN PPCI_PDO_EXTENSION PdoExtension,
                          OUT PIO_RESOURCE_REQUIREMENTS_LIST* Buffer)
 {
     PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList;
+
+    UNREFERENCED_PARAMETER(PdoExtension);
+    UNREFERENCED_PARAMETER(PciData);
+
     {
         /* There aren't, so use the zero descriptor */
         RequirementsList = PciZeroIoResourceRequirements;
@@ -602,7 +610,7 @@ PciQueryRequirements(IN PPCI_PDO_EXTENSION PdoExtension,
         /* Check if the requirements are actually the zero list */
         if (*RequirementsList == PciZeroIoResourceRequirements)
         {
-            /* A simple NULL will sufficie for the PnP Manager */
+            /* A simple NULL will suffice for the PnP Manager */
             *RequirementsList = NULL;
             DPRINT1("Returning NULL requirements list\n");
         }
@@ -740,7 +748,7 @@ PciConfigureIdeController(IN PPCI_PDO_EXTENSION PdoExtension,
             PciData->ProgIf = ProgIf;
             PdoExtension->ProgIf = NewProgIf;
 
-            /* Clear the first four BARs to reset current BAR setttings */
+            /* Clear the first four BARs to reset current BAR settings */
             PciData->u.type0.BaseAddresses[0] = 0;
             PciData->u.type0.BaseAddresses[1] = 0;
             PciData->u.type0.BaseAddresses[2] = 0;
@@ -793,6 +801,8 @@ PciApplyHacks(IN PPCI_FDO_EXTENSION DeviceExtension,
     USHORT Command;
     UCHAR RegValue;
 
+    UNREFERENCED_PARAMETER(SlotNumber);
+
     /* Check what kind of hack operation this is */
     switch (OperationType)
     {
@@ -986,7 +996,7 @@ PciApplyHacks(IN PPCI_FDO_EXTENSION DeviceExtension,
             /*
              * Check for Intel ICH PCI-to-PCI (i82801) bridges (used on the i810,
              * i820, i840, i845 Chipsets) that have subtractive decode enabled,
-             * and whose hack flags do not specifiy that this support is broken.
+             * and whose hack flags do not specify that this support is broken.
              */
             if ((PdoExtension->HeaderType == PCI_BRIDGE_TYPE) &&
                 (PdoExtension->Dependent.type1.SubtractiveDecode) &&
@@ -1118,7 +1128,7 @@ PciSkipThisFunction(IN PPCI_COMMON_HEADER PciData,
         else
         {
             /* Logic error in the driver */
-            ASSERTMSG(FALSE, "PCI Skip Function - Operation type unknown.");
+            ASSERTMSG("PCI Skip Function - Operation type unknown.\n", FALSE);
         }
 
         /* Check for legacy bridges during resource enumeration */
@@ -1293,6 +1303,8 @@ PciWriteLimitsAndRestoreCurrent(IN PVOID Reserved,
     PPCI_COMMON_HEADER PciData, Current;
     PPCI_PDO_EXTENSION PdoExtension;
 
+    UNREFERENCED_PARAMETER(Reserved);
+
     /* Grab all parameters from the context */
     PdoExtension = Context->PdoExtension;
     Current = Context->Current;
@@ -1577,7 +1589,7 @@ PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension)
     USHORT SubVendorId, SubSystemId;
     PCI_CAPABILITIES_HEADER CapHeader, PcixCapHeader;
     UCHAR SecondaryBus;
-    DPRINT1("PCI Scan Bus: FDO Extension @ 0x%x, Base Bus = 0x%x\n",
+    DPRINT1("PCI Scan Bus: FDO Extension @ 0x%p, Base Bus = 0x%x\n",
             DeviceExtension, DeviceExtension->BaseBus);
 
     /* Is this the root FDO? */
@@ -1996,7 +2008,7 @@ PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension)
                         ((TempOffset) && (PciData->LatencyTimer == 64)))
                     {
                         /* Keep track of the fact that it needs configuration */
-                        DPRINT1("PCI - ScanBus, PDOx %x found unconfigured\n",
+                        DPRINT1("PCI - ScanBus, PDOx %p found unconfigured\n",
                                 NewExtension);
                         NewExtension->NeedsHotPlugConfiguration = TRUE;
                     }
@@ -2060,7 +2072,7 @@ PciQueryDeviceRelations(IN PPCI_FDO_EXTENSION DeviceExtension,
         {
             /* This means this PDO existed before, but not anymore */
             PdoExtension->ReportedMissing = TRUE;
-            DPRINT1("PCI - Old device (pdox) %08x not found on rescan.\n",
+            DPRINT1("PCI - Old device (pdox) %p not found on rescan.\n",
                     PdoExtension);
         }
         else
@@ -2098,7 +2110,7 @@ PciQueryDeviceRelations(IN PPCI_FDO_EXTENSION DeviceExtension,
     }
 
     /* Print out that we're ready to dump relations */
-    DPRINT1("PCI QueryDeviceRelations/BusRelations FDOx %08x (bus 0x%02x)\n",
+    DPRINT1("PCI QueryDeviceRelations/BusRelations FDOx %p (bus 0x%02x)\n",
             DeviceExtension,
             DeviceExtension->BaseBus);
 
@@ -2108,7 +2120,7 @@ PciQueryDeviceRelations(IN PPCI_FDO_EXTENSION DeviceExtension,
     while (PdoExtension)
     {
         /* Dump this relation */
-        DPRINT1("  QDR PDO %08x (x %08x)%s\n",
+        DPRINT1("  QDR PDO %p (x %p)%s\n",
                 PdoExtension->PhysicalDeviceObject,
                 PdoExtension,
                 PdoExtension->NotPresent ?
@@ -2128,7 +2140,7 @@ PciQueryDeviceRelations(IN PPCI_FDO_EXTENSION DeviceExtension,
     }
 
     /* Terminate dumping the relations */
-    DPRINT1("  QDR Total PDO count = %d (%d already in list)\n",
+    DPRINT1("  QDR Total PDO count = %u (%u already in list)\n",
             NewRelations->Count + PdoCount,
             NewRelations->Count);
 
@@ -2150,6 +2162,8 @@ PciSetResources(IN PPCI_PDO_EXTENSION PdoExtension,
     BOOLEAN Native;
     PPCI_CONFIGURATOR Configurator;
 
+    UNREFERENCED_PARAMETER(SomethingSomethingDarkSide);
+
     /* Get the FDO and read the configuration data */
     FdoExtension = PdoExtension->ParentFdoExtension;
     PciReadDeviceConfig(PdoExtension, &PciData, 0, PCI_COMMON_HDR_LENGTH);
@@ -2158,7 +2172,7 @@ PciSetResources(IN PPCI_PDO_EXTENSION PdoExtension,
     if (!PcipIsSameDevice(PdoExtension, &PciData))
     {
         /* Fail */
-        ASSERTMSG(FALSE, "PCI Set resources - not same device");
+        ASSERTMSG("PCI Set resources - not same device.\n", FALSE);
         return STATUS_DEVICE_DOES_NOT_EXIST;
     }
 
@@ -2210,7 +2224,7 @@ PciSetResources(IN PPCI_PDO_EXTENSION PdoExtension,
     if (PciData.LatencyTimer != NewLatencyTimer)
     {
         /* Debug notification */
-        DPRINT1("PCI (pdox %08x) changing latency from %02x to %02x.\n",
+        DPRINT1("PCI (pdox %p) changing latency from %02x to %02x.\n",
                 PdoExtension,
                 PciData.LatencyTimer,
                 NewLatencyTimer);
@@ -2221,7 +2235,7 @@ PciSetResources(IN PPCI_PDO_EXTENSION PdoExtension,
     if (PciData.CacheLineSize != NewCacheLineSize)
     {
         /* Debug notification */
-        DPRINT1("PCI (pdox %08x) changing cache line size from %02x to %02x.\n",
+        DPRINT1("PCI (pdox %p) changing cache line size from %02x to %02x.\n",
                 PdoExtension,
                 PciData.CacheLineSize,
                 NewCacheLineSize);