summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2020-10-24 17:19:15 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-10-26 06:57:47 +0000
commitd9e543a5f9e0aa3c844e82fedf2499f30c0f9e69 (patch)
tree0b5bc150adc65c0469f4bd802511deed4f050fe3 /payloads/libpayload/drivers
parentf56d65266c618ebc4e9254752f20dd73eea199f1 (diff)
downloadcoreboot-d9e543a5f9e0aa3c844e82fedf2499f30c0f9e69.tar.xz
libpayload/keyboard: Use `bool` as return type
Use `bool` whenever `0` was used to indicate an error. The mixing of different types for return values was mildly confusing and potentially dangerous with the i8042 API close by that uses `0` for success. Change-Id: I876bb5076c4921f36e3438f359be8ac4c09248cc Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46723 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'payloads/libpayload/drivers')
-rw-r--r--payloads/libpayload/drivers/i8042/keyboard.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c
index eb94199ec0..2dec3a38f2 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -27,6 +27,8 @@
* SUCH DAMAGE.
*/
+#include <stdbool.h>
+
#include <keycodes.h>
#include <libpayload-config.h>
#include <libpayload.h>
@@ -169,14 +171,14 @@ static struct layout_maps keyboard_layouts[] = {
#endif
};
-static unsigned char keyboard_cmd(unsigned char cmd)
+static bool keyboard_cmd(unsigned char cmd)
{
i8042_write_data(cmd);
return i8042_wait_read_ps2() == 0xfa;
}
-int keyboard_havechar(void)
+bool keyboard_havechar(void)
{
return i8042_data_ready_ps2();
}
@@ -306,13 +308,13 @@ int keyboard_set_layout(char *country)
}
static struct console_input_driver cons = {
- .havekey = keyboard_havechar,
+ .havekey = (int (*)(void))keyboard_havechar,
.getchar = keyboard_getchar,
.input_type = CONSOLE_INPUT_TYPE_EC,
};
/* Enable keyboard translated */
-static int enable_translated(void)
+static bool enable_translated(void)
{
if (!i8042_cmd(I8042_CMD_RD_CMD_BYTE)) {
int cmd = i8042_read_data_ps2();
@@ -321,19 +323,19 @@ static int enable_translated(void)
i8042_write_data(cmd);
} else {
printf("ERROR: i8042_cmd WR_CMD failed!\n");
- return 0;
+ return false;
}
} else {
printf("ERROR: i8042_cmd RD_CMD failed!\n");
- return 0;
+ return false;
}
- return 1;
+ return true;
}
/* Set scancode set 1 */
-static int set_scancode_set(void)
+static bool set_scancode_set(void)
{
- unsigned int ret;
+ bool ret;
ret = keyboard_cmd(I8042_KBCMD_SET_SCANCODE);
if (!ret) {
printf("ERROR: Keyboard set scancode failed!\n");