From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ml01.01.org (Postfix) with ESMTP id 9E9B01A1E4F for ; Tue, 9 Aug 2016 22:56:23 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 09 Aug 2016 22:56:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,498,1464678000"; d="scan'208";a="1022830054" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by fmsmga001.fm.intel.com with ESMTP; 09 Aug 2016 22:56:24 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Feng Tian , Amy Chan Date: Wed, 10 Aug 2016 13:56:10 +0800 Message-Id: <20160810055611.266232-11-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20160810055611.266232-1-ruiyu.ni@intel.com> References: <20160810055611.266232-1-ruiyu.ni@intel.com> Subject: [PATCH 10/11] PcAtChipsetPkg: Remove KbcResetDxe X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2016 05:56:23 -0000 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Feng Tian Cc: Amy Chan --- PcAtChipsetPkg/KbcResetDxe/KbcReset.uni | 27 ------- PcAtChipsetPkg/KbcResetDxe/KbcResetExtra.uni | 25 ------- PcAtChipsetPkg/KbcResetDxe/Reset.inf | 50 ------------- PcAtChipsetPkg/KbcResetDxe/ResetEntry.c | 106 --------------------------- PcAtChipsetPkg/PcAtChipsetPkg.dsc | 1 - 5 files changed, 209 deletions(-) delete mode 100644 PcAtChipsetPkg/KbcResetDxe/KbcReset.uni delete mode 100644 PcAtChipsetPkg/KbcResetDxe/KbcResetExtra.uni delete mode 100644 PcAtChipsetPkg/KbcResetDxe/Reset.inf delete mode 100644 PcAtChipsetPkg/KbcResetDxe/ResetEntry.c diff --git a/PcAtChipsetPkg/KbcResetDxe/KbcReset.uni b/PcAtChipsetPkg/KbcResetDxe/KbcReset.uni deleted file mode 100644 index 5535dac..0000000 --- a/PcAtChipsetPkg/KbcResetDxe/KbcReset.uni +++ /dev/null @@ -1,27 +0,0 @@ -// /** @file -// This driver implements Reset Architectural Protocol. -// -// It should depend on the ResetSystemLib instance that is implemented based on KBC. -// -// Copyright (c) 2006 - 2014, 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 -// http://opensource.org/licenses/bsd-license.php -// -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// -// Module Name: -// Reset.inf -// -// Abstract: -// -// **/ - - -#string STR_MODULE_ABSTRACT #language en-US "This driver implements Reset Architectural Protocol" - -#string STR_MODULE_DESCRIPTION #language en-US "It should depend on the ResetSystemLib instance that is implemented based on KBC." - diff --git a/PcAtChipsetPkg/KbcResetDxe/KbcResetExtra.uni b/PcAtChipsetPkg/KbcResetDxe/KbcResetExtra.uni deleted file mode 100644 index 2ad684e..0000000 --- a/PcAtChipsetPkg/KbcResetDxe/KbcResetExtra.uni +++ /dev/null @@ -1,25 +0,0 @@ -// /** @file -// KbcReset Localized Strings and Content -// -// Copyright (c) 2013 - 2014, 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 -// http://opensource.org/licenses/bsd-license.php -// -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// -// Module Name: -// Reset.inf -// -// Abstract: -// -// **/ - -#string STR_PROPERTIES_MODULE_NAME -#language en-US -"Keyboard Controller Reset DXE Driver" - - diff --git a/PcAtChipsetPkg/KbcResetDxe/Reset.inf b/PcAtChipsetPkg/KbcResetDxe/Reset.inf deleted file mode 100644 index b54b08c..0000000 --- a/PcAtChipsetPkg/KbcResetDxe/Reset.inf +++ /dev/null @@ -1,50 +0,0 @@ -## @file -# This driver implements Reset Architectural Protocol. -# -# It should depend on the ResetSystemLib instance that is implemented based on KBC. -# -# Copyright (c) 2006 - 2014, 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 -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# Module Name: -# Reset.inf -# -# Abstract: -# -## -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = KbcReset - MODULE_UNI_FILE = KbcReset.uni - FILE_GUID = 6F0198AA-1F1D-426D-AE3E-39AB633FCC28 - MODULE_TYPE = DXE_RUNTIME_DRIVER - VERSION_STRING = 1.0 - ENTRY_POINT = InitializeReset - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - -[LibraryClasses] - UefiDriverEntryPoint - DebugLib - UefiBootServicesTableLib - ResetSystemLib - -[Sources] - ResetEntry.c - -[Protocols] - gEfiResetArchProtocolGuid ## PRODUCES - -[Depex] - TRUE - -[UserExtensions.TianoCore."ExtraFiles"] - KbcResetExtra.uni diff --git a/PcAtChipsetPkg/KbcResetDxe/ResetEntry.c b/PcAtChipsetPkg/KbcResetDxe/ResetEntry.c deleted file mode 100644 index 03b4250..0000000 --- a/PcAtChipsetPkg/KbcResetDxe/ResetEntry.c +++ /dev/null @@ -1,106 +0,0 @@ -/** @file - Driver entry for KbcReset driver. - -Copyright (c) 2009 - 2010, 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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#include - -#include -#include -#include - -#include - -// -// The handle onto which the Reset Architectural Protocol is installed -// -EFI_HANDLE mResetHandle = NULL; - -/** - Reset the system. - - @param ResetType warm or cold - @param ResetStatus possible cause of reset - @param DataSize Size of ResetData in bytes - @param ResetData Optional Unicode string - -**/ -VOID -EFIAPI -KbcResetSystem ( - IN EFI_RESET_TYPE ResetType, - IN EFI_STATUS ResetStatus, - IN UINTN DataSize, - IN VOID *ResetData OPTIONAL - ) -{ - switch (ResetType) { - case EfiResetWarm: - ResetWarm (); - break; - case EfiResetCold: - ResetCold (); - break; - case EfiResetShutdown: - ResetShutdown (); - break; - default: - return; - } - - // - // Given we should have reset getting here would be bad - // - ASSERT (FALSE); -} - -/** - Initialize the state information for the Reset Architectural Protocol. - - @param ImageHandle Handle of the loaded driver - @param SystemTable Pointer to the System Table - - @retval EFI_SUCCESS Thread can be successfully created - @retval EFI_OUT_OF_RESOURCES Cannot allocate protocol data structure - @retval EFI_DEVICE_ERROR Cannot create the timer service - -**/ -EFI_STATUS -EFIAPI -InitializeReset ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - // - // Make sure the Reset Architectural Protocol is not already installed in the system - // - ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiResetArchProtocolGuid); - - // - // Hook the runtime service table - // - SystemTable->RuntimeServices->ResetSystem = KbcResetSystem; - - // - // Now install the Reset RT AP on a new handle - // - Status = gBS->InstallMultipleProtocolInterfaces ( - &mResetHandle, - &gEfiResetArchProtocolGuid, NULL, - NULL - ); - ASSERT_EFI_ERROR (Status); - - return Status; -} diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dsc b/PcAtChipsetPkg/PcAtChipsetPkg.dsc index 25bb894..b740f00 100644 --- a/PcAtChipsetPkg/PcAtChipsetPkg.dsc +++ b/PcAtChipsetPkg/PcAtChipsetPkg.dsc @@ -52,7 +52,6 @@ [Components] PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf - PcAtChipsetPkg/KbcResetDxe/Reset.inf PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.inf PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf -- 2.9.0.windows.1