Add routines to allow seeing and changing the LED colors. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> --- drivers/staging/nuc-led/nuc-wmi.c | 244 ++++++++++++++++++++++++++++-- 1 file changed, 228 insertions(+), 16 deletions(-) diff --git a/drivers/staging/nuc-led/nuc-wmi.c b/drivers/staging/nuc-led/nuc-wmi.c index 711897ba4666..07cf18e6f4c4 100644 --- a/drivers/staging/nuc-led/nuc-wmi.c +++ b/drivers/staging/nuc-led/nuc-wmi.c @@ -58,8 +58,6 @@ enum led_new_get_subcmd { enum led_function { LED_FUNC_BRIGHTNESS, LED_FUNC_COLOR1, - LED_FUNC_COLOR_GREEN, - LED_FUNC_COLOR_BLUE, LED_FUNC_BLINK_BEHAVIOR, LED_FUNC_BLINK_FREQ, @@ -92,43 +90,31 @@ static const u8 led_func_rev_0_64[MAX_IND][MAX_LED_FUNC] = { [LED_FUNC_BLINK_BEHAVIOR] = 0x01, [LED_FUNC_BLINK_FREQ] = 0x02, [LED_FUNC_COLOR1] = 0x03, - [LED_FUNC_COLOR_GREEN] = 0x04, - [LED_FUNC_COLOR_BLUE] = 0x05 }, [LED_IND_HDD_ACTIVITY] = { [LED_FUNC_BRIGHTNESS] = 0x00, [LED_FUNC_COLOR1] = 0x01, - [LED_FUNC_COLOR_GREEN] = 0x02, - [LED_FUNC_COLOR_BLUE] = 0x03, [LED_FUNC_HDD_BEHAVIOR] = 0x04 }, [LED_IND_ETHERNET] = { [LED_FUNC_ETH_TYPE] = 0x00, [LED_FUNC_BRIGHTNESS] = 0x01, [LED_FUNC_COLOR1] = 0x02, - [LED_FUNC_COLOR_GREEN] = 0x03, - [LED_FUNC_COLOR_BLUE] = 0x04 }, [LED_IND_WIFI] = { [LED_FUNC_BRIGHTNESS] = 0x00, [LED_FUNC_COLOR1] = 0x01, - [LED_FUNC_COLOR_GREEN] = 0x02, - [LED_FUNC_COLOR_BLUE] = 0x03 }, [LED_IND_SOFTWARE] = { [LED_FUNC_BRIGHTNESS] = 0x00, [LED_FUNC_BLINK_BEHAVIOR] = 0x01, [LED_FUNC_BLINK_FREQ] = 0x02, [LED_FUNC_COLOR1] = 0x03, - [LED_FUNC_COLOR_GREEN] = 0x04, - [LED_FUNC_COLOR_BLUE] = 0x05 }, [LED_IND_POWER_LIMIT] = { [LED_FUNC_POWER_LIMIT_SCHEME] = 0x00, [LED_FUNC_BRIGHTNESS] = 0x01, [LED_FUNC_COLOR1] = 0x02, - [LED_FUNC_COLOR_GREEN] = 0x03, - [LED_FUNC_COLOR_BLUE] = 0x04 }, }; @@ -459,6 +445,8 @@ static ssize_t nuc_wmi_set_brightness_offset(struct device *dev, } \ static DEVICE_ATTR(_name, 0644, show_##_name, store_##_name) +/* Show/change the LED indicator */ + static const char * const led_indicators[] = { "Power State", "HDD Activity", @@ -531,7 +519,220 @@ static ssize_t store_indicator(struct device *dev, return -EINVAL; } -/* Get brightness */ +/* Show/change the LED color */ + +enum led_colors { + LED_COLOR_BLUE, + LED_COLOR_AMBER, + LED_COLOR_WHITE +}; + +struct led_color_name { + const char *name; + u8 r, g, b; +}; + +static const struct led_color_name led_colors[] = { + /* The first colors should match the dual-LED colorset */ + [LED_COLOR_BLUE] = { "blue", 0, 0, 0xff }, + [LED_COLOR_AMBER] = { "amber", 0xff, 0xbf, 0 }, + [LED_COLOR_WHITE] = { "white", 0xff, 0xff, 0xff }, + + /* Let's add a couple of common color names as well */ + { "red", 0xff, 0, 0 }, + { "green", 0, 0xff, 0 }, + { "yellow", 0xff, 0xff, 0 }, + { "cyan", 0, 0xff, 0xff }, + { "magenta", 0xff, 0, 0xff }, +}; + +static ssize_t show_color(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + u8 input[NUM_INPUT_ARGS]; + u8 output[NUM_OUTPUT_ARGS]; + int ret, ctrl; + int size = PAGE_SIZE; + char *p = buf; + int color, r, g, b; + + if (led->indicator == LED_IND_DISABLE) + return -ENODEV; + + ctrl = led_func_rev_0_64[led->indicator][LED_FUNC_COLOR1]; + + if (!nuc_wmi_test_control(dev, led, ctrl)) + return -ENODEV; + + input[0] = LED_NEW_GET_CONTROL_ITEM; + input[1] = led->id; + input[2] = led->indicator; + input[3] = ctrl; + + ret = nuc_nmi_cmd(dev, LED_NEW_GET_STATUS, input, output); + if (ret) + return ret; + + if (led->color_type & LED_RGB) { + r = output[0]; + + input[3]++; + ret = nuc_nmi_cmd(dev, LED_NEW_GET_STATUS, input, output); + if (ret) + return ret; + + g = output[0]; + + input[3]++; + ret = nuc_nmi_cmd(dev, LED_NEW_GET_STATUS, input, output); + if (ret) + return ret; + + b = output[0]; + + for (color = 0; color < ARRAY_SIZE(led_colors); color++) + if (led_colors[color].r == r && + led_colors[color].g == g && + led_colors[color].b == b) + return scnprintf(p, size, "%s\n", + led_colors[color].name); + + return scnprintf(p, size, "%d,%d,%d\n", r, g, b); + } + + if (!output[0]) + return scnprintf(p, size, "%s\n", + led_colors[LED_COLOR_BLUE].name); + + if (led->color_type & LED_BLUE_AMBER) + return scnprintf(p, size, "%s\n", + led_colors[LED_COLOR_AMBER].name); + + return scnprintf(p, size, "%s\n", led_colors[LED_COLOR_WHITE].name); +} + +static ssize_t store_color(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + u8 input[NUM_INPUT_ARGS] = { 0 }; + int ret, ctrl, color; + const char *tmp; + u8 r, g, b, val; + + if (led->indicator == LED_IND_DISABLE) + return -ENODEV; + + tmp = strsep((char **)&buf, ",\n"); + + for (color = 0; color < ARRAY_SIZE(led_colors); color++) + if (!strcasecmp(tmp, led_colors[color].name)) + break; + + if (color < ARRAY_SIZE(led_colors)) { + r = led_colors[color].r; + g = led_colors[color].g; + b = led_colors[color].b; + } else { + if (kstrtou8(tmp, 0, &r) || r > 255) + return -EINVAL; + + tmp = strsep((char **)&buf, ",\n"); + if (kstrtou8(tmp, 0, &g) || g > 255) + return -EINVAL; + + tmp = strsep((char **)&buf, " \n"); + if (kstrtou8(tmp, 0, &b) || b > 255) + return -EINVAL; + + if (led->color_type & LED_SINGLE_COLOR) { + for (color = 0; color <= LED_COLOR_WHITE; color++) + if (led_colors[color].r == r && + led_colors[color].g == g && + led_colors[color].b == b) + break; + } + } + + ctrl = led_func_rev_0_64[led->indicator][LED_FUNC_COLOR1]; + + /* Dual color LEDs */ + if (!(led->color_type & LED_RGB)) { + if (color == LED_COLOR_BLUE) + val = 0; + else { + if (led->color_type & LED_BLUE_AMBER && + color != LED_COLOR_AMBER) + return -EINVAL; + else if (color != LED_COLOR_WHITE) + return -EINVAL; + val =1; + } + + input[0] = led->id; + input[1] = led->indicator; + input[2] = ctrl; + input[3] = val; + + ret = nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + return len; + } + + /* RGB LEDs */ + input[0] = led->id; + input[1] = led->indicator; + input[2] = ctrl; + input[3] = r; + + ret = nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + input[0] = led->id; + input[1] = led->indicator; + input[2]++; + input[3] = g; + + ret = nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + input[0] = led->id; + input[1] = led->indicator; + input[2]++; + input[3] = b; + + ret = nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + return len; + + return -EINVAL; +} + +static umode_t nuc_wmi_led_color_is_visible(struct kobject *kobj, + struct attribute *attr, int idx) +{ + struct device *dev = kobj_to_dev(kobj); + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + umode_t mode = attr->mode; + + if (led->color_type & LED_SINGLE_COLOR) + return 0; + + return mode; +} + +/* Show/store brightness */ static ssize_t show_brightness_offset(struct device *dev, struct device_attribute *attr, u8 offset, @@ -551,7 +752,6 @@ static ssize_t show_brightness_offset(struct device *dev, return scnprintf(buf, PAGE_SIZE, "%d\n", ret); } -/* Change brightness */ static ssize_t store_brightness_offset(struct device *dev, struct device_attribute *attr, u8 offset, @@ -597,6 +797,7 @@ static int nuc_wmi_set_brightness(struct led_classdev *cdev, } static LED_ATTR_RW(indicator); +static LED_ATTR_RW(color); LED_ATTR_POWER_STATE_RW(s0_brightness, 0x00); LED_ATTR_POWER_STATE_RW(s3_brightness, 0x06); @@ -620,8 +821,19 @@ static const struct attribute_group nuc_wmi_led_attribute_group = { .attrs = nuc_wmi_led_attr, }; +static struct attribute *nuc_wmi_led_color_attr[] = { + &dev_attr_color.attr, + NULL, +}; + +static const struct attribute_group nuc_wmi_led_color_attribute_group = { + .is_visible = nuc_wmi_led_color_is_visible, + .attrs = nuc_wmi_led_color_attr, +}; + static const struct attribute_group *nuc_wmi_led_attribute_groups[] = { &nuc_wmi_led_attribute_group, + &nuc_wmi_led_color_attribute_group, NULL }; -- 2.31.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel