1. Added EFI_MEDIA_CHANGED and EFI_INVALID_PARAMETER returns in UsbMassReadBlocks().

2. Use DEBUG () to replace some native debug function in USB stack modules.

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

1 files changed, 25 insertions, 115 deletions

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
index d47314ffbf..117bef2b96 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
@@ -16,8 +16,6 @@ Module Name:
 Abstract:

 

   This file provides the information dump support for Uhci when in debug mode.

-  You can dynamically adjust the debug level by changing variable gEHCDebugLevel

-  and gEHCErrorLevel.

 

 Revision History

 

@@ -27,87 +25,6 @@ Revision History
 #include "Uhci.h"

 #include "UhciDebug.h"

 

-#ifdef EFI_DEBUG

-

-UINTN mUhciDebugMask = USB_DEBUG_FORCE_OUTPUT;

-

-

-/**

-  Debug debug print interface for UHCI

-

-  @param  Format  String to use for the print, followed by print arguments

-

-  @return None

-

-**/

-VOID

-UhciDebug (

-  IN  CHAR8               *Format,

-  ...

-  )

-{

-  VA_LIST                 Marker;

-

-  VA_START (Marker, Format);

-  DebugVPrint (DEBUG_INFO, Format, Marker);

-  VA_END (Marker);

-}

-

-

-/**

-  Debug error print interface for UHCI

-

-  @param  Format  String to use for the print, followed by print arguments

-

-  @return None

-

-**/

-VOID

-UhciError (

-  IN  CHAR8               *Format,

-  ...

-  )

-{

-  VA_LIST                 Marker;

-

-  VA_START (Marker, Format);

-  DebugVPrint (DEBUG_ERROR, Format, Marker);

-  VA_END (Marker);

-}

-

-

-

-/**

-  Debug print interface for UHCI

-

-  @param  Level   Level to control debug print

-  @param  Format  String to use for the print, followed by print arguments

-

-  @return None

-

-**/

-VOID

-UhciDebugPrint (

-  IN  UINTN               Level,

-  IN  CHAR8               *Format,

-  ...

-  )

-{

-  VA_LIST                 Marker;

-

-  VA_START (Marker, Format);

-

-  if (Level & mUhciDebugMask) {

-    if (mUhciDebugMask & USB_DEBUG_FORCE_OUTPUT) {

-      DebugVPrint (DEBUG_ERROR, Format, Marker);

-    } else {

-      DebugVPrint (DEBUG_INFO, Format, Marker);

-    }

-  }

-

-  VA_END (Marker);

-}

-

 

 /**

   Dump the content of QH structure

@@ -122,16 +39,12 @@ UhciDumpQh (
   IN UHCI_QH_SW    *QhSw

   )

 {

-  UINTN                   Level;

-

-  Level = UHCI_DEBUG_QH;

-

-  UhciDebugPrint (Level, "&QhSw @ 0x%x\n", QhSw);

-  UhciDebugPrint (Level, "QhSw.NextQh    - 0x%x\n", QhSw->NextQh);

-  UhciDebugPrint (Level, "QhSw.TDs       - 0x%x\n", QhSw->TDs);

-  UhciDebugPrint (Level, "QhSw.QhHw:\n");

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

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

+  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.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));

 }

 

 

@@ -150,34 +63,31 @@ UhciDumpTds (
   )

 {

   UHCI_TD_SW              *CurTdSw;

-  UINTN                   Level;

 

-  Level   = UHCI_DEBUG_TD;

   CurTdSw = TdSw;

 

   while (CurTdSw != NULL) {

-    UhciDebugPrint (Level, "TdSw @ 0x%x\n",           CurTdSw);

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

-    UhciDebugPrint (Level, "TdSw.DataLen  - %d\n",    CurTdSw->DataLen);

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

-    UhciDebugPrint (Level, "TdHw:\n");

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

-    UhciDebugPrint (Level, " ActualLen    - %d\n",    CurTdSw->TdHw.ActualLen);

-    UhciDebugPrint (Level, " Status       - 0x%x\n",  CurTdSw->TdHw.Status);

-    UhciDebugPrint (Level, " IOC          - %d\n",    CurTdSw->TdHw.IntOnCpl);

-    UhciDebugPrint (Level, " IsIsoCh      - %d\n",    CurTdSw->TdHw.IsIsoch);

-    UhciDebugPrint (Level, " LowSpeed     - %d\n",    CurTdSw->TdHw.LowSpeed);

-    UhciDebugPrint (Level, " ErrorCount   - %d\n",    CurTdSw->TdHw.ErrorCount);

-    UhciDebugPrint (Level, " ShortPacket  - %d\n",    CurTdSw->TdHw.ShortPacket);

-    UhciDebugPrint (Level, " PidCode      - 0x%x\n",  CurTdSw->TdHw.PidCode);

-    UhciDebugPrint (Level, " DevAddr      - %d\n",    CurTdSw->TdHw.DeviceAddr);

-    UhciDebugPrint (Level, " EndPoint     - %d\n",    CurTdSw->TdHw.EndPoint);

-    UhciDebugPrint (Level, " DataToggle   - %d\n",    CurTdSw->TdHw.DataToggle);

-    UhciDebugPrint (Level, " MaxPacketLen - %d\n",    CurTdSw->TdHw.MaxPacketLen);

-    UhciDebugPrint (Level, " DataBuffer   - 0x%x\n\n",CurTdSw->TdHw.DataBuffer);

+    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.DataLen  - %d\n",    CurTdSw->DataLen));

+    DEBUG ((EFI_D_INFO, "TdSw.Data     - 0x%x\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));

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

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

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

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

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

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

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

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

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

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

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

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

 

     CurTdSw = CurTdSw->NextTd;

   }

 }

 

-#endif