| Message ID | 1501579741-28866-1-git-send-email-jun.nie@linaro.org |
|---|---|
| State | Accepted |
| Commit | edc65fc4d83a7083ed139c00b8669c959a7fae8f |
| Headers | show |
| Series | [edk2,v4,1/4] ArmPkg: Move IS_DEVICE_PATH_NODE for sharing | expand |
On Tue, Aug 01, 2017 at 05:28:58PM +0800, Jun Nie wrote: > Move IS_DEVICE_PATH_NODE into header to share it. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jun Nie <jun.nie@linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> Pushed as edc65fc4d8. > --- > ArmPkg/Include/Library/BdsLib.h | 3 +++ > ArmPkg/Library/BdsLib/BdsFilePath.c | 3 --- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/ArmPkg/Include/Library/BdsLib.h b/ArmPkg/Include/Library/BdsLib.h > index c58f47e..4528c2e 100644 > --- a/ArmPkg/Include/Library/BdsLib.h > +++ b/ArmPkg/Include/Library/BdsLib.h > @@ -15,6 +15,9 @@ > #ifndef __BDS_ENTRY_H__ > #define __BDS_ENTRY_H__ > > +#define IS_DEVICE_PATH_NODE(node,type,subtype) \ > + (((node)->Type == (type)) && ((node)->SubType == (subtype))) > + > /** > This is defined by the UEFI specs, don't change it > **/ > diff --git a/ArmPkg/Library/BdsLib/BdsFilePath.c b/ArmPkg/Library/BdsLib/BdsFilePath.c > index f9d8c4c..41557bb 100644 > --- a/ArmPkg/Library/BdsLib/BdsFilePath.c > +++ b/ArmPkg/Library/BdsLib/BdsFilePath.c > @@ -24,9 +24,6 @@ > #include <Protocol/Dhcp4.h> > #include <Protocol/Mtftp4.h> > > - > -#define IS_DEVICE_PATH_NODE(node,type,subtype) (((node)->Type == (type)) && ((node)->SubType == (subtype))) > - > /* Type and defines to set up the DHCP4 options */ > > typedef struct { > -- > 1.9.1 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/ArmPkg/Include/Library/BdsLib.h b/ArmPkg/Include/Library/BdsLib.h index c58f47e..4528c2e 100644 --- a/ArmPkg/Include/Library/BdsLib.h +++ b/ArmPkg/Include/Library/BdsLib.h @@ -15,6 +15,9 @@ #ifndef __BDS_ENTRY_H__ #define __BDS_ENTRY_H__ +#define IS_DEVICE_PATH_NODE(node,type,subtype) \ + (((node)->Type == (type)) && ((node)->SubType == (subtype))) + /** This is defined by the UEFI specs, don't change it **/ diff --git a/ArmPkg/Library/BdsLib/BdsFilePath.c b/ArmPkg/Library/BdsLib/BdsFilePath.c index f9d8c4c..41557bb 100644 --- a/ArmPkg/Library/BdsLib/BdsFilePath.c +++ b/ArmPkg/Library/BdsLib/BdsFilePath.c @@ -24,9 +24,6 @@ #include <Protocol/Dhcp4.h> #include <Protocol/Mtftp4.h> - -#define IS_DEVICE_PATH_NODE(node,type,subtype) (((node)->Type == (type)) && ((node)->SubType == (subtype))) - /* Type and defines to set up the DHCP4 options */ typedef struct {
Move IS_DEVICE_PATH_NODE into header to share it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jun Nie <jun.nie@linaro.org> --- ArmPkg/Include/Library/BdsLib.h | 3 +++ ArmPkg/Library/BdsLib/BdsFilePath.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel