From 91100346415420fc6fb73a1ee43d620b73eebecf Mon Sep 17 00:00:00 2001 From: ccaapton Date: Thu, 13 Nov 2014 04:52:47 -0600 Subject: [PATCH 1/4] Add IR device property --- f6mt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/f6mt.mk b/f6mt.mk index e597062..af68e7e 100644 --- a/f6mt.mk +++ b/f6mt.mk @@ -23,6 +23,7 @@ $(call inherit-product-if-exists, device/lge/f6mt/f6mt-vendor-blobs.mk) # Permissions PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml \ frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \ From cb14c759192252b96666aa7199a6f90263bad444 Mon Sep 17 00:00:00 2001 From: ccaapton Date: Thu, 13 Nov 2014 12:45:12 -0600 Subject: [PATCH 2/4] Restart working on notification lights. --- f6mt-vendor-blobs.mk | 3 - liblights/Android.mk | 31 +++++++ liblights/NOTICE | 189 ++++++++++++++++++++++++++++++++++++++++++ liblights/lights-f6.c | 0 4 files changed, 220 insertions(+), 3 deletions(-) create mode 100644 liblights/Android.mk create mode 100644 liblights/NOTICE create mode 100644 liblights/lights-f6.c diff --git a/f6mt-vendor-blobs.mk b/f6mt-vendor-blobs.mk index e250149..9524d0f 100644 --- a/f6mt-vendor-blobs.mk +++ b/f6mt-vendor-blobs.mk @@ -258,9 +258,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/proprietary/lib/libloc_eng.so:system/lib/libloc_eng.so \ $(LOCAL_PATH)/proprietary/lib/hw/gps.default.so:system/lib/hw/gps.default.so \ -# Lights -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/proprietary/lib/hw/lights.msm8960.so:system/lib/hw/lights.msm8960.so \ #NFC PRODUCT_COPY_FILES += \ diff --git a/liblights/Android.mk b/liblights/Android.mk new file mode 100644 index 0000000..aa43437 --- /dev/null +++ b/liblights/Android.mk @@ -0,0 +1,31 @@ +# 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/..so +include $(CLEAR_VARS) + +ifeq ($(TARGET_PROVIDES_LIBLIGHT),true) + +LOCAL_SRC_FILES := lights-f6.c +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_SHARED_LIBRARIES := liblog \ + libcutils + +LOCAL_MODULE := lights.f6mt +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) +endif diff --git a/liblights/NOTICE b/liblights/NOTICE new file mode 100644 index 0000000..47ad1ac --- /dev/null +++ b/liblights/NOTICE @@ -0,0 +1,189 @@ + + 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-f6.c b/liblights/lights-f6.c new file mode 100644 index 0000000..e69de29 From 520c7464689f254e9742da0ecfdd609bae1153a3 Mon Sep 17 00:00:00 2001 From: ccaapton Date: Thu, 13 Nov 2014 13:26:53 -0600 Subject: [PATCH 3/4] Add light-f6.c implementation from CyanogenMod/android_device_lge_e980 --- liblights/lights-f6.c | 310 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) diff --git a/liblights/lights-f6.c b/liblights/lights-f6.c index e69de29..7c20d4c 100644 --- a/liblights/lights-f6.c +++ b/liblights/lights-f6.c @@ -0,0 +1,310 @@ +/* + * 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 +#define LOG_TAG "lights" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +/******************************************************************************/ + +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 struct light_state_t g_attention; + +char const*const BUTTON_FILE = "/sys/class/leds/button-backlight/brightness"; +char const*const LCD_FILE = "/sys/class/leds/lcd-backlight/brightness"; + +char const*const BLUE_LED_FILE = "/sys/class/leds/led:rgb_blue/brightness"; +char const*const GREEN_LED_FILE = "/sys/class/leds/led:rgb_green/brightness"; +char const*const RED_LED_FILE = "/sys/class/leds/led:rgb_red/brightness"; + +char const*const LED_LOCK_UPDATE_FILE = "/sys/class/leds/led:rgb_red/device/lock"; + +char const*const PMIC_KPJT_BLINK_FILE = "/sys/class/pmic-kpjt/make_patterns/blink_patterns"; +char const*const PMIC_KPJT_PATTERN_FILE = "/sys/class/pmic-kpjt/make_patterns/test_patterns"; +char const*const PMIC_KPJT_TEST_FILE = "/sys/class/pmic-kpjt/use_patterns/setting"; + +/** + * 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 = 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; + } +} + +static int +write_str(char const* path, char *value) +{ + int fd; + static int already_warned = 0; + + fd = open(path, O_RDWR); + if (fd >= 0) { + char buffer[PAGE_SIZE]; + int bytes = sprintf(buffer, "%s\n", value); + int amt = write(fd, buffer, bytes); + 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 +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_buttons(struct light_device_t* dev, + struct light_state_t const* state) +{ + int err = 0; + int on = rgb_to_brightness(state); + + /* This device has a 0-10 scale */ + on = ceil((on * 10.0) / 255); + pthread_mutex_lock(&g_lock); + err = write_int(BUTTON_FILE, on); + pthread_mutex_unlock(&g_lock); + return err; +} + +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); + pthread_mutex_lock(&g_lock); + err = write_int(LCD_FILE, 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 len; + int onMS, offMS; + unsigned int colorRGB; + + if(state != NULL) { + colorRGB = state->color; + + int red, green, blue; + red = (colorRGB >> 16) & 0xFF; + green = (colorRGB >> 8) & 0xFF; + blue = colorRGB & 0xFF; + + 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, + struct light_state_t const* state, int state_type) +{ + if(is_lit(&g_attention)) { + set_speaker_light_locked(dev, NULL); + set_speaker_light_locked(dev, &g_attention); + } else { + if(is_lit(&g_battery) && is_lit(&g_notification)) { + set_speaker_light_locked(dev, NULL); + set_speaker_light_locked(dev, &g_notification); + } else if(is_lit(&g_battery)) { + set_speaker_light_locked(dev, NULL); + 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, state, 0); + 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, state, 1); + 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); + g_attention = *state; + /* + * attention logic tweaks from: + * https://github.com/CyanogenMod/android_device_samsung_d2-common/commit/6886bdbbc2417dd605f9818af2537c7b58491150 + */ + if (state->flashMode == LIGHT_FLASH_HARDWARE) { + if (g_attention.flashOnMS > 0 && g_attention.flashOffMS == 0) { + g_attention.flashMode = LIGHT_FLASH_NONE; + } + } else if (state->flashMode == LIGHT_FLASH_NONE) { + g_attention.color = 0; + } + handle_speaker_battery_locked(dev, state, 2); + pthread_mutex_unlock(&g_lock); + return 0; +} + + +/** 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_NOTIFICATIONS, name)) + set_light = set_light_notifications; + else if (0 == strcmp(LIGHT_ID_BATTERY, name)) + set_light = set_light_battery; + else if (0 == strcmp(LIGHT_ID_BUTTONS, name)) + set_light = set_light_buttons; + 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)); + 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, +}; + +/* + * 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, +}; From 4262a7b6fafa1d1ce64f2473ca43d781ce44d614 Mon Sep 17 00:00:00 2001 From: ccaapton Date: Thu, 13 Nov 2014 13:33:40 -0600 Subject: [PATCH 4/4] Change liblight shared object name --- liblights/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liblights/Android.mk b/liblights/Android.mk index aa43437..aa7206a 100644 --- a/liblights/Android.mk +++ b/liblights/Android.mk @@ -24,7 +24,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SHARED_LIBRARIES := liblog \ libcutils -LOCAL_MODULE := lights.f6mt +LOCAL_MODULE := lights.$(TARGET_BOOTLOADER_BOARD_NAME) LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY)