From e4f84d6c0173511cc8aa28d800b90f1cc29e6939 Mon Sep 17 00:00:00 2001
From: Dhina17 <dhinalogu@gmail.com>
Date: Tue, 28 Jan 2020 18:13:20 +0100
Subject: [PATCH] onclite: Drop liblight from device tree
This reverts 2849cc9ea3d33bdd310f940cff7f417b8d752ae8
* Its useless
Signed-off-by: Dhina17 <dhinalogu@gmail.com>
---
BoardConfig.mk | 3 -
liblight/Android.mk | 34 ----
liblight/NOTICE | 190 ------------------
liblight/disp_color_apis.h | 59 ------
liblight/lights.c | 384 -------------------------------------
5 files changed, 670 deletions(-)
delete mode 100644 liblight/Android.mk
delete mode 100644 liblight/NOTICE
delete mode 100644 liblight/disp_color_apis.h
delete mode 100644 liblight/lights.c
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 501f8e9..887a485 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -167,9 +167,6 @@ DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml
TARGET_INIT_VENDOR_LIB := libinit_onclite
TARGET_RECOVERY_DEVICE_MODULES := libinit_onclite
-# Lights
-TARGET_PROVIDES_LIBLIGHT := true
-
# Media
TARGET_USES_MEDIA_EXTENSIONS := true
diff --git a/liblight/Android.mk b/liblight/Android.mk
deleted file mode 100644
index 6c3b764..0000000
--- a/liblight/Android.mk
+++ /dev/null
@@ -1,34 +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.
-# 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/<COPYPIX_HARDWARE_MODULE_ID>.<ro.board.platform>.so
-include $(CLEAR_VARS)
-
-
-LOCAL_SRC_FILES := lights.c
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils
-LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\"
-LOCAL_CLANG := true
-LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
-LOCAL_HEADER_LIBRARIES := libhardware_headers
-LOCAL_MODULE_TAGS := optional
-LOCAL_VENDOR_MODULE := true
-ifneq (,$(filter tissot,$(TARGET_DEVICE)))
- LOCAL_CFLAGS += -DWHITE_LED
-endif
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/liblight/NOTICE b/liblight/NOTICE
deleted file mode 100644
index 7340b9e..0000000
--- a/liblight/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/liblight/disp_color_apis.h b/liblight/disp_color_apis.h
deleted file mode 100644
index 07acb9e..0000000
--- a/liblight/disp_color_apis.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __DISP_COLOR_APIS_H__
-#define __DISP_COLOR_APIS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <cutils/log.h>
-
-typedef uint64_t DISPAPI_HANDLE;
-
-
-/*=========================================================================
-FUNCTION
- disp_api_init()
-
-DESCRIPTION
- This API initializes the display API library.
-
- This function must be called before calling any display APIs.
- The function returns a context handle that must be used on all subsequent
- calls.
-
- hctx -- returns context handle on a successful call
- flags -- Reserved
-
-RETURN VALUE
- ZERO (SUCCESS)- success.
- Negative Value - error\failure
-=========================================================================*/
-
-int32_t disp_api_init(DISPAPI_HANDLE *hctx, uint32_t flags);
-
-/*=========================================================================
-FUNCTION
- disp_api_set_panel_brightness_level_ext()
-
-DESCRIPTION
- This API adjusts the backlight brightness.
-
- hctx -- Context handle.
- disp_id -- Display ID type
- level -- Color balance adjustement, the larger the value the warmer the color
- flags -- Reserved
-
-RETURN VALUE
- ZERO (SUCCESS)- success.
- Negative Value - error\failure
-=========================================================================*/
-int32_t disp_api_set_panel_brightness_level_ext(DISPAPI_HANDLE hctx, uint32_t disp_id, int32_t level,
- uint32_t flags);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __DISP_COLOR_APIS_H__
diff --git a/liblight/lights.c b/liblight/lights.c
deleted file mode 100644
index 1f04c31..0000000
--- a/liblight/lights.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (C) 2014, 2017-2018 The Linux Foundation. All rights reserved.
- * Not a contribution
- * 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.
- * 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
-
-#include <cutils/log.h>
-#include <cutils/properties.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-
-#include <hardware/lights.h>
-
-#ifndef DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS
-#define DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS 0x80
-#endif
-
-/******************************************************************************/
-
-static pthread_once_t g_init = PTHREAD_ONCE_INIT;
-static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER;
-static struct light_state_t g_notification;
-static struct light_state_t g_battery;
-static int g_last_backlight_mode = BRIGHTNESS_MODE_USER;
-static int g_attention = 0;
-
-char const*const RED_LED_FILE
- = "/sys/class/leds/red/brightness";
-
-char const*const GREEN_LED_FILE
- = "/sys/class/leds/green/brightness";
-
-char const*const BLUE_LED_FILE
- = "/sys/class/leds/blue/brightness";
-
-char const*const LCD_FILE
- = "/sys/class/leds/lcd-backlight/brightness";
-
-char const*const LCD_FILE2
- = "/sys/class/backlight/panel0-backlight/brightness";
-
-char const*const BUTTON_FILE
- = "/sys/class/leds/button-backlight/brightness";
-
-char const*const RED_BLINK_FILE
- = "/sys/class/leds/red/blink";
-
-char const*const GREEN_BLINK_FILE
- = "/sys/class/leds/green/blink";
-
-char const*const BLUE_BLINK_FILE
- = "/sys/class/leds/blue/blink";
-
-char const*const PERSISTENCE_FILE
- = "/sys/class/graphics/fb0/msm_fb_persist_mode";
-
-/**
- * device methods
- */
-
-void init_globals(void)
-{
- // init the mutex
- pthread_mutex_init(&g_lock, NULL);
-}
-
-static int
-write_int(char const* path, int value)
-{
- int fd;
- static int already_warned = 0;
-
- fd = open(path, O_RDWR);
- if (fd >= 0) {
- char buffer[20];
- int bytes = snprintf(buffer, sizeof(buffer), "%d\n", value);
- ssize_t amt = write(fd, buffer, (size_t)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;
- }
-}
-
-static int
-is_lit(struct light_state_t const* state)
-{
- return state->color & 0x00ffffff;
-}
-
-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;
-}
-
-static int
-set_light_backlight(struct light_device_t* dev,
- struct light_state_t const* state)
-{
- int err = 0;
- int brightness = rgb_to_brightness(state);
- unsigned int lpEnabled =
- state->brightnessMode == BRIGHTNESS_MODE_LOW_PERSISTENCE;
- if(!dev) {
- return -1;
- }
-
- pthread_mutex_lock(&g_lock);
- // Toggle low persistence mode state
- if ((g_last_backlight_mode != state->brightnessMode && lpEnabled) ||
- (!lpEnabled &&
- g_last_backlight_mode == BRIGHTNESS_MODE_LOW_PERSISTENCE)) {
- if ((err = write_int(PERSISTENCE_FILE, lpEnabled)) != 0) {
- ALOGE("%s: Failed to write to %s: %s\n", __FUNCTION__,
- PERSISTENCE_FILE, strerror(errno));
- }
- if (lpEnabled != 0) {
- brightness = DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS;
- }
- }
-
- g_last_backlight_mode = state->brightnessMode;
-
- if (!err) {
- if (!access(LCD_FILE, F_OK)) {
- err = write_int(LCD_FILE, brightness);
- } else {
- err = write_int(LCD_FILE2, brightness);
- }
- }
-
- pthread_mutex_unlock(&g_lock);
- return err;
-}
-
-static int
-set_speaker_light_locked(struct light_device_t* dev,
- struct light_state_t const* state)
-{
- int red, green, blue;
- int blink;
- int onMS, offMS;
- unsigned int colorRGB;
-
- if(!dev) {
- return -1;
- }
-
- switch (state->flashMode) {
- case LIGHT_FLASH_TIMED:
- onMS = state->flashOnMS;
- offMS = state->flashOffMS;
- break;
- case LIGHT_FLASH_NONE:
- default:
- onMS = 0;
- offMS = 0;
- break;
- }
-
- colorRGB = state->color;
-
-#ifdef WHITE_LED
- colorRGB = 16711680;
-
- if ( !(state->color & 0xFFFFFF) )
- colorRGB = state->color;
-#endif
-
-#if 0
- ALOGD("set_speaker_light_locked mode %d, colorRGB=%08X, onMS=%d, offMS=%d\n",
- state->flashMode, colorRGB, onMS, offMS);
-#endif
-
- red = (colorRGB >> 16) & 0xFF;
- green = (colorRGB >> 8) & 0xFF;
- blue = colorRGB & 0xFF;
-
- if (onMS > 0 && offMS > 0) {
- /*
- * if ON time == OFF time
- * use blink mode 2
- * else
- * use blink mode 1
- */
- if (onMS == offMS)
- blink = 2;
- else
- blink = 1;
- } else {
- blink = 0;
- }
-
- if (blink) {
- if (red) {
- if (write_int(RED_BLINK_FILE, blink))
- write_int(RED_LED_FILE, 0);
- }
- if (green) {
- if (write_int(GREEN_BLINK_FILE, blink))
- write_int(GREEN_LED_FILE, 0);
- }
- if (blue) {
- if (write_int(BLUE_BLINK_FILE, blink))
- write_int(BLUE_LED_FILE, 0);
- }
- } else {
- write_int(RED_LED_FILE, red);
- write_int(GREEN_LED_FILE, green);
- write_int(BLUE_LED_FILE, blue);
- }
-
- return 0;
-}
-
-static void
-handle_speaker_battery_locked(struct light_device_t* dev)
-{
- if (is_lit(&g_battery)) {
- set_speaker_light_locked(dev, &g_battery);
- } else {
- set_speaker_light_locked(dev, &g_notification);
- }
-}
-
-static int
-set_light_battery(struct light_device_t* dev,
- struct light_state_t const* state)
-{
- pthread_mutex_lock(&g_lock);
- g_battery = *state;
- handle_speaker_battery_locked(dev);
- pthread_mutex_unlock(&g_lock);
- return 0;
-}
-
-static int
-set_light_notifications(struct light_device_t* dev,
- struct light_state_t const* state)
-{
- pthread_mutex_lock(&g_lock);
- g_notification = *state;
- handle_speaker_battery_locked(dev);
- pthread_mutex_unlock(&g_lock);
- return 0;
-}
-
-static int
-set_light_attention(struct light_device_t* dev,
- struct light_state_t const* state)
-{
- pthread_mutex_lock(&g_lock);
- if (state->flashMode == LIGHT_FLASH_HARDWARE) {
- g_attention = state->flashOnMS;
- } else if (state->flashMode == LIGHT_FLASH_NONE) {
- g_attention = 0;
- }
- handle_speaker_battery_locked(dev);
- pthread_mutex_unlock(&g_lock);
- return 0;
-}
-
-static int
-set_light_buttons(struct light_device_t* dev,
- struct light_state_t const* state)
-{
- int err = 0;
- if(!dev) {
- return -1;
- }
- pthread_mutex_lock(&g_lock);
- err = write_int(BUTTON_FILE, state->color & 0xFF);
- pthread_mutex_unlock(&g_lock);
- return err;
-}
-
-/** Close the lights device */
-static int
-close_lights(struct light_device_t *dev)
-{
- if (dev) {
- free(dev);
- }
- return 0;
-}
-
-
-/******************************************************************************/
-
-/**
- * module methods
- */
-
-/** Open a new instance of a lights device using name */
-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_BATTERY, name))
- set_light = set_light_battery;
- else if (0 == strcmp(LIGHT_ID_NOTIFICATIONS, name))
- set_light = set_light_notifications;
- else if (0 == strcmp(LIGHT_ID_BUTTONS, name)) {
- if (!access(BUTTON_FILE, F_OK)) {
- // enable light button when the file is present
- set_light = set_light_buttons;
- } else {
- return -EINVAL;
- }
- }
- else if (0 == strcmp(LIGHT_ID_ATTENTION, name))
- set_light = set_light_attention;
- else
- return -EINVAL;
-
- pthread_once(&g_init, init_globals);
-
- struct light_device_t *dev = malloc(sizeof(struct light_device_t));
-
- if(!dev)
- return -ENOMEM;
-
- memset(dev, 0, sizeof(*dev));
-
- dev->common.tag = HARDWARE_DEVICE_TAG;
- dev->common.version = LIGHTS_DEVICE_API_VERSION_2_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,
-};
-
-/*
- * The lights Module
- */
-struct hw_module_t HAL_MODULE_INFO_SYM = {
- .tag = HARDWARE_MODULE_TAG,
- .version_major = 1,
- .version_minor = 0,
- .id = LIGHTS_HARDWARE_MODULE_ID,
- .name = "lights Module",
- .author = "Google, Inc.",
- .methods = &lights_module_methods,
-};
--
GitLab