From patchwork Thu Jul 13 20:06:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 787969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x7n1s2zVdz9s7C for ; Fri, 14 Jul 2017 06:08:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 22E78C21EB9; Thu, 13 Jul 2017 20:07:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C83DAC21E44; Thu, 13 Jul 2017 20:06:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1A349C21BE6; Thu, 13 Jul 2017 20:06:53 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lists.denx.de (Postfix) with ESMTPS id 95937C21C2C for ; Thu, 13 Jul 2017 20:06:53 +0000 (UTC) Received: from localhost.localdomain ([88.152.145.149]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M5LJv-1droAd3LJ9-00zX7p; Thu, 13 Jul 2017 22:06:52 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Thu, 13 Jul 2017 22:06:18 +0200 Message-Id: <20170713200621.1453-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170713200621.1453-1-xypron.glpk@gmx.de> References: <20170713200621.1453-1-xypron.glpk@gmx.de> X-Provags-ID: V03:K0:eZj1P44+ZGy2Bh9asyh20gnwr/CcQv8aXlNGpvqecsIUwD9WGjP utfqkxm1UIbwlmYq+EPbjlyiagS0TDqc0dYxa3Rx1eymxQzVN1w1L98TgNAmDtUFZHYlHOa lcRBI8pqyz6v+wDEA83IUxpOHPwV7wCrO8Xgru0tPl6werU8uZsfRIpvTRA/dCBFRgBw0lE 0AbIZ/UK2EqbACiTNX01Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:42b2c2+o0/w=:SMzC7SUjdMNu+QnO+Kd+Yl 976VyAOes9pJEMkAY1nVsszT19RCg0x8R6Z7QiOGKiMnL5frvLv7JR3UTHHY7sX/3QYH7xSyw qk3DUc9DCAt1edHeLwXe3lu+C5FtaU3lh4EQmu1+DW8grOh96dsJkGTaOyrgPy8AXqK9HI1m3 vhsQbv8Qd8rj947D7xwShfzPnWkPp56QTntcpQFeKURy2P74ck1FZ+Nd2fonxr5xFBw6mEDNI 3LEn7XZZbEy7QEMBi0qtSWysjRyFrZ7B4CEu1Kkbb4CLJHXq0tFtF3mlnWY4YLoOtKuhSWLyu lf/PR3m2FplGhzkyTMntHTwyCXILawEr4xVmMWoHCd8wKLroq2kA5B3DU0FHM7Wk6GPNPnEmt LuNcwG0dNF9eLCCg/4oKacoIOi9wONiYH5GDe7MWbCkMIAqGXR8V/T+EwSoHDMI52S6aZtJ4Y j6d4h09qto/G7jbHy2S73/TNZJhPXuc/eOF2AlK/dFEnZyjIVuWR2eh9A5FSyXKfi0VBRgF6Z S8A7ccfSn25eE5XnaIwsCWRBy0ShSOauUe+mL8E/1HFfT7Foxk51YL50ejKIXG76xWQr0o3tM 47r5dUDorm9ayiEUnMxxmu71kmpLNsdm/ICyLTJnsCuakp8U2hiVhAXqt2q4zGcucQ0FzuBBy gNgVJ/fIuoHyLyrQ5dsgUWaVNWuQxhbVXFbAKDdjXDCsSkx1PMw2LY8m8k7p9jN0VGOtL4TY2 CH9ZLYQvm5g3SeWexFQ+GSkqLdTuYZyzFA8bSkvFKTeH+QbbCX+th4CyYgL8wqU+HRV7yKEdR qEzpcBEqzLPWfEDIlZpJyQ6SVhgjg== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/4] efi_loader: do not duplicate constants for device path X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We should not duplicate existing constants used by the device path protocol. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_device_path_to_text.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index a7a513047f..3a92247f30 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -9,9 +9,6 @@ #include #include -#define MEDIA_DEVICE_PATH 4 -#define FILE_PATH_MEDIA_DEVICE_PATH 4 - const efi_guid_t efi_guid_device_path_to_text_protocol = EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID; @@ -38,9 +35,9 @@ uint16_t *efi_convert_device_path_to_text( uint16_t *buffer = NULL; switch (device_path->type) { - case MEDIA_DEVICE_PATH: + case DEVICE_PATH_TYPE_MEDIA_DEVICE: switch (device_path->sub_type) { - case FILE_PATH_MEDIA_DEVICE_PATH: + case DEVICE_PATH_SUB_TYPE_FILE_PATH: buffer_size = device_path->length - 4; r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, buffer_size, (void **) &buffer);