Sync the PO updating from PO branch version 3720 to this release branch

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/24Oct07_r4206@4480 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 13 insertions, 21 deletions

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 5c22a0b..475a65f 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -243,7 +243,7 @@
 

     <Command.MSFT, Command.INTEL>

         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i

-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i

+        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i

 

 [Build.Acpi-Table-Code-File]

     <InputFile>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index b099e0e..55be965 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -155,6 +155,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_*_TIANO_GUID                 = A31280AD-481E-41B6-95E8-127F4C984779

 

 *_VS2005PRO_*_ASL_PATH              = DEF(ASL_BIN)\iasl.exe

+*_VS2005PRO_*_ASL_FLAGS             = -oa

 *_VS2005PRO_*_MAKE_PATH             = DEF(VS2005PRO_BIN)\nmake.exe

 

 *_VS2005PRO_*_MAKE_FLAGS                 = /nologo

@@ -213,6 +214,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_*_TIANO_GUID           = A31280AD-481E-41B6-95E8-127F4C984779

 

 *_VS2005TEAMSUITE_*_ASL_PATH        = DEF(ASL_BIN)\iasl.exe

+*_VS2005TEAMSUITE_*_ASL_FLAGS       = -oa

 *_VS2005TEAMSUITE_*_MAKE_PATH       = DEF(VS2005TEAMSUITE_BIN)\nmake.exe

 

 

@@ -305,6 +307,7 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 # ASL definitions

 ##################

 *_WINDDK3790x1830_*_ASL_PATH        = DEF(ASL_BIN)\iasl.exe

+*_WINDDK3790x1830_*_ASL_FLAGS       = -oa

 

 ##################

 # IA32 definitions

@@ -434,6 +437,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 

 *_CYGWINGCC_*_*_DPATH               = DEF(CYGWIN_BIN)

 *_CYGWINGCC_*_ASL_PATH              = DEF(ASL_BIN)/iasl.exe

+*_CYGWINGCC_*_ASL_FLAGS             = -oa

 *_CYGWINGCC_*_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe

 

 *_CYGWINGCC_*_MAKE_FLAGS                 = /nologo

@@ -537,6 +541,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_*_*_FAMILY                    = INTEL

 

 *_ICC_*_ASL_PATH                    = DEF(ASL_BIN)\iasl.exe

+*_ICC_*_ASL_FLAGS                   = -oa

 *_ICC_*_MAKE_PATH                   = DEF(VSNET2003_BIN)\nmake.exe

 

 *_ICC_*_MAKE_FLAGS                       = /nologo

@@ -641,6 +646,7 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779

 

 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe

+*_MYTOOLS_*_ASL_FLAGS               = -oa

 

 *_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

 

@@ -720,10 +726,10 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
       *_MYTOOLS_IPF_MAKE_FLAGS           = /nologo

       *_MYTOOLS_IPF_APP_FLAGS            = /nologo /E /TC

       *_MYTOOLS_IPF_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

-  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx

-RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx

-  DEBUG_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx

-RELEASE_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx

+  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Od /QIPF_fr32 /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx

+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Od /QIPF_fr32 /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx

+  DEBUG_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Od /QIPF_fr32 /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx

+RELEASE_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Od /QIPF_fr32 /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx

   DEBUG_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4 -d debug

 RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4

   DEBUG_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 91fcbec..99c30f9 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -538,13 +538,6 @@ UsbScsiModeSense (
   EFI_STATUS                Status;

   USB_SCSI_MODE_SENSE6_CMD         ModeSenseCmd;

   USB_SCSI_MODE_SENSE6_PARA_HEADER ModeParaHeader;

-  EFI_BLOCK_IO_MEDIA               *Media;

-

-  CopyMem (

-    &Media,

-    &(UsbMass->BlockIoMedia),

-    sizeof (EFI_BLOCK_IO_MEDIA)

-    );

 

   ZeroMem (&ModeSenseCmd, sizeof (USB_SCSI_MODE_SENSE6_CMD));

   ZeroMem (&ModeParaHeader, sizeof (USB_SCSI_MODE_SENSE6_PARA_HEADER));

@@ -572,7 +565,7 @@ UsbScsiModeSense (
   // devices support this command, so have a try here.

   //

   if (!EFI_ERROR (Status)) {

-    Media->ReadOnly = (BOOLEAN) ((ModeParaHeader.DevicePara & 0x80) ? TRUE : FALSE);

+    UsbMass->BlockIoMedia.ReadOnly = (BOOLEAN) ((ModeParaHeader.DevicePara & 0x80) ? TRUE : FALSE);

   }

 

   return Status;

@@ -598,16 +591,9 @@ UsbBootGetParams (
   IN USB_MASS_DEVICE          *UsbMass

   )

 {

-  EFI_BLOCK_IO_MEDIA          *Media;

   EFI_STATUS                  Status;

   UINT8                       CmdSet;

 

-  CopyMem (

-    &Media,

-    &(UsbMass->BlockIoMedia),

-    sizeof (EFI_BLOCK_IO_MEDIA)

-    );

-

   CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;

 

   Status = UsbBootInquiry (UsbMass);

@@ -628,7 +614,7 @@ UsbBootGetParams (
     //

     // Default value 2048 Bytes, in case no media present at first time

     //

-    Media->BlockSize        = 0x0800;

+    UsbMass->BlockIoMedia.BlockSize        = 0x0800;

   }

 

   if ((UsbMass->Pdt != USB_PDT_CDROM) && (CmdSet == USB_MASS_STORE_SCSI)) {