From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 31 May 2007 09:24:58 +0000 (+0000)
Subject: Update the Guid Value of Ext SCSI Pass Thru Protocol
X-Git-Tag: edk2-stable201903~23293
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=c75bbd0e5b127eb2bda7ebbbe4a4019d2469a9f6

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 a59b61ec17..5d6e760d0f 100644
--- a/MdePkg/Include/Protocol/ScsiPassThruExt.h
+++ b/MdePkg/Include/Protocol/ScsiPassThruExt.h
@@ -1,7 +1,7 @@
 /** @file
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL as defined in UEFI 2.0.
 
-  Copyright (c) 2006, Intel Corporation                                                         
+  Copyright (c) 2006 - 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        
@@ -19,7 +19,7 @@
 
 #define EFI_EXT_SCSI_PASS_THRU_PROTOCOL_GUID \
   { \
-    0x1d3de7f0, 0x0807, 0x424f, {0xaa, 0x69, 0x11, 0xa5, 0x4e, 0x19, 0xa4, 0x6f } \
+    0x143b7632, 0xb81b, 0x4cb7, {0xab, 0xd3, 0xb6, 0x25, 0xa5, 0xb9, 0xbf, 0xfe } \
   }
 
 typedef struct _EFI_EXT_SCSI_PASS_THRU_PROTOCOL EFI_EXT_SCSI_PASS_THRU_PROTOCOL;
diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 5dc21f5479..b47cfe0b10 100644
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -52,7 +52,8 @@ SwitchStack (
 {
   VA_LIST    Marker;
 
-  ASSERT (EntryPoint != NULL && NewStack != NULL);
+  ASSERT (EntryPoint != NULL);
+  ASSERT (NewStack != NULL);
 
   VA_START (Marker, NewStack);
 
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 3f742c57be..03b0d7d892 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1974,7 +1974,7 @@
     </Entry>
     <Entry Name="ExtScsiPassThru">
       <C_Name>gEfiExtScsiPassThruProtocolGuid</C_Name>
-      <GuidValue>1D3DE7F0-0807-424F-AA69-11A54E19A46F</GuidValue>
+      <GuidValue>143B7632-B81B-4CB7-ABD3-B625A5B9BFFE</GuidValue>
       <HelpText/>
     </Entry>
     <Entry Name="TapeIo">