summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortakeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>2020-10-22 09:51:17 +0900
committertakeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>2020-10-22 09:51:17 +0900
commit8b09ddc15b84ce65f9d5c9fa9d59d6e9d902daf4 (patch)
treed459b766dcc69e2d4bfaa3351b497772831c2cbe
parenta0b81882b4a9b7761e2dbfdda37b7559714c416c (diff)
ss-powerservice branch 0.1sandbox/ToshikazuOhiwa/ss-powerservice
-rw-r--r--power_service/Makefile.server2
-rw-r--r--power_service/server/Makefile2
-rw-r--r--power_service/server/include/ss_power.h2
-rw-r--r--power_service/server/include/ss_power_config.h2
-rw-r--r--power_service/server/include/ss_power_powerservicelog.h2
-rw-r--r--power_service/server/include/ss_power_session.h2
-rw-r--r--power_service/server/include/ss_power_state_hysteresis.h2
-rw-r--r--power_service/server/include/ss_power_state_machine.h2
-rw-r--r--power_service/server/src/powerservice_application.cpp2
-rw-r--r--power_service/server/src/powerservice_main.cpp2
-rw-r--r--power_service/server/src/ss_power.cpp4
-rw-r--r--power_service/server/src/ss_power_config.cpp2
-rw-r--r--power_service/server/src/ss_power_session.cpp2
-rw-r--r--power_service/server/src/ss_power_state_machine.cpp2
-rw-r--r--power_service/server/src/ss_pwr_test_client_handlers.cpp2
-rw-r--r--power_service/server/src/ss_supervisor_handlers.cpp2
-rw-r--r--power_service/server/src/ss_system_handlers.cpp2
-rw-r--r--system_service.mk2
18 files changed, 19 insertions, 19 deletions
diff --git a/power_service/Makefile.server b/power_service/Makefile.server
index c956695d..b11e0d8c 100644
--- a/power_service/Makefile.server
+++ b/power_service/Makefile.server
@@ -1,5 +1,5 @@
#
-# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/power_service/server/Makefile b/power_service/server/Makefile
index bc59b540..f81d2ba6 100644
--- a/power_service/server/Makefile
+++ b/power_service/server/Makefile
@@ -1,5 +1,5 @@
#
-# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/power_service/server/include/ss_power.h b/power_service/server/include/ss_power.h
index 0cec9c0f..b1e3de57 100644
--- a/power_service/server/include/ss_power.h
+++ b/power_service/server/include/ss_power.h
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/include/ss_power_config.h b/power_service/server/include/ss_power_config.h
index d73a41b4..09ca70d9 100644
--- a/power_service/server/include/ss_power_config.h
+++ b/power_service/server/include/ss_power_config.h
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/include/ss_power_powerservicelog.h b/power_service/server/include/ss_power_powerservicelog.h
index 0269d9a5..3d912fa5 100644
--- a/power_service/server/include/ss_power_powerservicelog.h
+++ b/power_service/server/include/ss_power_powerservicelog.h
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/include/ss_power_session.h b/power_service/server/include/ss_power_session.h
index ae9788f9..47a4a4a5 100644
--- a/power_service/server/include/ss_power_session.h
+++ b/power_service/server/include/ss_power_session.h
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/include/ss_power_state_hysteresis.h b/power_service/server/include/ss_power_state_hysteresis.h
index 8220789c..c1366302 100644
--- a/power_service/server/include/ss_power_state_hysteresis.h
+++ b/power_service/server/include/ss_power_state_hysteresis.h
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/include/ss_power_state_machine.h b/power_service/server/include/ss_power_state_machine.h
index fb5b7c33..086f36c4 100644
--- a/power_service/server/include/ss_power_state_machine.h
+++ b/power_service/server/include/ss_power_state_machine.h
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/powerservice_application.cpp b/power_service/server/src/powerservice_application.cpp
index 52c6cfe4..4c444590 100644
--- a/power_service/server/src/powerservice_application.cpp
+++ b/power_service/server/src/powerservice_application.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/powerservice_main.cpp b/power_service/server/src/powerservice_main.cpp
index 4e33a71d..0b1ccfe3 100644
--- a/power_service/server/src/powerservice_main.cpp
+++ b/power_service/server/src/powerservice_main.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/ss_power.cpp b/power_service/server/src/ss_power.cpp
index abf1c8c0..26e88813 100644
--- a/power_service/server/src/ss_power.cpp
+++ b/power_service/server/src/ss_power.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -135,7 +135,7 @@ EFrameworkunifiedStatus Power::Initialize(HANDLE h_app) {
pthread_mutex_init(&pwr_hist_mutex, NULL);
/// Open and parse the configuration data for Power
- const CHAR configFileName[] = "/agl/scfg/gpf_ss_ps_config.cfg";
+ const CHAR configFileName[] = "/usr/agl/conf/BS/ss/power_service/rodata/gpf_ss_ps_config.cfg";
PowerConfiguration config(configFileName);
l_SpecifiedCfgLoaded = config.LoadParameters(m_tConfigData);
diff --git a/power_service/server/src/ss_power_config.cpp b/power_service/server/src/ss_power_config.cpp
index 1f04b6ed..3975b56f 100644
--- a/power_service/server/src/ss_power_config.cpp
+++ b/power_service/server/src/ss_power_config.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/ss_power_session.cpp b/power_service/server/src/ss_power_session.cpp
index 70dbc692..20db4a9a 100644
--- a/power_service/server/src/ss_power_session.cpp
+++ b/power_service/server/src/ss_power_session.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/ss_power_state_machine.cpp b/power_service/server/src/ss_power_state_machine.cpp
index 092e88c6..28291e51 100644
--- a/power_service/server/src/ss_power_state_machine.cpp
+++ b/power_service/server/src/ss_power_state_machine.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/ss_pwr_test_client_handlers.cpp b/power_service/server/src/ss_pwr_test_client_handlers.cpp
index 10e2f556..15422816 100644
--- a/power_service/server/src/ss_pwr_test_client_handlers.cpp
+++ b/power_service/server/src/ss_pwr_test_client_handlers.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/ss_supervisor_handlers.cpp b/power_service/server/src/ss_supervisor_handlers.cpp
index 993d7a4c..4bd88d95 100644
--- a/power_service/server/src/ss_supervisor_handlers.cpp
+++ b/power_service/server/src/ss_supervisor_handlers.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/power_service/server/src/ss_system_handlers.cpp b/power_service/server/src/ss_system_handlers.cpp
index 10e8ee50..60a99807 100644
--- a/power_service/server/src/ss_system_handlers.cpp
+++ b/power_service/server/src/ss_system_handlers.cpp
@@ -1,5 +1,5 @@
/*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/system_service.mk b/system_service.mk
index a8a06b06..5444eb4c 100644
--- a/system_service.mk
+++ b/system_service.mk
@@ -1,7 +1,7 @@
#############################################################
#
# Common Makefile for system_service
-# Copyright (C) 2017-2019 TOYOTA MOTOR CORPORATION
+# Copyright (C) 2017-2020 TOYOTA MOTOR CORPORATION
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.