1) Add type cast for better coding style.

2) replace StrCpy() usage in Variable driver with StrnCpy().

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15770 6f19259b-4bc3-4df7-8a09-765794883524

10 files changed, 23 insertions, 23 deletions

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 12a40d4..6ccf0a3 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -717,7 +717,7 @@ AtaAtapiPassThruStart (
                     &Supports

                     );

   if (!EFI_ERROR (Status)) {

-    Supports &= EFI_PCI_DEVICE_ENABLE;

+    Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

     Status = PciIo->Attributes (

                       PciIo,

                       EfiPciIoAttributeOperationEnable,

@@ -951,7 +951,7 @@ AtaAtapiPassThruStop (
                     &Supports

                     );

   if (!EFI_ERROR (Status)) {

-    Supports &= EFI_PCI_DEVICE_ENABLE;

+    Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

     PciIo->Attributes (

              PciIo,

              EfiPciIoAttributeOperationDisable,

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 603d367..3fcb0f9 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -11,7 +11,7 @@
   and companion host controller when UHCI or OHCI gets attached earlier than EHCI and a 

   USB 2.0 device inserts.

 

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 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

@@ -1754,7 +1754,7 @@ EhcDriverBindingStart (
                     &Supports

                     );

   if (!EFI_ERROR (Status)) {

-    Supports &= EFI_PCI_DEVICE_ENABLE;

+    Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

     Status = PciIo->Attributes (

                       PciIo,

                       EfiPciIoAttributeOperationEnable,

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index 8848d1a..ac09fc2 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
@@ -816,7 +816,7 @@ NvmeControllerInit (
                     );

 

   if (!EFI_ERROR (Status)) {

-    Supports &= EFI_PCI_DEVICE_ENABLE;

+    Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

     Status    = PciIo->Attributes (

                          PciIo,

                          EfiPciIoAttributeOperationEnable,

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
index 0ff39a5..5ace222 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
@@ -1,7 +1,7 @@
 /** @file

   Supporting functions implementaion for PCI devices management.

 

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 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

@@ -705,7 +705,7 @@ StartPciDevicesOnBridge (
                              0,

                              &Supports

                              );

-        Supports &= EFI_PCI_DEVICE_ENABLE;

+        Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

         PciIoDevice->PciIo.Attributes (

                              &(PciIoDevice->PciIo),

                              EfiPciIoAttributeOperationEnable,

@@ -757,7 +757,7 @@ StartPciDevicesOnBridge (
                              0,

                              &Supports

                              );

-        Supports &= EFI_PCI_DEVICE_ENABLE;

+        Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

         PciIoDevice->PciIo.Attributes (

                              &(PciIoDevice->PciIo),

                              EfiPciIoAttributeOperationEnable,

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 26c9a33..9e7ac74 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -947,12 +947,12 @@ PciSetDeviceAttribute (
 

   if (Option == EFI_SET_SUPPORTS) {

 

-    Attributes |= EFI_PCI_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE |

+    Attributes |= (UINT64) (EFI_PCI_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE |

                   EFI_PCI_IO_ATTRIBUTE_MEMORY_CACHED        |

                   EFI_PCI_IO_ATTRIBUTE_MEMORY_DISABLE       |

                   EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE      |

                   EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM         |

-                  EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE;

+                  EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE);

 

     if (IS_PCI_LPC (&PciIoDevice->Pci)) {

         Attributes |= EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO;

@@ -1120,7 +1120,7 @@ DetermineDeviceAttribute (
     //

     // Assume the PCI Root Bridge supports DAC

     //

-    PciIoDevice->Supports |= (EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE |

+    PciIoDevice->Supports |= (UINT64)(EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE |

                               EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM |

                               EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE);

 

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index 2893f44..15d6443 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
@@ -1448,7 +1448,7 @@ SupportPaletteSnoopAttributes (
     //

     if (Operation == EfiPciIoAttributeOperationEnable) {

       PCI_DISABLE_COMMAND_REGISTER (Temp, EFI_PCI_COMMAND_VGA_PALETTE_SNOOP);

-      Temp->Attributes &= (~EFI_PCI_COMMAND_VGA_PALETTE_SNOOP);

+      Temp->Attributes &= (~(UINT64)EFI_PCI_COMMAND_VGA_PALETTE_SNOOP);

     } else {

       return EFI_UNSUPPORTED;

     }

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 1c8ff0b..34471ab 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -2,7 +2,7 @@
 

   The UHCI driver model and HC protocol routines.

 

-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>

 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

@@ -1704,7 +1704,7 @@ UhciDriverBindingStart (
                     &Supports

                     );

   if (!EFI_ERROR (Status)) {

-    Supports &= EFI_PCI_DEVICE_ENABLE;

+    Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

     Status = PciIo->Attributes (

                       PciIo,

                       EfiPciIoAttributeOperationEnable,

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 736c57a..3224202 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -1969,7 +1969,7 @@ XhcDriverBindingStart (
                     &Supports

                     );

   if (!EFI_ERROR (Status)) {

-    Supports &= EFI_PCI_DEVICE_ENABLE;

+    Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;

     Status = PciIo->Attributes (

                       PciIo,

                       EfiPciIoAttributeOperationEnable,

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 370d9b8..e29e727 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -2658,8 +2658,8 @@ XhcInitializeEndpointContext (
                 ((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0,

                 sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER

                 );

-    PhyAddr &= ~(0x0F);

-    PhyAddr |= ((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

+    PhyAddr &= ~((EFI_PHYSICAL_ADDRESS)0x0F);

+    PhyAddr |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

     InputContext->EP[Dci-1].PtrLo = XHC_LOW_32BIT (PhyAddr);

     InputContext->EP[Dci-1].PtrHi = XHC_HIGH_32BIT (PhyAddr);

 

@@ -2811,8 +2811,8 @@ XhcInitializeEndpointContext64 (
                 ((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0,

                 sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER

                 );

-    PhyAddr &= ~(0x0F);

-    PhyAddr |= ((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

+    PhyAddr &= ~((EFI_PHYSICAL_ADDRESS)0x0F);

+    PhyAddr |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

     InputContext->EP[Dci-1].PtrLo = XHC_LOW_32BIT (PhyAddr);

     InputContext->EP[Dci-1].PtrHi = XHC_HIGH_32BIT (PhyAddr);

 

diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
index aedc2e8..dde31e0 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
@@ -1754,8 +1754,8 @@ XhcPeiSetConfigCmd (
                   ((TRANSFER_RING *) (UINTN) Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0,

                   sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER

                   );

-      PhyAddr &= ~(0x0F);

-      PhyAddr |= ((TRANSFER_RING *) (UINTN) Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

+      PhyAddr &= ~((EFI_PHYSICAL_ADDRESS)0x0F);

+      PhyAddr |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *) (UINTN) Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

       InputContext->EP[Dci-1].PtrLo = XHC_LOW_32BIT (PhyAddr);

       InputContext->EP[Dci-1].PtrHi = XHC_HIGH_32BIT (PhyAddr);

 

@@ -1948,8 +1948,8 @@ XhcPeiSetConfigCmd64 (
                   sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER

                   );

 

-      PhyAddr &= ~(0x0F);

-      PhyAddr |= ((TRANSFER_RING *) (UINTN) Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

+      PhyAddr &= ~((EFI_PHYSICAL_ADDRESS)0x0F);

+      PhyAddr |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *) (UINTN) Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;

 

       InputContext->EP[Dci-1].PtrLo = XHC_LOW_32BIT (PhyAddr);

       InputContext->EP[Dci-1].PtrHi = XHC_HIGH_32BIT (PhyAddr);