From: Dongwoo Lee Date: Thu, 3 Feb 2022 06:31:16 +0000 (+0900) Subject: monitor: Rename monitor.h to monitor-internal.h X-Git-Tag: submit/tizen/20220302.025412~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2011e18baa4895726be9b0e9f26eeab7da9f2389;p=platform%2Fcore%2Fsystem%2Fpass.git monitor: Rename monitor.h to monitor-internal.h Change-Id: I2a6463736ec92ba808c56d7c1cc0c2f083e4588b Signed-off-by: Dongwoo Lee --- diff --git a/include/monitor/monitor-internal.h b/include/monitor/monitor-internal.h new file mode 100644 index 0000000..d658d76 --- /dev/null +++ b/include/monitor/monitor-internal.h @@ -0,0 +1,79 @@ +/* + * PASS (Power Aware System Service) - Header file of Unified Resource Monitor + * + * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * + * 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. + */ + +/** + * @file monitor.h + * @brief Define the data structure for Unified Resource Monitor + * @ingroup COM_POWER_MGNT + */ + +#include + +#ifndef __UNIFIED_RESOURCE_MONITOR__ +#define __UNIFIED_RESOURCE_MONITOR__ + +#define RESOURCE_TYPE_SHIFT 16 +#define RESOURCE_ATTR_INDEX_MASK (0xffff) + +#define RESOURCE_TYPE(command) (command >> RESOURCE_TYPE_SHIFT) +#define RESOURCE_ATTR_INDEX(command) (command & RESOURCE_ATTR_INDEX_MASK) + +enum monitor_data_type { + DATA_TYPE_UNKNOWN = 0, + DATA_TYPE_INT, + DATA_TYPE_DOUBLE, + DATA_TYPE_STRING, + DATA_TYPE_ARRAY, + + DATA_TYPE_NUM +}; + +#define CPU_CUR_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 0) +#define CPU_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 1) +#define CPU_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 2) +#define CPU_AVAILABLE_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 3) +#define CPU_AVAILABLE_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 4) +#define CPU_CUR_GOVERNOR (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 5) +#define CPU_ONLINE_CPU (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 6) +#define CPU_TEMPERATURE (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 7) + +#define BUS_CUR_FREQ (PASS_RESOURCE_BUS_ID << RESOURCE_TYPE_SHIFT | 0) +#define BUS_MIN_FREQ (PASS_RESOURCE_BUS_ID << RESOURCE_TYPE_SHIFT | 1) +#define BUS_MAX_FREQ (PASS_RESOURCE_BUS_ID << RESOURCE_TYPE_SHIFT | 2) +#define BUS_AVAILABLE_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 3) +#define BUS_AVAILABLE_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 4) +#define BUS_CUR_GOVERNOR (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 5) + +#define GPU_CUR_FREQ (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 0) +#define GPU_MIN_FREQ (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 1) +#define GPU_MAX_FREQ (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 2) +#define GPU_AVAILABLE_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 3) +#define GPU_AVAILABLE_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 4) +#define GPU_CUR_GOVERNOR (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 5) +#define GPU_TEMPERATURE (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 6) + +#define MEMORY_TOTAL (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 0) +#define MEMORY_AVAILABLE (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 1) +#define MEMORY_FREE (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 2) +#define MEMORY_FAULT_AROUND_BYTES (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 3) + +#define BATTERY_CAPACITY (PASS_RESOURCE_BATTERY_ID << RESOURCE_TYPE_SHIFT | 0) +#define BATTERY_CHARGING_STATUS (PASS_RESOURCE_BATTERY_ID << RESOURCE_TYPE_SHIFT | 1) +#define BATTERY_TEMPERATURE (PASS_RESOURCE_BATTERY_ID << RESOURCE_TYPE_SHIFT | 2) + +#endif /* __UNIFIED_RESOURCE_MONITOR__ */ diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h deleted file mode 100644 index d658d76..0000000 --- a/include/monitor/monitor.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * PASS (Power Aware System Service) - Header file of Unified Resource Monitor - * - * Copyright (c) 2021 Samsung Electronics Co., Ltd. - * - * 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. - */ - -/** - * @file monitor.h - * @brief Define the data structure for Unified Resource Monitor - * @ingroup COM_POWER_MGNT - */ - -#include - -#ifndef __UNIFIED_RESOURCE_MONITOR__ -#define __UNIFIED_RESOURCE_MONITOR__ - -#define RESOURCE_TYPE_SHIFT 16 -#define RESOURCE_ATTR_INDEX_MASK (0xffff) - -#define RESOURCE_TYPE(command) (command >> RESOURCE_TYPE_SHIFT) -#define RESOURCE_ATTR_INDEX(command) (command & RESOURCE_ATTR_INDEX_MASK) - -enum monitor_data_type { - DATA_TYPE_UNKNOWN = 0, - DATA_TYPE_INT, - DATA_TYPE_DOUBLE, - DATA_TYPE_STRING, - DATA_TYPE_ARRAY, - - DATA_TYPE_NUM -}; - -#define CPU_CUR_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 0) -#define CPU_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 1) -#define CPU_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 2) -#define CPU_AVAILABLE_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 3) -#define CPU_AVAILABLE_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 4) -#define CPU_CUR_GOVERNOR (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 5) -#define CPU_ONLINE_CPU (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 6) -#define CPU_TEMPERATURE (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 7) - -#define BUS_CUR_FREQ (PASS_RESOURCE_BUS_ID << RESOURCE_TYPE_SHIFT | 0) -#define BUS_MIN_FREQ (PASS_RESOURCE_BUS_ID << RESOURCE_TYPE_SHIFT | 1) -#define BUS_MAX_FREQ (PASS_RESOURCE_BUS_ID << RESOURCE_TYPE_SHIFT | 2) -#define BUS_AVAILABLE_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 3) -#define BUS_AVAILABLE_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 4) -#define BUS_CUR_GOVERNOR (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 5) - -#define GPU_CUR_FREQ (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 0) -#define GPU_MIN_FREQ (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 1) -#define GPU_MAX_FREQ (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 2) -#define GPU_AVAILABLE_MIN_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 3) -#define GPU_AVAILABLE_MAX_FREQ (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 4) -#define GPU_CUR_GOVERNOR (PASS_RESOURCE_CPU_ID << RESOURCE_TYPE_SHIFT | 5) -#define GPU_TEMPERATURE (PASS_RESOURCE_GPU_ID << RESOURCE_TYPE_SHIFT | 6) - -#define MEMORY_TOTAL (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 0) -#define MEMORY_AVAILABLE (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 1) -#define MEMORY_FREE (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 2) -#define MEMORY_FAULT_AROUND_BYTES (PASS_RESOURCE_MEMORY_ID << RESOURCE_TYPE_SHIFT | 3) - -#define BATTERY_CAPACITY (PASS_RESOURCE_BATTERY_ID << RESOURCE_TYPE_SHIFT | 0) -#define BATTERY_CHARGING_STATUS (PASS_RESOURCE_BATTERY_ID << RESOURCE_TYPE_SHIFT | 1) -#define BATTERY_TEMPERATURE (PASS_RESOURCE_BATTERY_ID << RESOURCE_TYPE_SHIFT | 2) - -#endif /* __UNIFIED_RESOURCE_MONITOR__ */ diff --git a/src/resource/resource-bus.c b/src/resource/resource-bus.c index fb2e223..a97d6f5 100644 --- a/src/resource/resource-bus.c +++ b/src/resource/resource-bus.c @@ -30,7 +30,7 @@ #include #include -#include +#include static int bus_get_cur_freq(const struct resource *res, const struct resource_attribute *attr, diff --git a/src/resource/resource-cpu.c b/src/resource/resource-cpu.c index 469dacc..7453f31 100644 --- a/src/resource/resource-cpu.c +++ b/src/resource/resource-cpu.c @@ -30,7 +30,7 @@ #include #include -#include +#include static int cpu_get_cur_freq(const struct resource *res, const struct resource_attribute *attr, diff --git a/src/resource/resource-gpu.c b/src/resource/resource-gpu.c index 184772c..02141f5 100644 --- a/src/resource/resource-gpu.c +++ b/src/resource/resource-gpu.c @@ -30,7 +30,7 @@ #include #include -#include +#include static int gpu_get_cur_freq(const struct resource *res, const struct resource_attribute *attr, diff --git a/src/resource/resource-memory.c b/src/resource/resource-memory.c index 3d62be4..d0b24c7 100644 --- a/src/resource/resource-memory.c +++ b/src/resource/resource-memory.c @@ -30,7 +30,7 @@ #include #include -#include +#include #define PROC_MEM_INFO_PATH "/proc/meminfo" #define PROC_MEM_INFO_MEM_TOTAL "MemTotal" diff --git a/src/util/resource.c b/src/util/resource.c index 846fa43..609cbbc 100644 --- a/src/util/resource.c +++ b/src/util/resource.c @@ -23,7 +23,7 @@ #include #include -#include +#include static GList *g_resource_driver_head;