{"id":813650,"url":"http://patchwork.ozlabs.org/api/patches/813650/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170913220546.19560-7-robdclark@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170913220546.19560-7-robdclark@gmail.com>","list_archive_url":null,"date":"2017-09-13T22:05:29","name":"[U-Boot,v3,06/21] efi_loader: drop redundant efi_device_path_protocol","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e8e17f73ecbb7a7e188773fd4a0ab8ae7626ee92","submitter":{"id":18760,"url":"http://patchwork.ozlabs.org/api/people/18760/?format=json","name":"Rob Clark","email":"robdclark@gmail.com"},"delegate":{"id":3400,"url":"http://patchwork.ozlabs.org/api/users/3400/?format=json","username":"agraf","first_name":"Alexander","last_name":"Graf","email":"agraf@suse.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170913220546.19560-7-robdclark@gmail.com/mbox/","series":[{"id":2990,"url":"http://patchwork.ozlabs.org/api/series/2990/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=2990","date":"2017-09-13T22:05:23","name":"efi_loader: enough UEFI for standard distro boot","version":3,"mbox":"http://patchwork.ozlabs.org/series/2990/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813650/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813650/checks/","tags":{},"related":[],"headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"giMsnDfx\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xswxt3KV5z9s76\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Sep 2017 08:17:05 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid AEB13C22545; Wed, 13 Sep 2017 22:11:11 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 11236C225AC;\n\tWed, 13 Sep 2017 22:08:32 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 984BFC225AD; Wed, 13 Sep 2017 22:06:13 +0000 (UTC)","from mail-qk0-f195.google.com (mail-qk0-f195.google.com\n\t[209.85.220.195])\n\tby lists.denx.de (Postfix) with ESMTPS id 04DFAC2258E\n\tfor <u-boot@lists.denx.de>; Wed, 13 Sep 2017 22:06:10 +0000 (UTC)","by mail-qk0-f195.google.com with SMTP id r66so942338qke.4\n\tfor <u-boot@lists.denx.de>; Wed, 13 Sep 2017 15:06:09 -0700 (PDT)","from localhost ([2601:184:4780:aac0:25f8:dd96:a084:785a])\n\tby smtp.gmail.com with ESMTPSA id\n\t36sm10602754qtz.89.2017.09.13.15.06.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 13 Sep 2017 15:06:07 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.0 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=2JftUygffnM3ZyCQ7153jJthYKh2+pbQzFD4QOPpFJA=;\n\tb=giMsnDfxWFJeeNnZaB8qV04Z9ul9hHMbcthj3JLgpeTv6poyD7NdhfpdZIXh1l03+b\n\twU5leocJtNL+ljMuB96Oec4GF3MdsAbE05TGhliUXZUYAUxdwWNqqGkhg9WKNP5AtVbE\n\t+780b+Bm/MAcE1V9hYwgYG37grvgXYxHl0UQ9KM8ccSEttBqDU5248xHNjowB/LIHXo/\n\tLsggWXiMQ+ltiUHfWh5YSjachsGQZrvuIcO/NEJf1Y9pCKpbCm3HI8Ffu73KS0U63B/Z\n\tKUCH3tAM2FCyB5sDbNvJ0lkeKe9KinWlh40Wcc3/RbJ3PW6tDL0ouade4dY44n86c/vJ\n\tVGAA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=2JftUygffnM3ZyCQ7153jJthYKh2+pbQzFD4QOPpFJA=;\n\tb=rpJCWehBPGybuKEmMOGO7gI5IHdQDOXUgPBDpM0qWTHeeJKNLzHsDVSQkJ5xFMZE3E\n\tQJcpGfsHgRKraj6wpLlNOJtQ8KCIfY4GC0t9b15WubK0zlaju6D5rqvKrMIQ6bHNCv3T\n\tBrJ1hVBHCj8esVu0NoqnngFwklUHg4qbnYIDeh5ysjwsbFGsptKEGEmObMekkZ3/S55N\n\tBoGyD3d2P/6CAsp10lCruvqLGu8S537nTwNklCyiIKDpjP4nCp+LOGnvJ8qUJ08D5B0L\n\tetXU9jdPsGINSXe7pymwmjjoxtNAs3wuqleO4rI1g/5znVyqc1Kv6fCkJ17t8somprS7\n\tM3rw==","X-Gm-Message-State":"AHPjjUiof1JCkJ+kIPyCF/F0ZZeLdXKFg3/v47N9SLxe05yui9Xc+loX\n\t68Nxo7Ka/yyPzyCREZo=","X-Google-Smtp-Source":"AOwi7QBfMW0I99KZ6dhLaFoMN0GQxMfYi6t2uHtNR/g6xqMttBpzlI2KnTe8cKN4ZL8tWM5Xy3pXFg==","X-Received":"by 10.55.7.1 with SMTP id 1mr26108615qkh.175.1505340368784;\n\tWed, 13 Sep 2017 15:06:08 -0700 (PDT)","From":"Rob Clark <robdclark@gmail.com>","To":"U-Boot Mailing List <u-boot@lists.denx.de>","Date":"Wed, 13 Sep 2017 18:05:29 -0400","Message-Id":"<20170913220546.19560-7-robdclark@gmail.com>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170913220546.19560-1-robdclark@gmail.com>","References":"<20170913220546.19560-1-robdclark@gmail.com>","Cc":"Heinrich Schuchardt <xypron.glpk@gmx.de>, Peter Jones <pjones@redhat.com>","Subject":"[U-Boot] [PATCH v3 06/21] efi_loader: drop redundant\n\tefi_device_path_protocol","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>"},"content":"This is really the same thing as the efi_device_path struct.\n\nSigned-off-by: Rob Clark <robdclark@gmail.com>\n---\n include/efi_api.h                        | 12 ++----------\n lib/efi_loader/efi_device_path_to_text.c | 13 ++++++++-----\n 2 files changed, 10 insertions(+), 15 deletions(-)","diff":"diff --git a/include/efi_api.h b/include/efi_api.h\nindex 4e27c82129..ac58fd58de 100644\n--- a/include/efi_api.h\n+++ b/include/efi_api.h\n@@ -487,22 +487,14 @@ struct efi_console_control_protocol\n \tEFI_GUID(0x8b843e20, 0x8132, 0x4852, \\\n \t\t 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c)\n \n-struct efi_device_path_protocol\n-{\n-\tuint8_t type;\n-\tuint8_t sub_type;\n-\tuint16_t length;\n-\tuint8_t data[];\n-};\n-\n struct efi_device_path_to_text_protocol\n {\n \tuint16_t *(EFIAPI *convert_device_node_to_text)(\n-\t\t\tstruct efi_device_path_protocol *device_node,\n+\t\t\tstruct efi_device_path *device_node,\n \t\t\tbool display_only,\n \t\t\tbool allow_shortcuts);\n \tuint16_t *(EFIAPI *convert_device_path_to_text)(\n-\t\t\tstruct efi_device_path_protocol *device_path,\n+\t\t\tstruct efi_device_path *device_path,\n \t\t\tbool display_only,\n \t\t\tbool allow_shortcuts);\n };\ndiff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c\nindex 4b2f43f0c8..f9d071ac50 100644\n--- a/lib/efi_loader/efi_device_path_to_text.c\n+++ b/lib/efi_loader/efi_device_path_to_text.c\n@@ -16,7 +16,7 @@ const efi_guid_t efi_guid_device_path_to_text_protocol =\n \t\tEFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID;\n \n static uint16_t *efi_convert_device_node_to_text(\n-\t\tstruct efi_device_path_protocol *device_node,\n+\t\tstruct efi_device_path *device_node,\n \t\tbool display_only,\n \t\tbool allow_shortcuts)\n {\n@@ -55,15 +55,18 @@ static uint16_t *efi_convert_device_node_to_text(\n \t\tbreak;\n \tcase DEVICE_PATH_TYPE_MEDIA_DEVICE:\n \t\tswitch (device_node->sub_type) {\n-\t\tcase DEVICE_PATH_SUB_TYPE_FILE_PATH:\n+\t\tcase DEVICE_PATH_SUB_TYPE_FILE_PATH: {\n+\t\t\tstruct efi_device_path_file_path *fp =\n+\t\t\t\t(struct efi_device_path_file_path *)device_node;\n \t\t\tbuffer_size = device_node->length - 4;\n \t\t\tr = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES,\n \t\t\t\t\t      buffer_size, (void **) &buffer);\n \t\t\tif (r != EFI_SUCCESS)\n \t\t\t\treturn NULL;\n-\t\t\tmemcpy(buffer, device_node->data, buffer_size);\n+\t\t\tmemcpy(buffer, fp->str, buffer_size);\n \t\t\tbreak;\n \t\t}\n+\t\t}\n \t\tbreak;\n \t}\n \n@@ -89,7 +92,7 @@ static uint16_t *efi_convert_device_node_to_text(\n }\n \n static uint16_t EFIAPI *efi_convert_device_node_to_text_ext(\n-\t\tstruct efi_device_path_protocol *device_node,\n+\t\tstruct efi_device_path *device_node,\n \t\tbool display_only,\n \t\tbool allow_shortcuts)\n {\n@@ -105,7 +108,7 @@ static uint16_t EFIAPI *efi_convert_device_node_to_text_ext(\n }\n \n static uint16_t EFIAPI *efi_convert_device_path_to_text(\n-\t\tstruct efi_device_path_protocol *device_path,\n+\t\tstruct efi_device_path *device_path,\n \t\tbool display_only,\n \t\tbool allow_shortcuts)\n {\n","prefixes":["U-Boot","v3","06/21"]}