1.Fix a typo in DevicePath Driver

2.Fix a bug in EBC, the periodic callback timer should be 1s
3.Add a dependency file for DriverSample in UI since it consume EFI_SIMPLE_TEXT_OUT protocol.
4.Fix a memory allocation defects in DriverSample.

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

5 files changed, 31 insertions, 3 deletions

diff --git a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathFromText.c b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathFromText.c
index d9dcd44352..aff628b54a 100644
--- a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathFromText.c
+++ b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathFromText.c
@@ -510,7 +510,7 @@ TrimHexStr (
     Str += 1;

   }

   //

-  // skip preceeding white space

+  // skip preceeding character 'x' or 'X'

   //

   if (*Str && (*Str == 'x' || *Str == 'X')) {

     Str += 1;

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.h b/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.h
index 11b72f64aa..5ccf8e11c7 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.h
+++ b/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.h
@@ -104,7 +104,8 @@ EbcDebugSignalException (
 // Define a constant of how often to call the debugger periodic callback

 // function.

 //

-#define EBC_VM_PERIODIC_CALLBACK_RATE 1000

+#define EFI_TIMER_UNIT_1MS            (1000 * 10)

+#define EBC_VM_PERIODIC_CALLBACK_RATE (1000 * EFI_TIMER_UNIT_1MS)

 

 EFI_STATUS

 EbcDebugSignalPeriodic (

diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
index c383d1660a..dd316114bf 100644
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
@@ -242,7 +242,7 @@ Returns:
     //

     // Allocate space for creation of Buffer

     //

-    QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck));

+    QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck) - (UINTN) (&NVStruc));

     Status = gBS->AllocatePool (

                     EfiBootServicesData,

                     0x1000,

diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.dxs b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.dxs
new file mode 100644
index 0000000000..ae2a1c0a25
--- /dev/null
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.dxs
@@ -0,0 +1,26 @@
+/*++

+

+Copyright (c) 2007, Intel Corporation                                                         

+All rights reserved. This program and the accompanying materials                          

+are licensed and made available under the terms and conditions of the BSD License         

+which accompanies this distribution.  The full text of the license may be found at        

+http://opensource.org/licenses/bsd-license.php                                            

+                                                                                          

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+Module Name:

+

+  DriverSample.dxs

+

+Abstract:

+

+  Dependency expression source file.

+  

+--*/

+

+#include <DxeDepex.h>

+

+DEPENDENCY_START

+  EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID

+DEPENDENCY_END

diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
index 3aba03f8e5..cf44d1a8ab 100644
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
@@ -67,6 +67,7 @@
     <Filename>DriverSample.c</Filename>

     <Filename>NVDataStruc.h</Filename>

     <Filename>DriverSample.h</Filename>

+    <Filename>DriverSample.dxs</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>