Tweak the definition of pfdep_cpu_addr_t and add some intermediate
UINTN casts so that the NETSEC driver builds cleanly in 32-bit mode.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c             | 6 
+++---
 Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h | 2 
+-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c 
b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c
index fa8ae79da28e..1bf1b3cb8f05 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c
@@ -103,9 +103,9 @@ Probe (
   ogma_err = ogma_init (
                (VOID *)(UINTN)LanDriver->Dev->Resources[0].AddrRangeMin,
                Handle, &Param,
-               (VOID *)dmac_hm_cmd_base, dmac_hm_cmd_size,
-               (VOID *)dmac_mh_cmd_base, dmac_mh_cmd_size,
-               (VOID *)core_cmd_base, core_cmd_size,
+               (VOID *)(UINTN)dmac_hm_cmd_base, dmac_hm_cmd_size,
+               (VOID *)(UINTN)dmac_mh_cmd_base, dmac_mh_cmd_size,
+               (VOID *)(UINTN)core_cmd_base, core_cmd_size,
                &LanDriver->Handle);
   if (ogma_err != OGMA_ERR_OK) {
     DEBUG ((DEBUG_ERROR, "NETSEC: ogma_init() failed with error code %d\n",
diff --git 
a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h 
b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h
index d31a9c48bafc..95796b4cfe6a 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h
@@ -71,7 +71,7 @@ typedef struct {
 typedef VOID *pfdep_dev_handle_t;
 typedef PACKET_HANDLE *pfdep_pkt_handle_t;
 typedef EFI_PHYSICAL_ADDRESS pfdep_phys_addr_t;
-typedef UINT64 pfdep_cpu_addr_t;
+typedef UINTN pfdep_cpu_addr_t;
 
 typedef int pfdep_hard_lock_t;
 typedef int pfdep_soft_lock_t;
-- 
2.17.1

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

Reply via email to