From 1d956501fe94a3661e501c6fa1d699f442cf4c79 Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Fri, 8 May 2015 07:30:45 +0000 Subject: [PATCH 1/1] 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 Reviewed-by: Jie Lin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17368 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c | 4 +--- MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c | 4 +--- MdePkg/Include/Protocol/I2cHost.h | 10 +--------- MdePkg/Include/Protocol/I2cIo.h | 4 +--- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c index c1634c9716..cad5ad7d44 100644 --- 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 I2C device independent of the host controller and I2C design. - Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2015, 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 @@ -1108,8 +1108,6 @@ RegisterI2cDevice ( queued when Event is not NULL. @retval EFI_SUCCESS The transaction completed successfully when Event is NULL. - @retval EFI_ABORTED The request did not complete because the driver - binding Stop() routine was called. @retval EFI_BAD_BUFFER_SIZE The RequestPacket->LengthInBytes value is too large. @retval EFI_DEVICE_ERROR There was an I2C error (NACK) during the diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c index 319507cfa2..68dd931887 100644 --- 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. Copyright (c) 2014, Hewlett-Packard Development Company, L.P.
- Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2015, 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 @@ -896,8 +896,6 @@ I2cHostRequestEnable ( completion status @retval EFI_SUCCESS The operation completed successfully. - @retval EFI_ABORTED The request did not complete because the driver - was shutdown. @retval EFI_BAD_BUFFER_SIZE The WriteBytes or ReadBytes buffer size is too large. @retval EFI_DEVICE_ERROR There was an I2C error (NACK) during the operation. This could indicate the slave device is not present. diff --git a/MdePkg/Include/Protocol/I2cHost.h b/MdePkg/Include/Protocol/I2cHost.h index 12e77a4cce..df04aeb798 100644 --- 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 to all of the devices on the I2C bus. - Copyright (c) 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2015, 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 @@ -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 I2C transaction. - If the I2C host protocol has pending I2C transactions queued when - the driver binding Stop() routine is called then the I2C host - protocol completes all of the pending I2C transactions by returning - EFI_ABORTED status. This notifies the upper layers allowing them - to take corrective action or prepare to stop. - When Event is NULL, QueueRequest() operates synchronously and returns the I2C completion status as its return value. @@ -107,8 +101,6 @@ typedef struct _EFI_I2C_HOST_PROTOCOL EFI_I2C_HOST_PROTOCOL; queued when Event is not NULL. @retval EFI_SUCCESS The transaction completed successfully when Event is NULL. - @retval EFI_ABORTED The request did not complete because the - driver binding Stop() routine was called. @retval EFI_BAD_BUFFER_SIZE The RequestPacket->LengthInBytes value is too large. @retval EFI_DEVICE_ERROR There was an I2C error (NACK) during the diff --git a/MdePkg/Include/Protocol/I2cIo.h b/MdePkg/Include/Protocol/I2cIo.h index 228f7bf4a0..1e01d7ce87 100644 --- 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 I2C device independent of the host controller and I2C design. - Copyright (c) 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2015, 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 @@ -100,8 +100,6 @@ typedef struct _EFI_I2C_IO_PROTOCOL EFI_I2C_IO_PROTOCOL; queued when Event is not NULL. @retval EFI_SUCCESS The transaction completed successfully when Event is NULL. - @retval EFI_ABORTED The request did not complete because the driver - binding Stop() routine was called. @retval EFI_BAD_BUFFER_SIZE The RequestPacket->LengthInBytes value is too large. @retval EFI_DEVICE_ERROR There was an I2C error (NACK) during the -- 2.39.2