From 3c050e0ee7243dbc414e3587a63b843da5fa8c27 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 18 Feb 2018 15:40:33 -0700 Subject: [PATCH] WIP: Simplify keyboard LED code --- ap_led.c | 57 ++++++++++++-------------------------------------------- kb.c | 13 ++++++------- kb_led.c | 52 +++++++++++++++------------------------------------ 3 files changed, 33 insertions(+), 89 deletions(-) diff --git a/ap_led.c b/ap_led.c index 848635a..769dd1c 100644 --- a/ap_led.c +++ b/ap_led.c @@ -1,9 +1,7 @@ /* - * led.c + * ap_led.c * * Copyright (C) 2017 Jeremy Soller - * Copyright (C) 2014-2016 Arnoud Willemsen - * Copyright (C) 2013-2015 TUXEDO Computers GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,26 +17,6 @@ * along with this program. If not, see . */ -static struct workqueue_struct *ap_led_workqueue; - -static struct _ap_led_work { - struct work_struct work; - int wk; -} ap_led_work; - -static void ap_led_update(struct work_struct *work) { - u8 byte; - struct _ap_led_work *w; - - w = container_of(work, struct _ap_led_work, work); - - ec_read(0xD9, &byte); - - ec_write(0xD9, w->wk ? byte & ~0x40 : byte | 0x40); - - /* wmbb 0x6C 1 (?) */ -} - static enum led_brightness ap_led_get(struct led_classdev *led_cdev) { u8 byte; @@ -47,16 +25,19 @@ static enum led_brightness ap_led_get(struct led_classdev *led_cdev) { return byte & 0x40 ? LED_OFF : LED_FULL; } -/* must not sleep */ -static void ap_led_set(struct led_classdev *led_cdev, enum led_brightness value) { - ap_led_work.wk = value; - queue_work(ap_led_workqueue, &ap_led_work.work); +static int ap_led_set(struct led_classdev *led_cdev, enum led_brightness value) { + u8 byte; + + ec_read(0xD9, &byte); + ec_write(0xD9, value ? byte & ~0x40 : byte | 0x40); + + return 0; } static struct led_classdev ap_led = { .name = "system76::airplane", .brightness_get = ap_led_get, - .brightness_set = ap_led_set, + .brightness_set_blocking = ap_led_set, .max_brightness = 1, .default_trigger = "rfkill-any" }; @@ -64,30 +45,16 @@ static struct led_classdev ap_led = { static int __init ap_led_init(struct device *dev) { int err; - ap_led_workqueue = create_singlethread_workqueue("ap_led_workqueue"); - if (unlikely(!ap_led_workqueue)) { - return -ENOMEM; - } - - INIT_WORK(&ap_led_work.work, ap_led_update); - err = led_classdev_register(dev, &ap_led); if (unlikely(err)) { - goto err_destroy_workqueue; + return err; } return 0; - -err_destroy_workqueue: - destroy_workqueue(ap_led_workqueue); - ap_led_workqueue = NULL; - - return err; } static void __exit ap_led_exit(void) { - if (!IS_ERR_OR_NULL(ap_led.dev)) + if (!IS_ERR_OR_NULL(ap_led.dev)) { led_classdev_unregister(&ap_led); - if (ap_led_workqueue) - destroy_workqueue(ap_led_workqueue); + } } diff --git a/kb.c b/kb.c index 41409cc..44eb925 100644 --- a/kb.c +++ b/kb.c @@ -19,8 +19,6 @@ * along with this program. If not, see . */ -#define SET_KB_LED 0x67 /* 103 */ - #define COLORS { \ C(white, 0xFFFFFF), \ C(blue, 0x0000FF), \ @@ -287,15 +285,16 @@ static void kb_full_color__set_color(unsigned left, unsigned center, static void kb_full_color__set_brightness(unsigned i) { + u8 lvl; u8 lvl_to_raw[] = { 63, 126, 189, 252 }; i = clamp_t(unsigned, i, 0, ARRAY_SIZE(lvl_to_raw) - 1); + + lvl = lvl_to_raw[i]; - led_classdev_notify_brightness_hw_changed(&kb_led, i + 1); - - if (!s76_wmbb(SET_KB_LED, - 0xF4000000 | lvl_to_raw[i], NULL)) - kb_backlight.brightness = i; + kb_led_set(&kb_led, lvl); + led_classdev_notify_brightness_hw_changed(&kb_led, lvl); + kb_backlight.brightness = i; } static void kb_full_color__set_mode(unsigned mode) diff --git a/kb_led.c b/kb_led.c index 2522c7d..c3c9a3c 100644 --- a/kb_led.c +++ b/kb_led.c @@ -1,5 +1,5 @@ /* - * led.c + * kb_led.c * * Copyright (C) 2017 Jeremy Soller * @@ -17,65 +17,43 @@ * along with this program. If not, see . */ -static struct workqueue_struct *kb_led_workqueue; +#define SET_KB_LED 0x67 -static struct _kb_led_work { - struct work_struct work; - int wk; -} kb_led_work; - -static void kb_led_update(struct work_struct *work) { - u8 byte; - struct _kb_led_work *w; - - w = container_of(work, struct _kb_led_work, work); -} +static enum led_brightness kb_led_brightness = LED_OFF; static enum led_brightness kb_led_get(struct led_classdev *led_cdev) { - return LED_OFF; + return kb_led_brightness; } -/* must not sleep */ -static void kb_led_set(struct led_classdev *led_cdev, enum led_brightness value) { - kb_led_work.wk = value; - queue_work(kb_led_workqueue, &kb_led_work.work); +static int kb_led_set(struct led_classdev *led_cdev, enum led_brightness value) { + if (!s76_wmbb(SET_KB_LED, 0xF4000000 | value, NULL)) { + kb_led_brightness = value; + } + + return 0; } static struct led_classdev kb_led = { .name = "system76::kbd_backlight", .flags = LED_BRIGHT_HW_CHANGED, .brightness_get = kb_led_get, - .brightness_set = kb_led_set, - .max_brightness = 4, + .brightness_set_blocking = kb_led_set, + .max_brightness = 255, }; static int __init kb_led_init(struct device *dev) { int err; - kb_led_workqueue = create_singlethread_workqueue("kb_led_workqueue"); - if (unlikely(!kb_led_workqueue)) { - return -ENOMEM; - } - - INIT_WORK(&kb_led_work.work, kb_led_update); - err = led_classdev_register(dev, &kb_led); if (unlikely(err)) { - goto err_destroy_workqueue; + return err; } return 0; - -err_destroy_workqueue: - destroy_workqueue(kb_led_workqueue); - kb_led_workqueue = NULL; - - return err; } static void __exit kb_led_exit(void) { - if (!IS_ERR_OR_NULL(kb_led.dev)) + if (!IS_ERR_OR_NULL(kb_led.dev)) { led_classdev_unregister(&kb_led); - if (kb_led_workqueue) - destroy_workqueue(kb_led_workqueue); + } }