check the usage of %d,%x,%ld,%lx and so on in debug print statement.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7080 6f19259b-4bc3-4df7-8a09-765794883524

10 files changed, 28 insertions, 28 deletions

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
index ca3e2524db..7177c33aa7 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
@@ -87,7 +87,7 @@ EhcDumpQtd (
     DEBUG ((EFI_D_INFO, Msg));

   }

 

-  DEBUG ((EFI_D_INFO, "Queue TD @ 0x%x, data length %d\n", Qtd, Qtd->DataLen));

+  DEBUG ((EFI_D_INFO, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen));

 

   QtdHw = &Qtd->QtdHw;

 

@@ -114,7 +114,7 @@ EhcDumpQtd (
   DEBUG ((EFI_D_INFO, "Data Toggle  : %d\n", QtdHw->DataToggle));

 

   for (Index = 0; Index < 5; Index++) {

-    DEBUG ((EFI_D_INFO, "Page[%d]      : 0x%x\n", Index, QtdHw->Page[Index]));

+    DEBUG ((EFI_D_INFO, "Page[%d]      : 0x%x\n", (UINT32)Index, QtdHw->Page[Index]));

   }

 }

 

@@ -145,8 +145,8 @@ EhcDumpQh (
     DEBUG ((EFI_D_INFO, Msg));

   }

 

-  DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %d, next qh %x\n",

-                                Qh, Qh->Interval, Qh->NextQh));

+  DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %ld, next qh %p\n",

