From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::344; helo=mail-wm1-x344.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8709E211B5A2A for ; Mon, 14 Jan 2019 09:02:11 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id p6so306274wmc.1 for ; Mon, 14 Jan 2019 09:02:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CAEbCSBYzLyiJ5uTwT94EvfFH9eK/WOOr2Yws8aC7jo=; b=c4G7UmTEbE9dxFT3a6+e2Pdw0UnKo/0jNV+uUVld3ZIq3wph/wGr0uUFbpbhqnCens vQEIPWriepW0lVjsr9qGxWXIeW1FcGUEJeUtRpe2zawQ3VntQv73Jln/P5VLPFW20xUN L2kmXRmZTFVIwiiWm8d3qHQ9Q2O7WEZogl3ng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CAEbCSBYzLyiJ5uTwT94EvfFH9eK/WOOr2Yws8aC7jo=; b=N9fs8W7bVdYpzV3MttGtl5/QG15NVmjv43jXmQiFxOvVuuuxyCmRZGhh1x2TUBLqFm VrdrN9fDl7K0Kvragw8hleYhoZPqGzgZ5FlkVPvltTrJSfoKTGw/wasZkPebnNH+GcQZ QvNIAHxxnK0Vz6Wx1Ffj0wnvWZLuWZc8WIpLqOVnIaUxvTWN4eKombAVKnU/Mua1TfZz 96QCrof4P7u5DyFDq9MftBkAmE4I6Rx1P0NUk3oqKN/oc6zBoub0TGpTuulNZa4YlVt5 8PapfcQpaarwQtULa0QbvYrbFOSVCGx1rCBFJLB2N09GyxF3EP0LjsI5osX0QFNQtu3Y /6AQ== X-Gm-Message-State: AJcUukf4ymSd6/wf6cMbDRqVgo7vaeJyCSnAlS4SzNBD/KIHbvlmgiXM fYc8Bp6NtCB0vBStz/K5jWG6fd5dX/GcDg== X-Google-Smtp-Source: ALg8bN4CbTImZzsATazN3XD3kAZjHpI4G1tbQEATf/hnuqB6EBbEYy2lrvhcZgHtTqsaEvuf+syxdQ== X-Received: by 2002:a1c:2856:: with SMTP id o83mr64169wmo.45.1547485329613; Mon, 14 Jan 2019 09:02:09 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:08 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:01:58 +0100 Message-Id: <20190114170205.9748-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [PATCH edk2-platforms 1/8] Silicon/SynQuacer/NetsecDxe: fix 32-bit build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2019 17:02:11 -0000 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 --- 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