From 9e288a31149b748d78066eb30549957d33dd7eee Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Thu, 1 Dec 2016 11:47:59 -0600 Subject: [PATCH] liblights: Remove device level HAL * This is in hardware/samsung now Change-Id: I07d5bfef3a5af6cfc791e7b2f9b0adc9bc479be2 Signed-off-by: Paul Keith --- BoardConfigCommon.mk | 3 - include/samsung_lights.h | 31 ++++ klte.mk | 2 +- liblights/Android.mk | 31 ---- liblights/NOTICE | 190 -------------------- liblights/lights.c | 362 --------------------------------------- 6 files changed, 32 insertions(+), 587 deletions(-) create mode 100644 include/samsung_lights.h delete mode 100644 liblights/Android.mk delete mode 100644 liblights/NOTICE delete mode 100644 liblights/lights.c diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index b3e995d..371b981 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -59,9 +59,6 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 7500000 # Legacy BLOB Support TARGET_NEEDS_PLATFORM_TEXT_RELOCATIONS := true -# Lights -TARGET_PROVIDES_LIBLIGHT := true - # IR Blaster BOARD_USES_MS_IR_SIGNAL := true diff --git a/include/samsung_lights.h b/include/samsung_lights.h new file mode 100644 index 0000000..f6be644 --- /dev/null +++ b/include/samsung_lights.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2016 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef SAMSUNG_LIGHTS_H +#define SAMSUNG_LIGHTS_H + +/* + * Board specific nodes + * + * If your kernel exposes these controls in another place, you can either + * symlink to the locations given here, or override this header in your + * device tree. + */ +#define PANEL_BRIGHTNESS_NODE "/sys/class/leds/lcd-backlight/brightness" +#define BUTTON_BRIGHTNESS_NODE "/sys/class/sec/sec_touchkey/brightness" +#define LED_BLINK_NODE "/sys/class/sec/led/led_blink" + +#endif // SAMSUNG_LIGHTS_H diff --git a/klte.mk b/klte.mk index 13701cd..a6c9186 100644 --- a/klte.mk +++ b/klte.mk @@ -99,7 +99,7 @@ PRODUCT_COPY_FILES += \ # Lights PRODUCT_PACKAGES += \ - lights.msm8974 + lights.MSM8974 # Media PRODUCT_COPY_FILES += \ diff --git a/liblights/Android.mk b/liblights/Android.mk deleted file mode 100644 index d1cb599..0000000 --- a/liblights/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) -# HAL module implemenation stored in -# hw/..so -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := lights.c - - -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw - -LOCAL_SHARED_LIBRARIES := liblog - -LOCAL_MODULE := lights.msm8974 - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/liblights/NOTICE b/liblights/NOTICE deleted file mode 100644 index f921593..0000000 --- a/liblights/NOTICE +++ /dev/null @@ -1,190 +0,0 @@ - - Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/liblights/lights.c b/liblights/lights.c deleted file mode 100644 index 00f2d44..0000000 --- a/liblights/lights.c +++ /dev/null @@ -1,362 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * Copyright (C) 2013 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -//#define LOG_NDEBUG 0 -#define LOG_TAG "lights" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define UNUSED __attribute__((unused)) - -static pthread_once_t g_init = PTHREAD_ONCE_INIT; -static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; - -char const*const PANEL_FILE = "/sys/class/leds/lcd-backlight/brightness"; -char const*const BUTTON_FILE = "/sys/class/sec/sec_touchkey/brightness"; - -char const*const LED_BLINK = "/sys/class/sec/led/led_blink"; - -struct led_config { - unsigned int color; - int delay_on, delay_off; -}; - -static struct led_config g_leds[3]; // For battery, notifications, and attention. -static int g_cur_led = -1; // Presently showing LED of the above. - -void init_g_lock(void) -{ - pthread_mutex_init(&g_lock, NULL); -} - -static int write_int(char const *path, int value) -{ - int fd; - static int already_warned; - - already_warned = 0; - - ALOGV("write_int: path %s, value %d", path, value); - fd = open(path, O_RDWR); - - if (fd >= 0) { - char buffer[20]; - int bytes = sprintf(buffer, "%d\n", value); - int amt = write(fd, buffer, bytes); - close(fd); - return amt == -1 ? -errno : 0; - } else { - if (already_warned == 0) { - ALOGE("write_int failed to open %s\n", path); - already_warned = 1; - } - return -errno; - } -} - -/* Currently unused. -static int read_int(char const *path) -{ - int fd; - char buffer[2]; - - fd = open(path, O_RDONLY); - - if (fd >= 0) { - read(fd, buffer, 1); - } - close(fd); - - return atoi(buffer); -} -*/ - -static int write_str(char const *path, const char* value) -{ - int fd; - static int already_warned; - - already_warned = 0; - - ALOGV("write_str: path %s, value %s", path, value); - fd = open(path, O_RDWR); - - if (fd >= 0) { - int amt = write(fd, value, strlen(value)); - close(fd); - return amt == -1 ? -errno : 0; - } else { - if (already_warned == 0) { - ALOGE("write_str failed to open %s\n", path); - already_warned = 1; - } - return -errno; - } -} - -static int rgb_to_brightness(struct light_state_t const *state) -{ - int color = state->color & 0x00ffffff; - - return ((77*((color>>16) & 0x00ff)) - + (150*((color>>8) & 0x00ff)) + (29*(color & 0x00ff))) >> 8; -} - -/* Previously used by set_light_leds. -static int get_calibrated_color(struct light_state_t const *state, int brightness) -{ - int red = (state->color >> 16) & 0xFF; - int green = ((state->color >> 8) & 0xFF) * 0.7; - int blue = (state->color & 0x00FF) * 0.8; - - return (((red * brightness) / 255) << 16) + (((green * brightness) / 255) << 8) + ((blue * brightness) / 255); -} -*/ - -static int is_lit(struct light_state_t const* state) -{ - return state->color & 0x00ffffff; -} - -static int set_light_backlight(UNUSED struct light_device_t *dev, - struct light_state_t const *state) -{ - int err = 0; - int brightness = rgb_to_brightness(state); - - pthread_mutex_lock(&g_lock); - err = write_int(PANEL_FILE, brightness); - - pthread_mutex_unlock(&g_lock); - return err; -} - -static int -set_light_buttons(UNUSED struct light_device_t* dev, - struct light_state_t const* state) -{ - int err = 0; - int on = is_lit(state); - - pthread_mutex_lock(&g_lock); - err = write_int(BUTTON_FILE, on?1:0); - pthread_mutex_unlock(&g_lock); - - return err; - -} - -static int close_lights(struct light_device_t *dev) -{ - ALOGV("close_light is called"); - if (dev) - free(dev); - - return 0; -} - -/* LEDs */ -static int write_leds(const struct led_config *led) -{ - static const struct led_config led_off = {0, 0, 0}; - - char blink[32]; - int count, err; - - if (led == NULL) - led = &led_off; - - if ((count = snprintf(blink, sizeof(blink)-1, "0x%08x %d %d", led->color, - led->delay_on, led->delay_off)) < 0) { - return -errno; - } else if ((unsigned int)count >= sizeof(blink)-1) { - ALOGE("%s: Truncated string: blink=\"%s\".", __func__, blink); - return -EINVAL; - } - - ALOGD("%s: color=0x%08x, delay_on=%d, delay_off=%d, blink=\"%s\".", - __func__, led->color, led->delay_on, led->delay_off, blink); - - /* Add '\n' here to make the above log message clean. */ - blink[count] = '\n'; - blink[count+1] = '\0'; - - pthread_mutex_lock(&g_lock); - err = write_str(LED_BLINK, blink); - pthread_mutex_unlock(&g_lock); - - return err; -} - -static int set_light_leds(struct light_state_t const *state, int type) -{ - struct led_config *led; - int err = 0; - - ALOGD("%s: type=%d, color=0x%010x, fM=%d, fOnMS=%d, fOffMs=%d.", __func__, - type, state->color,state->flashMode, state->flashOnMS, state->flashOffMS); - - if (type < 0 || (unsigned int)type >= sizeof(g_leds)/sizeof(g_leds[0])) - return -EINVAL; - - /* type is one of: - * 0. battery - * 1. notifications - * 2. attention - * which are multiplexed onto the same physical LED in the above order. */ - led = &g_leds[type]; - - switch (state->flashMode) { - case LIGHT_FLASH_NONE: - /* Set LED to a solid color, spec is unclear on the exact behavior here. */ - led->delay_on = led->delay_off = 0; - break; - case LIGHT_FLASH_TIMED: - case LIGHT_FLASH_HARDWARE: - led->delay_on = state->flashOnMS; - led->delay_off = state->flashOffMS; - break; - default: - return -EINVAL; - } - - led->color = state->color & 0x00ffffff; - - if (led->color > 0) { - /* This LED is lit. */ - if (type >= g_cur_led) { - /* And it has the highest priority, so show it. */ - err = write_leds(led); - g_cur_led = type; - } - } else { - /* This LED is not (any longer) lit. */ - if (type == g_cur_led) { - /* But it is currently showing, switch to a lower-priority LED. */ - int i; - - for (i = type-1; i >= 0; i--) { - if (g_leds[i].color > 0) { - /* Found a lower-priority LED to switch to. */ - err = write_leds(&g_leds[i]); - goto switched; - } - } - - /* No LEDs are lit, turn off. */ - err = write_leds(NULL); -switched: - g_cur_led = i; - } - } - - return err; -} - -static int set_light_leds_battery(UNUSED struct light_device_t *dev, - struct light_state_t const *state) -{ - return set_light_leds(state, 0); -} - -static int set_light_leds_notifications(UNUSED struct light_device_t *dev, - struct light_state_t const *state) -{ - return set_light_leds(state, 1); -} - -static int set_light_leds_attention(UNUSED struct light_device_t *dev, - struct light_state_t const *state) -{ - struct light_state_t fixed; - - memcpy(&fixed, state, sizeof(fixed)); - - /* The framework does odd things with the attention lights, fix them up to - * do something sensible here. */ - switch (fixed.flashMode) { - case LIGHT_FLASH_NONE: - /* LightsService.Light::stopFlashing calls with non-zero color. */ - fixed.color = 0; - break; - case LIGHT_FLASH_HARDWARE: - /* PowerManagerService::setAttentionLight calls with onMS=3, offMS=0, which - * just makes for a slightly-dimmer LED. */ - if (fixed.flashOnMS > 0 && fixed.flashOffMS == 0) - fixed.flashMode = LIGHT_FLASH_NONE; - break; - } - - return set_light_leds(&fixed, 2); -} - -static int open_lights(const struct hw_module_t *module, char const *name, - struct hw_device_t **device) -{ - int (*set_light)(struct light_device_t *dev, - struct light_state_t const *state); - - if (0 == strcmp(LIGHT_ID_BACKLIGHT, name)) - set_light = set_light_backlight; - else if (0 == strcmp(LIGHT_ID_BUTTONS, name)) - set_light = set_light_buttons; - else if (0 == strcmp(LIGHT_ID_BATTERY, name)) - set_light = set_light_leds_battery; - else if (0 == strcmp(LIGHT_ID_NOTIFICATIONS, name)) - set_light = set_light_leds_notifications; - else if (0 == strcmp(LIGHT_ID_ATTENTION, name)) - set_light = set_light_leds_attention; - else - return -EINVAL; - - pthread_once(&g_init, init_g_lock); - - struct light_device_t *dev = malloc(sizeof(struct light_device_t)); - memset(dev, 0, sizeof(*dev)); - - dev->common.tag = HARDWARE_DEVICE_TAG; - dev->common.version = 0; - dev->common.module = (struct hw_module_t *)module; - dev->common.close = (int (*)(struct hw_device_t *))close_lights; - dev->set_light = set_light; - - *device = (struct hw_device_t *)dev; - - return 0; -} - -static struct hw_module_methods_t lights_module_methods = { - .open = open_lights, -}; - -struct hw_module_t HAL_MODULE_INFO_SYM = { - .tag = HARDWARE_MODULE_TAG, - .version_major = 1, - .version_minor = 0, - .id = LIGHTS_HARDWARE_MODULE_ID, - .name = "D2 Lights Module", - .author = "The CyanogenMod Project", - .methods = &lights_module_methods, -};