subject:"\[edk2\] \[PATCH\] MdeModulePkg\/NonDiscoverablePciDevice\: add missing cast and EFIAPI modifiers"

Re: [edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing cast and EFIAPI modifiers

2016-12-09 Thread Ard Biesheuvel

On 8 December 2016 at 09:25, Bi, Dandan <dandan...@intel.com> wrote:
> Reviewed-by: Dandan Bi <dandan...@intel.com>
>

Given that this patch fixes build issues reported by Ruiyi, I am going
to assume Dandan's Reviewed-by is sufficient, and merge this patch to
master

Thanks,
Ard.

> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Ard 
> Biesheuvel
> Sent: Thursday, December 8, 2016 4:17 PM
> To: edk2-devel@lists.01.org; Ni, Ruiyu <ruiyu...@intel.com>
> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
> Subject: [edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing 
> cast and EFIAPI modifiers
>
> Add missing EFIAPI modifiers to the functions that are exposed via the PCI 
> I/O protocol.
>
> At the same time, add a missing UINT8 cast which breaks the build on Visual 
> Studio.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> ---
> Apologies for the breakage.
>
>  
> MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c 
> | 21 +++-
>  1 file changed, 20 insertions(+), 1 deletion(-)
>
> diff --git 
> a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
>  
> b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> index 1e7244a129ae..56482e3353c0 100644
> --- 
> a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePc
> +++ iDeviceIo.c
> @@ -43,7 +43,7 @@ GetBarResource (
>  return EFI_NOT_FOUND;
>}
>
> -  BarIndex -= Dev->BarOffset;
> +  BarIndex -= (UINT8)Dev->BarOffset;
>
>for (Desc = Dev->Device->Resources;
> Desc->Desc != ACPI_END_TAG_DESCRIPTOR; @@ -61,6 +61,7 @@ 
> GetBarResource (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoPollMem (
>IN  EFI_PCI_IO_PROTOCOL *This,
>IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
> @@ -78,6 +79,7 @@ PciIoPollMem (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoPollIo (
>IN  EFI_PCI_IO_PROTOCOL *This,
>IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
> @@ -95,6 +97,7 @@ PciIoPollIo (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoMemRW (
>IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
>IN  UINTN   Count,
> @@ -145,6 +148,7 @@ PciIoMemRW (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoMemRead (
>IN EFI_PCI_IO_PROTOCOL  *This,
>IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
> @@ -211,6 +215,7 @@ PciIoMemRead (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoMemWrite (
>IN EFI_PCI_IO_PROTOCOL  *This,
>IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
> @@ -277,6 +282,7 @@ PciIoMemWrite (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoIoRead (
>IN EFI_PCI_IO_PROTOCOL  *This,
>IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
> @@ -292,6 +298,7 @@ PciIoIoRead (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoIoWrite (
>IN EFI_PCI_IO_PROTOCOL  *This,
>IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
> @@ -307,6 +314,7 @@ PciIoIoWrite (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoPciRead (
>IN EFI_PCI_IO_PROTOCOL*This,
>IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,
> @@ -342,6 +350,7 @@ PciIoPciRead (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoPciWrite (
>IN EFI_PCI_IO_PROTOCOL  *This,
>IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
> @@ -369,6 +378,7 @@ PciIoPciWrite (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  PciIoCopyMem (
>IN EFI_PCI_IO_PROTOCOL  *This,
>IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
> @@ -385,6 +395,7 @@ PciIoCopyMem (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  CoherentPciIoMap (
>IN EFI_PCI_IO_PROTOCOL*This,
>IN EFI_PCI_IO_PROTOCOL_OPERATION  Operation,
> @@ -450,6 +461,7 @@ CoherentPciIoMap (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  CoherentPciIoUnmap (
>IN  EFI_PCI_IO_PROTOCOL  *This,
>IN  VOID *Mapping
> @@ -472,6 +484,7 @@ CoherentPciIoUnmap (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  CoherentPciIoAllocateBuffer (
>IN  EFI_PCI_IO_PROTOCOL *This,
>IN  EFI_ALLOCATE_TYPE   Type,
> @@ -513,6 +526,7 @@ CoherentPciIoAllocateBuffer (
>
>  STATIC
>  EFI_STATUS
> +EFIAPI
>  CoherentPciIoFreeBuffer (
>IN  EFI_PCI_IO_PROTOCOL *This,
>IN  UINTN   Pages,
> @@ -526,6 +540,7 @@ C

Re: [edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing cast and EFIAPI modifiers

2016-12-08 Thread Bi, Dandan

Reviewed-by: Dandan Bi <dandan...@intel.com>

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Ard 
Biesheuvel
Sent: Thursday, December 8, 2016 4:17 PM
To: edk2-devel@lists.01.org; Ni, Ruiyu <ruiyu...@intel.com>
Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
Subject: [edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing cast 
and EFIAPI modifiers

Add missing EFIAPI modifiers to the functions that are exposed via the PCI I/O 
protocol.

At the same time, add a missing UINT8 cast which breaks the build on Visual 
Studio.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
Apologies for the breakage.

 MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c 
| 21 +++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git 
a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c 
b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
index 1e7244a129ae..56482e3353c0 100644
--- 
a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
+++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePc
+++ iDeviceIo.c
@@ -43,7 +43,7 @@ GetBarResource (
 return EFI_NOT_FOUND;
   }
 
-  BarIndex -= Dev->BarOffset;
+  BarIndex -= (UINT8)Dev->BarOffset;
 
   for (Desc = Dev->Device->Resources;
Desc->Desc != ACPI_END_TAG_DESCRIPTOR; @@ -61,6 +61,7 @@ GetBarResource 
(
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPollMem (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
@@ -78,6 +79,7 @@ PciIoPollMem (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPollIo (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
@@ -95,6 +97,7 @@ PciIoPollIo (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoMemRW (
   IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
   IN  UINTN   Count,
@@ -145,6 +148,7 @@ PciIoMemRW (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoMemRead (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -211,6 +215,7 @@ PciIoMemRead (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoMemWrite (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -277,6 +282,7 @@ PciIoMemWrite (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoIoRead (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -292,6 +298,7 @@ PciIoIoRead (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoIoWrite (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -307,6 +314,7 @@ PciIoIoWrite (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPciRead (
   IN EFI_PCI_IO_PROTOCOL*This,
   IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,
@@ -342,6 +350,7 @@ PciIoPciRead (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPciWrite (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -369,6 +378,7 @@ PciIoPciWrite (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoCopyMem (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -385,6 +395,7 @@ PciIoCopyMem (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoMap (
   IN EFI_PCI_IO_PROTOCOL*This,
   IN EFI_PCI_IO_PROTOCOL_OPERATION  Operation,
@@ -450,6 +461,7 @@ CoherentPciIoMap (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoUnmap (
   IN  EFI_PCI_IO_PROTOCOL  *This,
   IN  VOID *Mapping
@@ -472,6 +484,7 @@ CoherentPciIoUnmap (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoAllocateBuffer (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  EFI_ALLOCATE_TYPE   Type,
@@ -513,6 +526,7 @@ CoherentPciIoAllocateBuffer (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoFreeBuffer (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  UINTN   Pages,
@@ -526,6 +540,7 @@ CoherentPciIoFreeBuffer (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoFlush (
   IN EFI_PCI_IO_PROTOCOL  *This
   )
@@ -535,6 +550,7 @@ PciIoFlush (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoGetLocation (
   IN   EFI_PCI_IO_PROTOCOL  *This,
   OUT  UINTN*SegmentNumber,
@@ -560,6 +576,7 @@ PciIoGetLocation (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoAttributes (
   IN  EFI_PCI_IO_PROTOCOL  *This,
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation, @@ -616,6 +633,7 @@ 
PciIoAttributes (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoGetBarAttributes (
   IN EFI_PCI_IO_PROTOCOL *This,
   IN  UINT8  BarIndex,
@@ -666,6 +684,7 @@ PciIoGetBarAttributes (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoSetBarAttributes (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN UINT64   Attributes,
--
2.7.4

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://l

[edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing cast and EFIAPI modifiers

2016-12-08 Thread Ard Biesheuvel

Add missing EFIAPI modifiers to the functions that are exposed via the
PCI I/O protocol.

At the same time, add a missing UINT8 cast which breaks the build on
Visual Studio.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel 
---
Apologies for the breakage.

 MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c 
| 21 +++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git 
a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c 
b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
index 1e7244a129ae..56482e3353c0 100644
--- 
a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
+++ 
b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
@@ -43,7 +43,7 @@ GetBarResource (
 return EFI_NOT_FOUND;
   }
 
-  BarIndex -= Dev->BarOffset;
+  BarIndex -= (UINT8)Dev->BarOffset;
 
   for (Desc = Dev->Device->Resources;
Desc->Desc != ACPI_END_TAG_DESCRIPTOR;
@@ -61,6 +61,7 @@ GetBarResource (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPollMem (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
@@ -78,6 +79,7 @@ PciIoPollMem (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPollIo (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
@@ -95,6 +97,7 @@ PciIoPollIo (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoMemRW (
   IN  EFI_PCI_IO_PROTOCOL_WIDTH   Width,
   IN  UINTN   Count,
@@ -145,6 +148,7 @@ PciIoMemRW (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoMemRead (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -211,6 +215,7 @@ PciIoMemRead (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoMemWrite (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -277,6 +282,7 @@ PciIoMemWrite (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoIoRead (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -292,6 +298,7 @@ PciIoIoRead (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoIoWrite (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -307,6 +314,7 @@ PciIoIoWrite (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPciRead (
   IN EFI_PCI_IO_PROTOCOL*This,
   IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,
@@ -342,6 +350,7 @@ PciIoPciRead (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoPciWrite (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -369,6 +378,7 @@ PciIoPciWrite (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoCopyMem (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN EFI_PCI_IO_PROTOCOL_WIDTHWidth,
@@ -385,6 +395,7 @@ PciIoCopyMem (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoMap (
   IN EFI_PCI_IO_PROTOCOL*This,
   IN EFI_PCI_IO_PROTOCOL_OPERATION  Operation,
@@ -450,6 +461,7 @@ CoherentPciIoMap (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoUnmap (
   IN  EFI_PCI_IO_PROTOCOL  *This,
   IN  VOID *Mapping
@@ -472,6 +484,7 @@ CoherentPciIoUnmap (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoAllocateBuffer (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  EFI_ALLOCATE_TYPE   Type,
@@ -513,6 +526,7 @@ CoherentPciIoAllocateBuffer (
 
 STATIC
 EFI_STATUS
+EFIAPI
 CoherentPciIoFreeBuffer (
   IN  EFI_PCI_IO_PROTOCOL *This,
   IN  UINTN   Pages,
@@ -526,6 +540,7 @@ CoherentPciIoFreeBuffer (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoFlush (
   IN EFI_PCI_IO_PROTOCOL  *This
   )
@@ -535,6 +550,7 @@ PciIoFlush (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoGetLocation (
   IN   EFI_PCI_IO_PROTOCOL  *This,
   OUT  UINTN*SegmentNumber,
@@ -560,6 +576,7 @@ PciIoGetLocation (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoAttributes (
   IN  EFI_PCI_IO_PROTOCOL  *This,
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation,
@@ -616,6 +633,7 @@ PciIoAttributes (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoGetBarAttributes (
   IN EFI_PCI_IO_PROTOCOL *This,
   IN  UINT8  BarIndex,
@@ -666,6 +684,7 @@ PciIoGetBarAttributes (
 
 STATIC
 EFI_STATUS
+EFIAPI
 PciIoSetBarAttributes (
   IN EFI_PCI_IO_PROTOCOL  *This,
   IN UINT64   Attributes,
-- 
2.7.4

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing cast and EFIAPI modifiers

Re: [edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing cast and EFIAPI modifiers

[edk2] [PATCH] MdeModulePkg/NonDiscoverablePciDevice: add missing cast and EFIAPI modifiers

3 matches

Site Navigation

Mail list logo

Footer information