From 6a4242c29ae8578ab60dcd111377efdfa24b1b9f Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 15 Jun 2018 19:07:06 +0000 Subject: [PATCH] Migrate has_keyboard to bool. --- stand/efi/loader/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index d0c830a5cb48..0cbfe3ef0496 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -92,14 +92,14 @@ efi_zfs_is_preferred(EFI_HANDLE *h) } #endif -static int +static bool has_keyboard(void) { EFI_STATUS status; EFI_DEVICE_PATH *path; EFI_HANDLE *hin, *hin_end, *walker; UINTN sz; - int retval = 0; + bool retval = false; /* * Find all the handles that support the SIMPLE_TEXT_INPUT_PROTOCOL and @@ -146,7 +146,7 @@ has_keyboard(void) acpi = (ACPI_HID_DEVICE_PATH *)(void *)path; if ((EISA_ID_TO_NUM(acpi->HID) & 0xff00) == 0x300 && (acpi->HID & 0xffff) == PNP_EISA_ID_CONST) { - retval = 1; + retval = true; goto out; } /* @@ -162,7 +162,7 @@ has_keyboard(void) if (usb->DeviceClass == 3 && /* HID */ usb->DeviceSubClass == 1 && /* Boot devices */ usb->DeviceProtocol == 1) { /* Boot keyboards */ - retval = 1; + retval = true; goto out; } } @@ -416,7 +416,7 @@ main(int argc, CHAR16 *argv[]) int i, j, howto; bool vargood; UINTN k; - int has_kbd; + bool has_kbd; char *s; EFI_DEVICE_PATH *imgpath; CHAR16 *text;