From 67e6d3caceb16fa8891e0cb881da94507ffde199 Mon Sep 17 00:00:00 2001 From: Christoffer Sandberg Date: Thu, 16 Feb 2023 18:14:28 +0100 Subject: [PATCH] Move feats loaded check to inside get features method - Extend with checks on each IO for success --- src/tuxedo_io/tuxedo_io.c | 4 +--- src/uniwill_keyboard.h | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/tuxedo_io/tuxedo_io.c b/src/tuxedo_io/tuxedo_io.c index 4ed06d0..07e0f02 100644 --- a/src/tuxedo_io/tuxedo_io.c +++ b/src/tuxedo_io/tuxedo_io.c @@ -48,7 +48,6 @@ static u32 id_check_clevo; static u32 id_check_uniwill; static struct uniwill_device_features_t *uw_feats; -static bool uw_feats_loaded = false; /** * strstr version of dmi_match @@ -155,10 +154,9 @@ void uw_id_tdp(void) static u32 uniwill_identify(void) { u32 result = uniwill_get_active_interface_id(NULL) == 0 ? 1 : 0; - if (result && !uw_feats_loaded) { + if (result) { uw_feats = uniwill_get_device_features(); uw_id_tdp(); - uw_feats_loaded = true; } return result; } diff --git a/src/uniwill_keyboard.h b/src/uniwill_keyboard.h index d86e21c..b465ff4 100644 --- a/src/uniwill_keyboard.h +++ b/src/uniwill_keyboard.h @@ -69,6 +69,8 @@ struct kbd_led_state_uw_t { struct uniwill_device_features_t uniwill_device_features; +static bool uw_feats_loaded = false; + static u8 uniwill_kbd_bl_enable_state_on_start; static bool uniwill_kbd_bl_type_rgb_single_color = true; @@ -1086,10 +1088,18 @@ struct uniwill_device_features_t *uniwill_get_device_features(void) { struct uniwill_device_features_t *uw_feats = &uniwill_device_features; u32 status; + bool feats_loaded; + + if (uw_feats_loaded) + return uw_feats; + + feats_loaded = true; status = uniwill_read_ec_ram(0x0740, &uw_feats->model); - if (status != 0) + if (status != 0) { uw_feats->model = 0; + feats_loaded = false; + } uw_feats->uniwill_profile_v1_two_profs = false || dmi_match(DMI_BOARD_NAME, "PF5PU1G") @@ -1132,8 +1142,17 @@ struct uniwill_device_features_t *uniwill_get_device_features(void) uw_feats->uniwill_profile_v1_two_profs || uw_feats->uniwill_profile_v1_three_profs; - uw_has_charging_priority(&uw_feats->uniwill_has_charging_prio); - uw_has_charging_profile(&uw_feats->uniwill_has_charging_profile); + if (uw_has_charging_priority(&uw_feats->uniwill_has_charging_prio) != 0) + feats_loaded = false; + if (uw_has_charging_profile(&uw_feats->uniwill_has_charging_profile) != 0) + feats_loaded = false; + + if (feats_loaded) + pr_debug("feats loaded\n"); + else + pr_debug("feats not yet loaded\n"); + + uw_feats_loaded = feats_loaded; return uw_feats; }