| Message ID | 20180618181603.26242-1-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 1f739a851ce8ea8c9c4d9c4c7a5862fd44ab6ab4 |
| Headers | show |
| Series | [edk2] ArmPkg/ArmMtlLib: fix prototype inconsistency in MtlWaitUntilChannelFree | expand |
On Mon, Jun 18, 2018 at 08:16:03PM +0200, Ard Biesheuvel wrote: > Align the prototype of ArmMtlLib's MtlWaitUntilChannelFree () with the > one in the ArmMtlNullLib implementation (rather than the other way around, > since edk2-platforms has a conflicting implementation as well) Eew. But yeah, this looks like the practical fix. > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > ArmPkg/Include/Library/ArmMtlLib.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ArmPkg/Include/Library/ArmMtlLib.h b/ArmPkg/Include/Library/ArmMtlLib.h > index 4218a741e5eb..48641258ba68 100644 > --- a/ArmPkg/Include/Library/ArmMtlLib.h > +++ b/ArmPkg/Include/Library/ArmMtlLib.h > @@ -68,7 +68,7 @@ typedef struct { > EFI_STATUS > MtlWaitUntilChannelFree ( > IN MTL_CHANNEL *Channel, > - IN UINT64 TimeOutInMicroSeconds > + IN UINTN TimeOutInMicroSeconds > ); > > /** Return the address of the message payload. > -- > 2.17.1 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On 18 June 2018 at 21:42, Leif Lindholm <leif.lindholm@linaro.org> wrote: > On Mon, Jun 18, 2018 at 08:16:03PM +0200, Ard Biesheuvel wrote: >> Align the prototype of ArmMtlLib's MtlWaitUntilChannelFree () with the >> one in the ArmMtlNullLib implementation (rather than the other way around, >> since edk2-platforms has a conflicting implementation as well) > > Eew. > But yeah, this looks like the practical fix. > >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > Thanks Pushed as 1f739a851ce8ea8c9c4d9c4c7a5862fd44ab6ab4 >> --- >> ArmPkg/Include/Library/ArmMtlLib.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/ArmPkg/Include/Library/ArmMtlLib.h b/ArmPkg/Include/Library/ArmMtlLib.h >> index 4218a741e5eb..48641258ba68 100644 >> --- a/ArmPkg/Include/Library/ArmMtlLib.h >> +++ b/ArmPkg/Include/Library/ArmMtlLib.h >> @@ -68,7 +68,7 @@ typedef struct { >> EFI_STATUS >> MtlWaitUntilChannelFree ( >> IN MTL_CHANNEL *Channel, >> - IN UINT64 TimeOutInMicroSeconds >> + IN UINTN TimeOutInMicroSeconds >> ); >> >> /** Return the address of the message payload. >> -- >> 2.17.1 >> _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/ArmPkg/Include/Library/ArmMtlLib.h b/ArmPkg/Include/Library/ArmMtlLib.h index 4218a741e5eb..48641258ba68 100644 --- a/ArmPkg/Include/Library/ArmMtlLib.h +++ b/ArmPkg/Include/Library/ArmMtlLib.h @@ -68,7 +68,7 @@ typedef struct { EFI_STATUS MtlWaitUntilChannelFree ( IN MTL_CHANNEL *Channel, - IN UINT64 TimeOutInMicroSeconds + IN UINTN TimeOutInMicroSeconds ); /** Return the address of the message payload.
Align the prototype of ArmMtlLib's MtlWaitUntilChannelFree () with the one in the ArmMtlNullLib implementation (rather than the other way around, since edk2-platforms has a conflicting implementation as well) Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmPkg/Include/Library/ArmMtlLib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel