From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 3910921A10968 for ; Wed, 13 Dec 2017 04:21:54 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id q9so1937237wre.7 for ; Wed, 13 Dec 2017 04:26:34 -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; bh=32u00bR1CQWC7imljcemtOplOP+fRIqR1KR/F5DMfxw=; b=Rs5zk08vtd+UOTQkSbgJlSUWI++it0gPojkJLqN2+xq0+9ueMCX2UQZzH0h/YsbhjI KRE+CgIpbB28QwqM/r8iU4AHAOgqxVPo+Kt9zWvk6f730gMng0ETQyo1kd0WXK5tKv5k qboKO2EVNYRCXUe7Q9HfiZn41tGBcSNqAy4lE= 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; bh=32u00bR1CQWC7imljcemtOplOP+fRIqR1KR/F5DMfxw=; b=YUKi0A3brEXGRv/TONKNRJA1Ivwc0uxl9Tw8u60ahGU5sAQdl7lukNZ5aBuj0rUeto IkmWpdfy9Bs1UDOQ3rE02riI70rkKBcQBRaknyVIfvopNhZLO0XCM2mp8lrUa62I+ojV ah2YYLPIvhXu8TIGIe24c4Gr8Clki/Tv3qEgIKvUu7rWVkeWia7Qr5LHxsgDAMP6oswt efcMJLB9w/rixY4DWD6aUAQjEzUyRpCknew1kIPqqFoP6zhLDWZm3NbifaS1Tu9t7Dad R2Of1jD1l73WXVWBmCKPHo2kZYHoSuBk89YDYcbEkpObw7IVrLO58pUSG+mbL4KTHJDh OV8g== X-Gm-Message-State: AKGB3mJ7yehubV8GoiNWrpYOTsf+hGfL6BQYS/ktz6d5gc1lwnLwBV+y 2vFnTC5Zbjf7leaAWEMpEVQcQYu3rDQ= X-Google-Smtp-Source: ACJfBovsRPXZ9LcBS1F3vBmL6dF1w9tWUBlpJgSOaAmw70wORoqdiVbEBJj4TlZk1pQuKPiMNn7JCg== X-Received: by 10.223.167.76 with SMTP id e12mr2383837wrd.204.1513167992712; Wed, 13 Dec 2017 04:26:32 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id b78sm1584050wmi.18.2017.12.13.04.26.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 04:26:31 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Cc: Michael D Kinney , Liming Gao , Ard Biesheuvel , Star Zeng , Eric Dong Date: Wed, 13 Dec 2017 12:26:27 +0000 Message-Id: <20171213122630.17023-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [PATCH 0/3] Use central definitions for EFI_VARIABLE_* X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Dec 2017 12:21:55 -0000 The set of variable attribute definitions in is used by C code, but VfrCompile has no way of dealing with structs or typedefs, and the VFRPP rules generate (and depend on) preprocessing with C rules. There may be neater ways of dealing with this, but a simple solution is to break the #defines into a separate header and include this both in UefiMultiPhase.h and directly in .vfr source. Leif Lindholm (3): MdePkg: break #defines out of Uefi/UefiMultiPhase.h MdeModulePkg: use central variable definitions in DriverSampleDxe EmbeddedPkg: use central variable definitions in .vfr files EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefHii.vfr | 9 +---- EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformHii.vfr | 9 +---- MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr | 9 +---- MdePkg/Include/Uefi/UefiMultiPhase.h | 23 +----------- MdePkg/Include/Uefi/UefiMultiPhaseDefinitions.h | 39 ++++++++++++++++++++ 5 files changed, 44 insertions(+), 45 deletions(-) create mode 100644 MdePkg/Include/Uefi/UefiMultiPhaseDefinitions.h Cc: Michael D Kinney Cc: Liming Gao Cc: Ard Biesheuvel Cc: Star Zeng Cc: Eric Dong -- 2.11.0