Retired macro value TIME_OUT in UefiUsbLib and introduce a new PCD entry PcdUsbTransf...

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

diff --git a/MdePkg/Include/Library/UefiUsbLib.h b/MdePkg/Include/Library/UefiUsbLib.h
index 9c63d945af891991ff5cd61e1ed0f3cadf54d817..0920187f42454981aec555c5ffab0ee454c0c878 100644 (file)
--- a/MdePkg/Include/Library/UefiUsbLib.h
+++ b/MdePkg/Include/Library/UefiUsbLib.h
@@ -20,11 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/UsbIo.h>\r
 #include <IndustryStandard/Usb.h>\r
 \r
-///\r
-/// define the timeout time as 3ms\r
-///\r
-#define TIMEOUT_VALUE 3 * 1000\r
-\r
 /**\r
   Get the descriptor of the specified USB HID interface.\r
 \r

diff --git a/MdePkg/Library/UefiUsbLib/Hid.c b/MdePkg/Library/UefiUsbLib/Hid.c
index 2e36d2bdff6ac0fbcf2b8925190695cf72f59f04..153c03b7b0c720229f78cd0df0b9697a950e3e07 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/Hid.c
+++ b/MdePkg/Library/UefiUsbLib/Hid.c
@@ -73,7 +73,7 @@ UsbGetHidDescriptor (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbDataIn,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     HidDescriptor,\r
                     sizeof (EFI_USB_HID_DESCRIPTOR),\r
                     &Status\r
@@ -133,7 +133,7 @@ UsbGetReportDescriptor (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbDataIn,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     DescriptorBuffer,\r
                     DescriptorLength,\r
                     &Status\r
@@ -188,7 +188,7 @@ UsbGetProtocolRequest (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbDataIn,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     Protocol,\r
                     sizeof (UINT8),\r
                     &Status\r
@@ -242,7 +242,7 @@ UsbSetProtocolRequest (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbNoData,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     NULL,\r
                     0,\r
                     &Status\r
@@ -295,7 +295,7 @@ UsbSetIdleRequest (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbNoData,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     NULL,\r
                     0,\r
                     &Status\r
@@ -350,7 +350,7 @@ UsbGetIdleRequest (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbDataIn,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     Duration,\r
                     1,\r
                     &Status\r
@@ -413,7 +413,7 @@ UsbSetReportRequest (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbDataOut,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     Report,\r
                     ReportLen,\r
                     &Status\r
@@ -478,7 +478,7 @@ UsbGetReportRequest (
                     UsbIo,\r
                     &Request,\r
                     EfiUsbDataIn,\r
-                    TIMEOUT_VALUE,\r
+                    PcdGet32 (PcdUsbTransferTimeoutValue),\r
                     Report,\r
                     ReportLen,\r
                     &Status\r

diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf b/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
index fdca45dd8c4028ff97ee0617fd1ed61305ec698a..105a54482ec2029cb26afc8893e83ffcfcf161c3 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
@@ -40,4 +40,7 @@
 [LibraryClasses]\r
   DebugLib\r
   BaseMemoryLib\r
+  PcdLib\r
 \r
+[Pcd]\r
+  gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue
\ No newline at end of file

diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
index b102d286406a988f07c731e24d2a29db25078bbf..62d75526ba002fc4dabdf7640999b850fb3929af 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
@@ -21,6 +21,7 @@
 #include <Library/UefiUsbLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
+#include <Library/PcdLib.h>\r
 \r
 #include <IndustryStandard/Usb.h>\r
 \r

diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
index e6ba6295ce076464137ae5282553cf5a74f4429f..af450510554d5677c7e7dc6ae3ac60606e7e559b 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
+++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
@@ -73,7 +73,7 @@ UsbGetDescriptor (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbDataIn,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   Descriptor,\r
                   DescriptorLength,\r
                   Status\r
@@ -133,7 +133,7 @@ UsbSetDescriptor (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbDataOut,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   Descriptor,\r
                   DescriptorLength,\r
                   Status\r
@@ -188,7 +188,7 @@ UsbGetInterface (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbDataIn,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   AlternateSetting,\r
                   2,\r
                   Status\r
@@ -241,7 +241,7 @@ UsbSetInterface (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbNoData,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   NULL,\r
                   0,\r
                   Status\r
@@ -293,7 +293,7 @@ UsbGetConfiguration (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbDataIn,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   ConfigurationValue,\r
                   2,\r
                   Status\r
@@ -343,7 +343,7 @@ UsbSetConfiguration (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbNoData,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   NULL,\r
                   0,\r
                   Status\r
@@ -420,7 +420,7 @@ UsbSetFeature (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbNoData,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   NULL,\r
                   0,\r
                   Status\r
@@ -498,7 +498,7 @@ UsbClearFeature (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbNoData,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   NULL,\r
                   0,\r
                   Status\r
@@ -577,7 +577,7 @@ UsbGetStatus (
                   UsbIo,\r
                   &DevReq,\r
                   EfiUsbDataIn,\r
-                  TIMEOUT_VALUE,\r
+                  PcdGet32 (PcdUsbTransferTimeoutValue),\r
                   DeviceStatus,\r
                   2,\r
                   Status\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 5a745c61d78c54aa8ef3aecc7116f9ee2e17814e..35535584a2fc9eca78d7b93d57c86bfd293865be 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -518,6 +518,9 @@
   ## Indicates the allowable maximum number in extract handler table\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10|UINT32|0x00000025\r
 \r
+  ## Indicates the default timeouts for USB transfers in milliseconds\r
+  gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue|3000|UINT32|0x00000026\r
+\r
   ## Default current ISO 639-2 language: English\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang|"eng"|VOID*|0x0000001d\r
 \r
@@ -611,6 +614,9 @@
 \r
   ## Indicates the allowable maximum number in extract handler table\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10|UINT32|0x00000025\r
+  \r
+  ## Indicates the default timeouts for USB transfers in milliseconds\r
+  gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue|3000|UINT32|0x00000026\r
 \r
 [PcdsDynamic.common]\r
   ## Default current ISO 639-2 language: English & French\r