+                                Qh, (UINT64)Qh->Interval, Qh->NextQh));

 

   QhHw = &Qh->QhHw;

 

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 522f2d0633..89ec339dd0 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -659,7 +659,7 @@ EhcExecTransfer (
   }

 

   if (!Finished) {

-    DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", TimeOut));

+    DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", (UINT32)TimeOut));

     EhcDumpQh (Urb->Qh, NULL, FALSE);

 

     Status = EFI_TIMEOUT;

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index c20e944196..deb21dd837 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -318,7 +318,7 @@ Uhci2GetCapability (
 

   Uhc->RootPorts = *PortNumber;

 

-  DEBUG ((EFI_D_INFO, "Uhci2GetCapability: %d ports\n", Uhc->RootPorts));

+  DEBUG ((EFI_D_INFO, "Uhci2GetCapability: %d ports\n", (UINT32)Uhc->RootPorts));

   return EFI_SUCCESS;

 }

 

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
index 7c3bfe91ae..2b53c262a3 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
@@ -26,9 +26,9 @@ UhciDumpQh (
   IN UHCI_QH_SW    *QhSw

   )

 {

-  DEBUG ((EFI_D_INFO, "&QhSw @ 0x%x\n", QhSw));

-  DEBUG ((EFI_D_INFO, "QhSw.NextQh    - 0x%x\n", QhSw->NextQh));

-  DEBUG ((EFI_D_INFO, "QhSw.TDs       - 0x%x\n", QhSw->TDs));

+  DEBUG ((EFI_D_INFO, "&QhSw @ 0x%p\n", QhSw));

+  DEBUG ((EFI_D_INFO, "QhSw.NextQh    - 0x%p\n", QhSw->NextQh));

+  DEBUG ((EFI_D_INFO, "QhSw.TDs       - 0x%p\n", QhSw->TDs));

   DEBUG ((EFI_D_INFO, "QhSw.QhHw:\n"));

   DEBUG ((EFI_D_INFO, " Horizon  Link - %x\n", QhSw->QhHw.HorizonLink));

   DEBUG ((EFI_D_INFO, " Vertical Link - %x\n\n", QhSw->QhHw.VerticalLink));

@@ -51,10 +51,10 @@ UhciDumpTds (
   CurTdSw = TdSw;

 

   while (CurTdSw != NULL) {

-    DEBUG ((EFI_D_INFO, "TdSw @ 0x%x\n",           CurTdSw));

-    DEBUG ((EFI_D_INFO, "TdSw.NextTd   - 0x%x\n",  CurTdSw->NextTd));

+    DEBUG ((EFI_D_INFO, "TdSw @ 0x%p\n",           CurTdSw));

+    DEBUG ((EFI_D_INFO, "TdSw.NextTd   - 0x%p\n",  CurTdSw->NextTd));

     DEBUG ((EFI_D_INFO, "TdSw.DataLen  - %d\n",    CurTdSw->DataLen));

-    DEBUG ((EFI_D_INFO, "TdSw.Data     - 0x%x\n",  CurTdSw->Data));

+    DEBUG ((EFI_D_INFO, "TdSw.Data     - 0x%p\n",  CurTdSw->Data));

     DEBUG ((EFI_D_INFO, "TdHw:\n"));

     DEBUG ((EFI_D_INFO, " NextLink     - 0x%x\n",  CurTdSw->TdHw.NextLink));

     DEBUG ((EFI_D_INFO, " ActualLen    - %d\n",    CurTdSw->TdHw.ActualLen));

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
index 7173d72123..0ab2af4c4c 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
@@ -577,7 +577,7 @@ UhciExecuteTransfer (
   }

 

   if (!Finished) {

-    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution not finished for %dms\n", TimeOut));

+    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution not finished for %dms\n", (UINT32)TimeOut));

     UhciDumpQh (Qh);

     UhciDumpTds (Td);

 

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
index 269dcbf81b..0e9ea1e4d3 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
@@ -251,7 +251,7 @@ UsbParseInterfaceDesc (
   NumEp  = Setting->Desc.NumEndpoints;

 

   DEBUG (( EFI_D_INFO, "UsbParseInterfaceDesc: interface %d(setting %d) has %d endpoints\n",

-              Setting->Desc.InterfaceNumber, Setting->Desc.AlternateSetting, NumEp));

+              Setting->Desc.InterfaceNumber, Setting->Desc.AlternateSetting, (UINT32)NumEp));

 

   if (NumEp == 0) {

     goto ON_EXIT;

@@ -270,7 +270,7 @@ UsbParseInterfaceDesc (
     Ep = UsbCreateDesc (DescBuf + Offset, Len - Offset, USB_DESC_TYPE_ENDPOINT, &Used);

 

     if (Ep == NULL) {

-      DEBUG (( EFI_D_ERROR, "UsbParseInterfaceDesc: failed to create endpoint(index %d)\n", Index));

+      DEBUG (( EFI_D_ERROR, "UsbParseInterfaceDesc: failed to create endpoint(index %d)\n", (UINT32)Index));

       goto ON_ERROR;

     }

 

@@ -330,7 +330,7 @@ UsbParseConfigDesc (
   }

 

   DEBUG (( EFI_D_INFO, "UsbParseConfigDesc: config %d has %d interfaces\n",

-                Config->Desc.ConfigurationValue, NumIf));

+                Config->Desc.ConfigurationValue, (UINT32)NumIf));

 

   for (Index = 0; Index < NumIf; Index++) {

     Interface = AllocateZeroPool (sizeof (USB_INTERFACE_DESC));

@@ -721,7 +721,7 @@ UsbGetOneConfig (
 

   if (EFI_ERROR (Status)) {

     DEBUG (( EFI_D_ERROR, "UsbGetOneConfig: failed to get descript length(%d) %r\n",

-                Status, Desc.TotalLength));

+                Desc.TotalLength, Status));

 

     return NULL;

   }

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index 3a2b8bc017..0b96394f2a 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -280,14 +280,14 @@ UsbConnectDriver (
     //

     if (UsbBusIsWantedUsbIO (UsbIf->Device->Bus, UsbIf)) {

       OldTpl            = UsbGetCurrentTpl ();

-      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", OldTpl));

+      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", (UINT32)OldTpl));

 

       gBS->RestoreTPL (TPL_CALLBACK);

 

       Status            = gBS->ConnectController (UsbIf->Handle, NULL, NULL, TRUE);

       UsbIf->IsManaged  = (BOOLEAN)!EFI_ERROR (Status);

 

-      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", UsbGetCurrentTpl()));

+      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", (UINT32)UsbGetCurrentTpl()));

       ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);

 

       gBS->RaiseTPL (OldTpl);

@@ -472,14 +472,14 @@ UsbDisconnectDriver (
     // or disconnect at CALLBACK.

     //

     OldTpl           = UsbGetCurrentTpl ();

-    DEBUG ((EFI_D_INFO, "UsbDisconnectDriver: old TPL is %d\n", OldTpl));

+    DEBUG ((EFI_D_INFO, "UsbDisconnectDriver: old TPL is %d\n", (UINT32)OldTpl));

 

     gBS->RestoreTPL (TPL_CALLBACK);

 

     gBS->DisconnectController (UsbIf->Handle, NULL, NULL);

     UsbIf->IsManaged = FALSE;

 

-    DEBUG (( EFI_D_INFO, "UsbDisconnectDriver: TPL after disconnect is %d\n", UsbGetCurrentTpl()));

+    DEBUG (( EFI_D_INFO, "UsbDisconnectDriver: TPL after disconnect is %d\n", (UINT32)UsbGetCurrentTpl()));

     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);

 

     gBS->RaiseTPL (OldTpl);

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index 24653f0625..eb41de5ecf 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -1330,10 +1330,10 @@ UsbBusRecursivelyConnectWantedUsbIo (
         //

         // Recursively connect the wanted Usb Io handle

         //

-        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", UsbGetCurrentTpl ()));

+        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", (UINT32)UsbGetCurrentTpl ()));

         Status            = gBS->ConnectController (UsbIf->Handle, NULL, NULL, TRUE);

         UsbIf->IsManaged  = (BOOLEAN)!EFI_ERROR (Status);

-        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", UsbGetCurrentTpl()));

+        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", (UINT32)UsbGetCurrentTpl()));

       }

     }

   }

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 2e6be9c418..589087accd 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -690,7 +690,7 @@ ON_ERROR:
       (Media->LastBlock != OldMedia.LastBlock)) {

 

     OldTpl = UsbGetCurrentTpl ();

-    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL before reinstall BlockIoProtocol is %d\n", OldTpl));

+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL before reinstall BlockIoProtocol is %d\n", (UINT32)OldTpl));

 

     gBS->RestoreTPL (TPL_CALLBACK);

 

@@ -701,7 +701,7 @@ ON_ERROR:
            &UsbMass->BlockIo

            );

 

-    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL after reinstall is %d\n", UsbGetCurrentTpl()));

+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL after reinstall is %d\n", (UINT32)UsbGetCurrentTpl()));

     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);

 

     gBS->RaiseTPL (OldTpl);

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index f5bd0fc837..724246d9f1 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
@@ -961,7 +961,7 @@ USBMassDriverBindingStop (
                     );

     if (EFI_ERROR (Status)) {

       AllChildrenStopped = FALSE;

-      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when opening blockio\n", Index));

+      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when opening blockio\n", (UINT32)Index));

       continue;

     }

 

@@ -988,7 +988,7 @@ USBMassDriverBindingStop (
       // Fail to uninstall blockio and devicepath protocol, so re-open usbio by child.

       //

       AllChildrenStopped = FALSE;

-      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when uninstalling blockio and devicepath\n", Index));

+      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when uninstalling blockio and devicepath\n", (UINT32)Index));

       

       gBS->OpenProtocol (

              Controller,

@@ -1013,7 +1013,7 @@ USBMassDriverBindingStop (
     return EFI_DEVICE_ERROR;

   }

   

-  DEBUG ((EFI_D_INFO, "Success to stop all %d multi-lun children handles\n", NumberOfChildren));

+  DEBUG ((EFI_D_INFO, "Success to stop all %d multi-lun children handles\n", (UINT32)NumberOfChildren));

   return EFI_SUCCESS;

 }