mirrors/clevo-keyboard
mirrors/clevo-keyboard
1
0
Fork 0
mirror of https://github.com/wessel-novacustom/clevo-keyboard.git synced 2024-11-15 03:34:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

uniwill: Refactor and simplify external symbol handling

Browse source 
tuxedo-cc-mwi symbols now used in many places. Until further
aggregation some wrappers are needed for clarity.
This commit is contained in:
Christoffer Sandberg 2020-10-30 12:17:17 +01:00
parent ba104682f9
commit d035d7afb0
No known key found for this signature in database
GPG key ID: BF563F71B6C7A96D
2 changed files with 129 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
src/uniwill_keyboard.h
View file

@ -26,6 +26,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/string.h> #include <linux/string.h>
#include "uw_io.h"
#define UNIWILL_WMI_MGMT_GUID_BA "ABBC0F6D-8EA1-11D1-00A0-C90629100000" #define UNIWILL_WMI_MGMT_GUID_BA "ABBC0F6D-8EA1-11D1-00A0-C90629100000"
#define UNIWILL_WMI_MGMT_GUID_BB "ABBC0F6E-8EA1-11D1-00A0-C90629100000" #define UNIWILL_WMI_MGMT_GUID_BB "ABBC0F6E-8EA1-11D1-00A0-C90629100000"
@ -53,30 +54,6 @@
#define UNIWILL_BRIGHTNESS_DEFAULT UNIWILL_BRIGHTNESS_MAX * 0.30 #define UNIWILL_BRIGHTNESS_DEFAULT UNIWILL_BRIGHTNESS_MAX * 0.30
#define UNIWILL_COLOR_DEFAULT 0xffffff #define UNIWILL_COLOR_DEFAULT 0xffffff
union uw_ec_read_return {
u32 dword;
struct {
u8 data_low;
u8 data_high;
} bytes;
};
union uw_ec_write_return {
u32 dword;
struct {
u8 addr_low;
u8 addr_high;
u8 data_low;
u8 data_high;
} bytes;
};
typedef u32 (uw_ec_read_func)(u8, u8, union uw_ec_read_return *);
typedef u32 (uw_ec_write_func)(u8, u8, u8, u8, union uw_ec_write_return *);
extern uw_ec_read_func uw_ec_read_addr;
extern uw_ec_write_func uw_ec_write_addr;
struct tuxedo_keyboard_driver uniwill_keyboard_driver; struct tuxedo_keyboard_driver uniwill_keyboard_driver;
struct kbd_led_state_uw_t { struct kbd_led_state_uw_t {
@ -152,22 +129,11 @@ static struct notifier_block keyboard_notifier_block = {
static u8 uniwill_read_kbd_bl_enabled(void) static u8 uniwill_read_kbd_bl_enabled(void)
{ {
union uw_ec_read_return reg_read_return; union uw_ec_read_return reg_read_return;
uw_ec_read_func *__uw_ec_read_addr;
u8 enabled = 0xff; u8 enabled = 0xff;
__uw_ec_read_addr = symbol_get(uw_ec_read_addr); __uw_ec_read_addr(0x8c, 0x07, &reg_read_return);
enabled = (reg_read_return.bytes.data_low >> 1) & 0x01;
if (__uw_ec_read_addr) { enabled = !enabled;
__uw_ec_read_addr(0x8c, 0x07, &reg_read_return);
enabled = (reg_read_return.bytes.data_low >> 1) & 0x01;
enabled = !enabled;
} else {
TUXEDO_DEBUG("tuxedo-cc-wmi symbols not found\n");
}
if (__uw_ec_read_addr) symbol_put(uw_ec_read_addr);
return enabled; return enabled;
} }
@ -176,27 +142,13 @@ static void uniwill_write_kbd_bl_enable(u8 enable)
{ {
union uw_ec_read_return reg_read_return; union uw_ec_read_return reg_read_return;
union uw_ec_write_return reg_write_return; union uw_ec_write_return reg_write_return;
uw_ec_read_func *__uw_ec_read_addr;
uw_ec_write_func *__uw_ec_write_addr;
u8 write_value = 0; u8 write_value = 0;
enable = enable & 0x01; enable = enable & 0x01;
__uw_ec_read_addr = symbol_get(uw_ec_read_addr); __uw_ec_read_addr(0x8c, 0x07, &reg_read_return);
__uw_ec_write_addr = symbol_get(uw_ec_write_addr); write_value = reg_read_return.bytes.data_low & ~(1 << 1);
write_value |= (!enable << 1);
if (__uw_ec_read_addr && __uw_ec_write_addr) { __uw_ec_write_addr(0x8c, 0x07, write_value, 0x00, &reg_write_return);
__uw_ec_read_addr(0x8c, 0x07, &reg_read_return);
write_value = reg_read_return.bytes.data_low & ~(1 << 1);
write_value |= (!enable << 1);
__uw_ec_write_addr(0x8c, 0x07, write_value, 0x00, &reg_write_return);
} else {
TUXEDO_DEBUG("tuxedo-cc-wmi symbols not found\n");
}
if (__uw_ec_read_addr) symbol_put(uw_ec_read_addr);
if (__uw_ec_write_addr) symbol_put(uw_ec_write_addr);
} }
/*static u32 uniwill_read_kbd_bl_br_state(u8 *brightness_state) /*static u32 uniwill_read_kbd_bl_br_state(u8 *brightness_state)
@ -204,18 +156,9 @@ static void uniwill_write_kbd_bl_enable(u8 enable)
union uw_ec_read_return reg_read_return; union uw_ec_read_return reg_read_return;
u32 result; u32 result;
uw_ec_read_func *__uw_ec_read_addr; __uw_ec_read_addr(0x8c, 0x07, &reg_read_return);
*brightness_state = (reg_read_return.bytes.data_low & 0xf0) >> 4;
__uw_ec_read_addr = symbol_get(uw_ec_read_addr); result = 0;
if (__uw_ec_read_addr) {
__uw_ec_read_addr(0x8c, 0x07, &reg_read_return);
*brightness_state = (reg_read_return.bytes.data_low & 0xf0) >> 4;
result = 0;
} else {
TUXEDO_DEBUG("tuxedo-cc-wmi symbols not found\n");
result = -EIO;
}
return result; return result;
}*/ }*/
@ -225,24 +168,13 @@ static u32 uniwill_read_kbd_bl_rgb(u8 *red, u8 *green, u8 *blue)
union uw_ec_read_return reg_read_return; union uw_ec_read_return reg_read_return;
u32 result; u32 result;
uw_ec_read_func *__uw_ec_read_addr; __uw_ec_read_addr(0x03, 0x18, &reg_read_return);
*red = reg_read_return.bytes.data_low;
__uw_ec_read_addr = symbol_get(uw_ec_read_addr); __uw_ec_read_addr(0x05, 0x18, &reg_read_return);
*green = reg_read_return.bytes.data_low;
if (__uw_ec_read_addr) { __uw_ec_read_addr(0x08, 0x18, &reg_read_return);
__uw_ec_read_addr(0x03, 0x18, &reg_read_return); *blue = reg_read_return.bytes.data_low;
*red = reg_read_return.bytes.data_low; result = 0;
__uw_ec_read_addr(0x05, 0x18, &reg_read_return);
*green = reg_read_return.bytes.data_low;
__uw_ec_read_addr(0x08, 0x18, &reg_read_return);
*blue = reg_read_return.bytes.data_low;
result = 0;
} else {
TUXEDO_DEBUG("tuxedo-cc-wmi symbols not found\n");
result = -EIO;
}
if (__uw_ec_read_addr) symbol_put(uw_ec_read_addr);
return result; return result;
} }
@ -251,27 +183,14 @@ static void uniwill_write_kbd_bl_rgb(u8 red, u8 green, u8 blue)
{ {
union uw_ec_write_return reg_write_return; union uw_ec_write_return reg_write_return;
uw_ec_read_func *__uw_ec_read_addr; // Write the colors
uw_ec_write_func *__uw_ec_write_addr; if (red > 0xc8) red = 0xc8;
if (green > 0xc8) green = 0xc8;
__uw_ec_read_addr = symbol_get(uw_ec_read_addr); if (blue > 0xc8) blue = 0xc8;
__uw_ec_write_addr = symbol_get(uw_ec_write_addr); __uw_ec_write_addr(0x03, 0x18, red, 0x00, &reg_write_return);
__uw_ec_write_addr(0x05, 0x18, green, 0x00, &reg_write_return);
if (__uw_ec_read_addr && __uw_ec_write_addr) { __uw_ec_write_addr(0x08, 0x18, blue, 0x00, &reg_write_return);
// Write the colors TUXEDO_DEBUG("Wrote color [%0#4x, %0#4x, %0#4x]\n", red, green, blue);
if (red > 0xc8) red = 0xc8;
if (green > 0xc8) green = 0xc8;
if (blue > 0xc8) blue = 0xc8;
__uw_ec_write_addr(0x03, 0x18, red, 0x00, &reg_write_return);
__uw_ec_write_addr(0x05, 0x18, green, 0x00, &reg_write_return);
__uw_ec_write_addr(0x08, 0x18, blue, 0x00, &reg_write_return);
TUXEDO_DEBUG("Wrote color [%0#4x, %0#4x, %0#4x]\n", red, green, blue);
} else {
TUXEDO_DEBUG("tuxedo-cc-wmi symbols not found\n");
}
if (__uw_ec_read_addr) symbol_put(uw_ec_read_addr);
if (__uw_ec_write_addr) symbol_put(uw_ec_write_addr);
} }
static void uniwill_write_kbd_bl_state(void) { static void uniwill_write_kbd_bl_state(void) {
@ -298,22 +217,8 @@ static void uniwill_write_kbd_bl_state(void) {
static void uniwill_write_kbd_bl_reset(void) static void uniwill_write_kbd_bl_reset(void)
{ {
union uw_ec_write_return reg_write_return; union uw_ec_write_return reg_write_return;
union uw_ec_read_return reg_read_return;
uw_ec_read_func *__uw_ec_read_addr; __uw_ec_write_addr(0x8c, 0x07, 0x10, 0x00, &reg_write_return);
uw_ec_write_func *__uw_ec_write_addr;
__uw_ec_read_addr = symbol_get(uw_ec_read_addr);
__uw_ec_write_addr = symbol_get(uw_ec_write_addr);
if (__uw_ec_read_addr && __uw_ec_write_addr) {
__uw_ec_write_addr(0x8c, 0x07, 0x10, 0x00, &reg_write_return);
} else {
TUXEDO_DEBUG("tuxedo-cc-wmi symbols not found\n");
}
if (__uw_ec_read_addr) symbol_put(uw_ec_read_addr);
if (__uw_ec_write_addr) symbol_put(uw_ec_write_addr);
} }
static void uniwill_wmi_handle_event(u32 value, void *context, u32 guid_nr) static void uniwill_wmi_handle_event(u32 value, void *context, u32 guid_nr)

102
src/uw_io.h Normal file
View file

@ -0,0 +1,102 @@
/*
* uw_io.h
*
* Copyright (C) 2018-2020 TUXEDO Computers GmbH <tux@tuxedocomputers.com>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef UW_IO_H
#define UW_IO_H
#include <linux/kernel.h>
#include <linux/module.h>
union uw_ec_read_return {
u32 dword;
struct {
u8 data_low;
u8 data_high;
} bytes;
};
union uw_ec_write_return {
u32 dword;
struct {
u8 addr_low;
u8 addr_high;
u8 data_low;
u8 data_high;
} bytes;
};
typedef u32 (uw_ec_read_func)(u8, u8, union uw_ec_read_return *);
typedef u32 (uw_ec_write_func)(u8, u8, u8, u8, union uw_ec_write_return *);
extern uw_ec_read_func uw_ec_read_addr;
extern uw_ec_write_func uw_ec_write_addr;
/**
* uw ec read from tccwmi for now stuffed in this wrapper for simplification
*
* @returns The result of the tccwmi function, or -ENOENT
* if tccwmi symbol is not accessible
*/
static u32 __uw_ec_read_addr(u8 addr_low, u8 addr_high,
union uw_ec_read_return *output)
{
uw_ec_read_func *symbol_uw_ec_read_addr;
u32 result = 0;
symbol_uw_ec_read_addr = symbol_get(uw_ec_read_addr);
if (symbol_uw_ec_read_addr) {
result = symbol_uw_ec_read_addr(addr_low, addr_high, output);
} else {
pr_debug("tuxedo-cc-wmi symbols not found\n");
result = -ENOENT;
}
if (symbol_uw_ec_read_addr)
symbol_put(uw_ec_read_addr);
return result;
}
/**
* uw ec write from tccwmi for now stuffed in this wrapper for simplification
*
* @returns The result of the tccwmi function, or -ENOENT
* if tccwmi symbol is not accessible
*/
static u32 __uw_ec_write_addr(u8 addr_low, u8 addr_high, u8 data_low,
u8 data_high, union uw_ec_write_return *output)
{
uw_ec_write_func *symbol_uw_ec_write_addr;
u32 result = 0;
symbol_uw_ec_write_addr = symbol_get(uw_ec_write_addr);
if (symbol_uw_ec_write_addr) {
result = symbol_uw_ec_write_addr(addr_low, addr_high, data_low,
data_high, output);
} else {
pr_debug("tuxedo-cc-wmi symbols not found\n");
result = -ENOENT;
}
if (symbol_uw_ec_write_addr)
symbol_put(uw_ec_write_addr);
return result;
}
#endif