MdePkg, MdeModulePkg: Remove EFI_ABORTED from I2C protocols per PI spec 1.4.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jie Lin <jie.lin@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17368 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
index c1634c9716459b2ae302985c41d592575d9e85dc..cad5ad7d44a012c7dfbacb38fa7b222706628fe6 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
@@ -2,7 +2,7 @@
   This file implements I2C IO Protocol which enables the user to manipulate a single \r
   I2C device independent of the host controller and I2C design.\r
 \r
-  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
   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
@@ -1108,8 +1108,6 @@ RegisterI2cDevice (
                                 queued when Event is not NULL.\r
   @retval EFI_SUCCESS           The transaction completed successfully when\r
                                 Event is NULL.\r
-  @retval EFI_ABORTED           The request did not complete because the driver\r
-                                binding Stop() routine was called.\r
   @retval EFI_BAD_BUFFER_SIZE   The RequestPacket->LengthInBytes value is too\r
                                 large.\r
   @retval EFI_DEVICE_ERROR      There was an I2C error (NACK) during the\r

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
index 319507cfa2cefde9628c13b1640b488c847597a0..68dd93188751362787cdda7c4a08c206e553379b 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
@@ -3,7 +3,7 @@
   do I/O transactions to all of the devices on the I2C bus.\r
 \r
   Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
   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
@@ -896,8 +896,6 @@ I2cHostRequestEnable (
                               completion status\r
 \r
   @retval EFI_SUCCESS           The operation completed successfully.\r
-  @retval EFI_ABORTED           The request did not complete because the driver\r
-                                was shutdown.\r
   @retval EFI_BAD_BUFFER_SIZE   The WriteBytes or ReadBytes buffer size is too large.\r
   @retval EFI_DEVICE_ERROR      There was an I2C error (NACK) during the operation.\r
                                 This could indicate the slave device is not present.\r

diff --git a/MdePkg/Include/Protocol/I2cHost.h b/MdePkg/Include/Protocol/I2cHost.h
index 12e77a4cce03f7dfc6b423d4b70aebaee0445066..df04aeb7984cb91b96ad8f3c575783feccafa357 100644 (file)
--- a/MdePkg/Include/Protocol/I2cHost.h
+++ b/MdePkg/Include/Protocol/I2cHost.h
@@ -4,7 +4,7 @@
   This protocol provides callers with the ability to do I/O transactions \r
   to all of the devices on the I2C bus.\r
 \r
-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
   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
@@ -72,12 +72,6 @@ typedef struct _EFI_I2C_HOST_PROTOCOL EFI_I2C_HOST_PROTOCOL;
   the I2C host protocol calls the I2C master protocol to start the\r
   I2C transaction.\r
 \r
-  If the I2C host protocol has pending I2C transactions queued when\r
-  the driver binding Stop() routine is called then the I2C host\r
-  protocol completes all of the pending I2C transactions by returning\r
-  EFI_ABORTED status.  This notifies the upper layers allowing them\r
-  to take corrective action or prepare to stop.\r
-\r
   When Event is NULL, QueueRequest() operates synchronously and\r
   returns the I2C completion status as its return value.\r
 \r
@@ -107,8 +101,6 @@ typedef struct _EFI_I2C_HOST_PROTOCOL EFI_I2C_HOST_PROTOCOL;
                                 queued when Event is not NULL.\r
   @retval EFI_SUCCESS           The transaction completed successfully when\r
                                 Event is NULL.\r
-  @retval EFI_ABORTED           The request did not complete because the\r
-                                driver binding Stop() routine was called.\r
   @retval EFI_BAD_BUFFER_SIZE   The RequestPacket->LengthInBytes value is\r
                                 too large.\r
   @retval EFI_DEVICE_ERROR      There was an I2C error (NACK) during the\r

diff --git a/MdePkg/Include/Protocol/I2cIo.h b/MdePkg/Include/Protocol/I2cIo.h
index 228f7bf4a0b88d784f77c45d27fa90173c987645..1e01d7ce877ccc1479b69db009418ab60b6e754a 100644 (file)
--- a/MdePkg/Include/Protocol/I2cIo.h
+++ b/MdePkg/Include/Protocol/I2cIo.h
@@ -4,7 +4,7 @@
   The EFI I2C I/O protocol enables the user to manipulate a single \r
   I2C device independent of the host controller and I2C design.\r
 \r
-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
   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
@@ -100,8 +100,6 @@ typedef struct _EFI_I2C_IO_PROTOCOL  EFI_I2C_IO_PROTOCOL;
                                 queued when Event is not NULL.\r
   @retval EFI_SUCCESS           The transaction completed successfully when\r
                                 Event is NULL.\r
-  @retval EFI_ABORTED           The request did not complete because the driver\r
-                                binding Stop() routine was called.\r
   @retval EFI_BAD_BUFFER_SIZE   The RequestPacket->LengthInBytes value is too\r
                                 large.\r
   @retval EFI_DEVICE_ERROR      There was an I2C error (NACK) during the\r