From 7cbc5af3e94e17a67882fa488fb2959f06d49ed6 Mon Sep 17 00:00:00 2001 From: David Ng Date: Mon, 4 Jun 2018 15:07:11 -0700 Subject: Rename sdm670 to sdm710 Merge and rename shared Android target paths. Change-Id: If2f47bbff5445f4de9e6b3ddb5279920fb6c9ee0 --- Android.mk | 6 ++-- power-670.c | 97 ------------------------------------------------------------- power-710.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 power-670.c create mode 100644 power-710.c diff --git a/Android.mk b/Android.mk index baa5535..5a8807e 100644 --- a/Android.mk +++ b/Android.mk @@ -62,12 +62,12 @@ ifeq ($(call is-board-platform-in-list,sdm845), true) LOCAL_SRC_FILES += power-845.c endif -ifeq ($(call is-board-platform-in-list,sdm670), true) -LOCAL_SRC_FILES += power-670.c +ifeq ($(call is-board-platform-in-list,sdm710), true) +LOCAL_SRC_FILES += power-710.c endif ifeq ($(call is-board-platform-in-list,qcs605), true) -LOCAL_SRC_FILES += power-670.c +LOCAL_SRC_FILES += power-710.c endif ifeq ($(TARGET_USES_INTERACTION_BOOST),true) diff --git a/power-670.c b/power-670.c deleted file mode 100644 index 487f319..0000000 --- a/power-670.c +++ /dev/null @@ -1,97 +0,0 @@ -/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of The Linux Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - - -#include -#include -#include -#include -#include -#include -#include - -#define LOG_TAG "QTI PowerHAL" -#include -#include -#include - -#include "utils.h" -#include "metadata-defs.h" -#include "hint-data.h" -#include "performance.h" -#include "power-common.h" - -static int display_fd; -#define SYS_DISPLAY_PWR "/sys/kernel/hbtp/display_pwr" - -int set_interactive_override(struct power_module *module, int on) -{ - static const char *display_on = "1"; - static const char *display_off = "0"; - char err_buf[80]; - static int init_interactive_hint = 0; - static int set_i_count = 0; - int rc = 0; - - set_i_count ++; - ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count); - - if (init_interactive_hint == 0) - { - //First time the display is turned off - display_fd = TEMP_FAILURE_RETRY(open(SYS_DISPLAY_PWR, O_RDWR)); - if (display_fd < 0) { - strerror_r(errno,err_buf,sizeof(err_buf)); - ALOGE("Error opening %s: %s\n", SYS_DISPLAY_PWR, err_buf); - } - else - init_interactive_hint = 1; - } - else - if (!on ) { - /* Display off. */ - rc = TEMP_FAILURE_RETRY(write(display_fd, display_off, strlen(display_off))); - if (rc < 0) { - strerror_r(errno,err_buf,sizeof(err_buf)); - ALOGE("Error writing %s to %s: %s\n", display_off, SYS_DISPLAY_PWR, err_buf); - } - } - else { - /* Display on */ - rc = TEMP_FAILURE_RETRY(write(display_fd, display_on, strlen(display_on))); - if (rc < 0) { - strerror_r(errno,err_buf,sizeof(err_buf)); - ALOGE("Error writing %s to %s: %s\n", display_on, SYS_DISPLAY_PWR, err_buf); - } - } - - return HINT_HANDLED; /* Don't excecute this code path, not in use */ -} - - diff --git a/power-710.c b/power-710.c new file mode 100644 index 0000000..487f319 --- /dev/null +++ b/power-710.c @@ -0,0 +1,97 @@ +/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + + +#include +#include +#include +#include +#include +#include +#include + +#define LOG_TAG "QTI PowerHAL" +#include +#include +#include + +#include "utils.h" +#include "metadata-defs.h" +#include "hint-data.h" +#include "performance.h" +#include "power-common.h" + +static int display_fd; +#define SYS_DISPLAY_PWR "/sys/kernel/hbtp/display_pwr" + +int set_interactive_override(struct power_module *module, int on) +{ + static const char *display_on = "1"; + static const char *display_off = "0"; + char err_buf[80]; + static int init_interactive_hint = 0; + static int set_i_count = 0; + int rc = 0; + + set_i_count ++; + ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count); + + if (init_interactive_hint == 0) + { + //First time the display is turned off + display_fd = TEMP_FAILURE_RETRY(open(SYS_DISPLAY_PWR, O_RDWR)); + if (display_fd < 0) { + strerror_r(errno,err_buf,sizeof(err_buf)); + ALOGE("Error opening %s: %s\n", SYS_DISPLAY_PWR, err_buf); + } + else + init_interactive_hint = 1; + } + else + if (!on ) { + /* Display off. */ + rc = TEMP_FAILURE_RETRY(write(display_fd, display_off, strlen(display_off))); + if (rc < 0) { + strerror_r(errno,err_buf,sizeof(err_buf)); + ALOGE("Error writing %s to %s: %s\n", display_off, SYS_DISPLAY_PWR, err_buf); + } + } + else { + /* Display on */ + rc = TEMP_FAILURE_RETRY(write(display_fd, display_on, strlen(display_on))); + if (rc < 0) { + strerror_r(errno,err_buf,sizeof(err_buf)); + ALOGE("Error writing %s to %s: %s\n", display_on, SYS_DISPLAY_PWR, err_buf); + } + } + + return HINT_HANDLED; /* Don't excecute this code path, not in use */ +} + + -- cgit v1.2.3