Re: [PATCH v3] efi: Add efitextmode command for getting/setting the text mode resolution

[Daniel Kiper]

On Tue, Aug 02, 2022 at 05:39:13PM +0200, Daniel Kiper wrote:
> On Fri, Jul 22, 2022 at 02:16:33AM -0500, Glenn Washburn wrote:
> > This command is meant to behave similarly to the 'mode' command of the EFI
> > Shell application. In addition to allowing mode selection by giving the
> > number of columns and rows as arguments, the command allows specifying the
> > mode number to select the mode. Also supported are the arguments "min" and
> > "max", which set the mode to the minimum and maximum mode respectively as
> > calculated by the columns * rows of that mode.
> >
> > Signed-off-by: Glenn Washburn <development@efficientek.com>
>
> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

I had to add the following fix on top of your patch.

diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index b1cd036f4..1ef404622 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -536,13 +536,13 @@ typedef char grub_efi_boolean_t;
 #if GRUB_CPU_SIZEOF_VOID_P == 8
 typedef grub_int64_t grub_efi_intn_t;
 typedef grub_uint64_t grub_efi_uintn_t;
-#define PRIxGRUB_EFI_UINTN_T "lx"
-#define PRIuGRUB_EFI_UINTN_T "lu"
+#define PRIxGRUB_EFI_UINTN_T   PRIxGRUB_UINT64_T
+#define PRIuGRUB_EFI_UINTN_T   PRIuGRUB_UINT64_T
 #else
 typedef grub_int32_t grub_efi_intn_t;
 typedef grub_uint32_t grub_efi_uintn_t;
-#define PRIxGRUB_EFI_UINTN_T "x"
-#define PRIuGRUB_EFI_UINTN_T "u"
+#define PRIxGRUB_EFI_UINTN_T   PRIxGRUB_UINT32_T
+#define PRIuGRUB_EFI_UINTN_T   PRIuGRUB_UINT32_T
 #endif
 typedef grub_int8_t grub_efi_int8_t;
 typedef grub_uint8_t grub_efi_uint8_t;
@@ -550,8 +550,8 @@ typedef grub_int16_t grub_efi_int16_t;
 typedef grub_uint16_t grub_efi_uint16_t;
 typedef grub_int32_t grub_efi_int32_t;
 typedef grub_uint32_t grub_efi_uint32_t;
-#define PRIxGRUB_EFI_UINT32_T "x"
-#define PRIuGRUB_EFI_UINT32_T "u"
+#define PRIxGRUB_EFI_UINT32_T  PRIxGRUB_UINT32_T
+#define PRIuGRUB_EFI_UINT32_T  PRIuGRUB_UINT32_T
 typedef grub_int64_t grub_efi_int64_t;
 typedef grub_uint64_t grub_efi_uint64_t;
 typedef grub_uint8_t grub_efi_char8_t;

Otherwise one of Windows builds has been broken.

Daniel