From a694b670e1a14b3a4da306463d9760176a73bef3 Mon Sep 17 00:00:00 2001 From: xli24 Date: Thu, 4 Dec 2008 06:21:53 +0000 Subject: Add module Legacy8259Dxe to IntelFrameworkModulePkg.dsc, and make it clean for ICC build. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6833 6f19259b-4bc3-4df7-8a09-765794883524 --- .../IntelFrameworkModulePkg.dsc | 20 +++++++-------- .../Universal/Legacy8259Dxe/8259.c | 29 +++++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index e18e6da19c..58d2cc4d5d 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -183,10 +183,14 @@ IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf - IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf - + IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf + IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf + IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf + IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.inf + IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf @@ -195,20 +199,16 @@ IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf + IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf + + IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PcatSingleSegmentPciCfgPei.inf IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf - IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf - - IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf - IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf - IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.inf - IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf - IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf + IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf [Components.IA32] IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf diff --git a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c index 8a21cd6bf5..4ba196fe6a 100644 --- a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c +++ b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c @@ -1,7 +1,7 @@ /**@file This contains the installation function for the driver. -Copyright (c) 2005 - 2007, Intel Corporation +Copyright (c) 2005 - 2008, 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 @@ -89,16 +89,21 @@ Interrupt8259ReadMask ( **/ // TODO: EdgeLevel - add argument and description to function comment { + UINT16 MasterValue; + UINT16 SlaveValue; + if (Mask != NULL) { - *Mask = (UINT16) (IoRead8 (LEGACY_8259_MASK_REGISTER_MASTER) | (IoRead8 (LEGACY_8259_MASK_REGISTER_SLAVE) << 8)); + MasterValue = IoRead8 (LEGACY_8259_MASK_REGISTER_MASTER); + SlaveValue = IoRead8 (LEGACY_8259_MASK_REGISTER_SLAVE); + + *Mask = (UINT16) (MasterValue | (SlaveValue << 8)); } if (EdgeLevel != NULL) { - *EdgeLevel = (UINT16) - ( - IoRead8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_MASTER) | - (IoRead8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_SLAVE) << 8) - ); + MasterValue = IoRead8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_MASTER); + SlaveValue = IoRead8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_SLAVE); + + *EdgeLevel = (UINT16) (MasterValue | (SlaveValue << 8)); } } // @@ -432,11 +437,11 @@ Interrupt8259EnableIrq ( return EFI_INVALID_PARAMETER; } - mProtectedModeMask &= ~(1 << Irq); + mProtectedModeMask = (UINT16) (mProtectedModeMask & ~(1 << Irq)); if (LevelTriggered) { - mProtectedModeEdgeLevel |= (1 << Irq); + mProtectedModeEdgeLevel = (UINT16) (mProtectedModeEdgeLevel | (1 << Irq)); } else { - mProtectedModeEdgeLevel &= ~(1 << Irq); + mProtectedModeEdgeLevel = (UINT16) (mProtectedModeEdgeLevel & ~(1 << Irq)); } Interrupt8259WriteMask (mProtectedModeMask, mProtectedModeEdgeLevel); @@ -469,8 +474,8 @@ Interrupt8259DisableIrq ( return EFI_INVALID_PARAMETER; } - mProtectedModeMask |= (1 << Irq); - mProtectedModeEdgeLevel &= ~(1 << Irq); + mProtectedModeMask = (UINT16) (mProtectedModeMask | (1 << Irq)); + mProtectedModeEdgeLevel = (UINT16) (mProtectedModeEdgeLevel & ~(1 << Irq)); Interrupt8259WriteMask (mProtectedModeMask, mProtectedModeEdgeLevel); -- cgit v1.2.3