From 5a330f9b36f77ad0c12b6c479eed77b533a03a4f Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Mon, 20 Jan 2020 13:58:44 -0600 Subject: [PATCH] drivers: kscan: Extend callback arguments to 32-bits Extends the keyboard scan callback row and column arguments from 8-bits to 32-bits to support a touch panel driver implementation. Signed-off-by: Maureen Helm --- include/drivers/kscan.h | 2 +- samples/drivers/kscan/src/main.c | 2 +- tests/drivers/kscan/kscan_api/src/test_kscan.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/drivers/kscan.h b/include/drivers/kscan.h index dc959179207..6caa5bfdd61 100644 --- a/include/drivers/kscan.h +++ b/include/drivers/kscan.h @@ -41,7 +41,7 @@ extern "C" { * @param row Describes row change. * @param pressed Describes the kind of key event. */ -typedef void (*kscan_callback_t)(struct device *dev, u8_t row, u8_t column, +typedef void (*kscan_callback_t)(struct device *dev, u32_t row, u32_t column, bool pressed); /** diff --git a/samples/drivers/kscan/src/main.c b/samples/drivers/kscan/src/main.c index 81851c5eed5..152c3ad9400 100644 --- a/samples/drivers/kscan/src/main.c +++ b/samples/drivers/kscan/src/main.c @@ -120,7 +120,7 @@ static void typematic_callback(struct k_timer *timer) LOG_INF("Typematic : %u\n", last_key); } -static void kb_callback(struct device *dev, u8_t row, u8_t col, bool pressed) +static void kb_callback(struct device *dev, u32_t row, u32_t col, bool pressed) { ARG_UNUSED(dev); last_key = keymap[col][row]; diff --git a/tests/drivers/kscan/kscan_api/src/test_kscan.c b/tests/drivers/kscan/kscan_api/src/test_kscan.c index f8e1d6c1136..8fec24a56b4 100644 --- a/tests/drivers/kscan/kscan_api/src/test_kscan.c +++ b/tests/drivers/kscan/kscan_api/src/test_kscan.c @@ -14,7 +14,7 @@ #define KSCAN_DEV_NAME DT_KSCAN_0_NAME #endif -static void kb_callback(struct device *dev, u8_t row, u8_t col, bool pressed) +static void kb_callback(struct device *dev, u32_t row, u32_t col, bool pressed) { ARG_UNUSED(dev); ARG_UNUSED(row);