Update the Guid Value of Ext SCSI Pass Thru Protocol

Minor update the ASSERT() statement in Switch Stack.

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

diff --git a/MdePkg/Include/Protocol/ScsiPassThruExt.h b/MdePkg/Include/Protocol/ScsiPassThruExt.h
index a59b61ec179752fb2d643bd5e8c3c2e01c553b7c..5d6e760d0f816452685dca156a2e793ef46df099 100644 (file)
--- a/MdePkg/Include/Protocol/ScsiPassThruExt.h
+++ b/MdePkg/Include/Protocol/ScsiPassThruExt.h
@@ -1,7 +1,7 @@
 /** @file\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL as defined in UEFI 2.0.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -19,7 +19,7 @@
 \r
 #define EFI_EXT_SCSI_PASS_THRU_PROTOCOL_GUID \\r
   { \\r
-    0x1d3de7f0, 0x0807, 0x424f, {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f } \\r
+    0x143b7632, 0xb81b, 0x4cb7, {0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe } \\r
   }\r
 \r
 typedef struct _EFI_EXT_SCSI_PASS_THRU_PROTOCOL EFI_EXT_SCSI_PASS_THRU_PROTOCOL;\r

diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 5dc21f547930f7ec42e7494f8907629645b3cb46..b47cfe0b100a36202211f9bb10f406d86c30420d 100644 (file)
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -52,7 +52,8 @@ SwitchStack (
 {\r
   VA_LIST    Marker;\r
 \r
-  ASSERT (EntryPoint != NULL && NewStack != NULL);\r
+  ASSERT (EntryPoint != NULL);\r
+  ASSERT (NewStack != NULL);\r
 \r
   VA_START (Marker, NewStack);\r
 \r

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 3f742c57be781d9f64e96527995c1e25e23ef6a5..03b0d7d892d2eb4f3347f75b3c2e4dd804202732 100644 (file)
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1974,7 +1974,7 @@
     </Entry>\r
     <Entry Name="ExtScsiPassThru">\r
       <C_Name>gEfiExtScsiPassThruProtocolGuid</C_Name>\r
-      <GuidValue>1D3DE7F0-0807-424F-AA69-11A54E19A46F</GuidValue>\r
+      <GuidValue>143B7632-B81B-4CB7-ABD3-B625A5B9BFFE</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
     <Entry Name="TapeIo">\r