Re-organized sub-directory by category

Since all the sub-directories were placed in the
first level, created sub-directories, "hal", "module",
and "service" for classification and relocated each component.

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: Ifdf743ac0d1893bd8e445455cf0d2c199a011d5c

5 files changed, 0 insertions, 513 deletions

diff --git a/soc_temperature_hal/LICENSE b/soc_temperature_hal/LICENSE
deleted file mode 100755
index f433b1a..0000000
--- a/soc_temperature_hal/LICENSE
+++ /dev/null
@@ -1,177 +0,0 @@
-
-                                 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/soc_temperature_hal/Makefile b/soc_temperature_hal/Makefile
deleted file mode 100755
index fa30b35..0000000
--- a/soc_temperature_hal/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# @copyright 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.
-# 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.
-#
-
-######### installed program/file ################
-TARGET := libsoc_temperature_hal.so
-
-HEADER := hal_api/soc_temperature_hal.h
-
-######### include paths/files ###################
-CXXFLAGS := -I./inc/
-CXXFLAGS += -I./hal_api/
-CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/agl/include
-CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/agl/include/agl_types_obsoluted.h
-
-######### compile options #######################
-CXXFLAGS += -Wall -fPIC
-
-######### link options ##########################
-LDFLAGS += -shared
-LDFLAGS += -Wl,--no-as-needed
-LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
-
-RPATH :=
-
-######### linked library ########################
-LIBS += -Wl,-Bdynamic -lstdc++
-LIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
-
-######### source files ##########################
-VPATH := src
-OBJS := soc_temperature_hal.o
-
-######### make targets ##########################
-all: $(TARGET)
-	@echo $@ done.
-
-$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
-	@echo $@ done.
-
-######### make cleans ###########################
-GCNO_FILES := $(filter %.gcno,$(OBJS:%.o=%.gcno))
-
-clean:
-	rm -f $(OBJS) $(TARGET) $(GCNO_FILES)
-	@echo $@ done.
-
-######### make installs #########################
-install:
-	install -d -m 0755 $(DESTDIR)/usr/lib
-	install -m 0755 $(TARGET) $(DESTDIR)/usr/lib
-	@echo $@ done.
diff --git a/soc_temperature_hal/hal_api/soc_temperature_hal.h b/soc_temperature_hal/hal_api/soc_temperature_hal.h
deleted file mode 100755
index 16c5f6d..0000000
--- a/soc_temperature_hal/hal_api/soc_temperature_hal.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * @copyright 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.
- * 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 soc_temperature_hal.h
- */
-
-#ifndef HAL_API_SOC_TEMPERATURE_HAL_H_
-#define HAL_API_SOC_TEMPERATURE_HAL_H_
-
-#include <native_service/frameworkunified_types.h>
-
-/** @addtogroup soc_temperature_hal
- *  @{
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif  // __cplusplus
-
-/**
- * \ingroup GetSoCTemperature
- * \~english @par Brief
- *           Get SoC temperature value(unit:celsius).
- * \~english @param [out] temperature
- *      float*   -    degree celsius
- * \~english @retval eFrameworkunifiedStatusOK  Success
- * \~english @retval eFrameworkunifiedStatusNullPointer  NULL pointer specified
- * \~english @retval eFrameworkunifiedStatusFail  Abnormal Error (system error)
- * \~english @par Prerequisite
- *        - The SoC has temperature sensor, and the thermal driver is available.
- * \~english @par Change of internal state
- *        - Change of internal state according to the API does not occur.
- * \~english @par Conditions of processing failure
- *        - Parameter temperature is NULL[eFrameworkunifiedStatusNullPointer]
- *        - System error(open/read/close failed)[eFrameworkunifiedStatusFail]
- * \~english @par Classification
- *        Public
- * \~english @par Type
- *        Sync
- * \~english @par Detail
- *        - Get SoC temperature value.
- *        - On success eFrameworkunifiedStatusOK is returned and the parameter temperature is set.
- *        - Not eFrameworkunifiedStatusOK is returned if an error occurred.
- *        - Return value shall be checked before temperature is refered.
- *        - Sample code:
- *            @code
- *            #include <stdio.h>
- *            #include <stdlib.h>
- *            #include <soc_temperature_hal.h>
- *            #include <native_service/frameworkunified_types.h>
- *
- *            int main(int argc, char *argv[]) {
- *              float temperature = 0.0f;
- *              EFrameworkunifiedStatus status = GetSoCTemperature(&temperature);
- *              if (status != eFrameworkunifiedStatusOK) {
- *                printf("Get SoC temperature failed\n");
- *                exit(EXIT_FAILURE);
- *              }
- *              printf("SoC temperature: %f\n", temperature);
- *              exit(EXIT_SUCCESS);
- *            }
- *            @endcode
- * \~english @see
- *        - None
- */
-EFrameworkunifiedStatus GetSoCTemperature(float* temperature);
-
-#ifdef __cplusplus
-}
-#endif  // __cplusplus
-
-/** @}*/  // end of soc_temperature_hal
-
-#endif  // HAL_API_SOC_TEMPERATURE_HAL_H_
-
diff --git a/soc_temperature_hal/inc/soc_temperature_hal_soctemperaturehallog.h b/soc_temperature_hal/inc/soc_temperature_hal_soctemperaturehallog.h
deleted file mode 100755
index 6e256e8..0000000
--- a/soc_temperature_hal/inc/soc_temperature_hal_soctemperaturehallog.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * @copyright 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.
- * 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.
- */
-#ifndef INC_SOC_TEMPERATURE_HAL_SOCTEMPERATUREHALLOG_H_
-#define INC_SOC_TEMPERATURE_HAL_SOCTEMPERATUREHALLOG_H_
-
-#include <native_service/ns_logger_if.h>
-
-#define ZONE_INIT         ZONEMASK(10)
-#define ZONE_FUNC         ZONEMASK(11)
-#define ZONE_MEM          ZONEMASK(12)
-#define ZONE_13           ZONEMASK(13)
-#define ZONE_14           ZONEMASK(14)
-#define ZONE_15           ZONEMASK(15)
-#define ZONE_16           ZONEMASK(16)
-#define ZONE_17           ZONEMASK(17)
-#define ZONE_18           ZONEMASK(18)
-#define ZONE_19           ZONEMASK(19)
-#define ZONE_20           ZONEMASK(20)
-#define ZONE_21           ZONEMASK(21)
-#define ZONE_22           ZONEMASK(22)
-#define ZONE_23           ZONEMASK(23)
-#define ZONE_24           ZONEMASK(24)
-#define ZONE_25           ZONEMASK(25)
-#define ZONE_26           ZONEMASK(26)
-#define ZONE_27           ZONEMASK(27)
-#define ZONE_28           ZONEMASK(28)
-#define ZONE_INFO         ZONEMASK(29)
-#define ZONE_WARN         ZONEMASK(30)
-#define ZONE_ERR          ZONEMASK(31)
-
-#define ZONE_TEXT_10      "Init"
-#define ZONE_TEXT_11      "Function"
-#define ZONE_TEXT_12      "Memory"
-#define ZONE_TEXT_13      ""
-#define ZONE_TEXT_14      ""
-#define ZONE_TEXT_15      ""
-#define ZONE_TEXT_16      ""
-#define ZONE_TEXT_17      ""
-#define ZONE_TEXT_18      ""
-#define ZONE_TEXT_19      ""
-#define ZONE_TEXT_20      ""
-#define ZONE_TEXT_21      ""
-#define ZONE_TEXT_22      ""
-#define ZONE_TEXT_23      ""
-#define ZONE_TEXT_24      ""
-#define ZONE_TEXT_25      ""
-#define ZONE_TEXT_26      ""
-#define ZONE_TEXT_27      ""
-#define ZONE_TEXT_28      ""
-#define ZONE_TEXT_29      "Info"
-#define ZONE_TEXT_30      "Warning"
-#define ZONE_TEXT_31      "Error"
-
-#ifndef  FRAMEWORKUNIFIEDLOGOPTIONS
-#define FRAMEWORKUNIFIEDLOGOPTIONS (LSHAREDMEM)  // LPRINT , LMSGQ, LSLOGGER
-#endif
-
-#ifndef FRAMEWORKUNIFIEDLOGAPPZONES
-#define FRAMEWORKUNIFIEDLOGAPPZONES ZONE_ERR, ZONE_WARN, ZONE_INFO
-#endif
-
-#endif  // INC_SOC_TEMPERATURE_HAL_SOCTEMPERATUREHALLOG_H_
diff --git a/soc_temperature_hal/src/soc_temperature_hal.cpp b/soc_temperature_hal/src/soc_temperature_hal.cpp
deleted file mode 100755
index 33b96ee..0000000
--- a/soc_temperature_hal/src/soc_temperature_hal.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * @copyright 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.
- * 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.
- */
-#include "soc_temperature_hal.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "soc_temperature_hal_soctemperaturehallog.h"
-
-#define MAX_TEMPERATURE_FROM_DRIVER_LENGTH (9)  // 9bytes can content -999999\n\0 - 9999999\n\0 (unit:millicelsius)
-#define DECIMAL  (10)
-#define THERMAL_ZONE0_TEMPERATURE_PATH "/sys/class/thermal/thermal_zone0/temp"
-#define THERMAL_ZONE1_TEMPERATURE_PATH "/sys/class/thermal/thermal_zone1/temp"
-#define THERMAL_ZONE2_TEMPERATURE_PATH "/sys/class/thermal/thermal_zone2/temp"
-
-EFrameworkunifiedStatus GetCoreTemperature(int64_t* temperature, const char* node_path) {
-  if ((NULL == temperature) || (NULL == node_path)) {
-    return eFrameworkunifiedStatusNullPointer;
-  }
-
-  char sz_temperature[MAX_TEMPERATURE_FROM_DRIVER_LENGTH] = { 0 };
-
-  // read temperature
-  int fd = open(node_path, O_RDONLY);
-  if (0 > fd) {
-    FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "open error(%d,%s)", errno, strerror(errno));
-    return eFrameworkunifiedStatusFail;
-  }
-
-  ssize_t ret = read(fd, sz_temperature, MAX_TEMPERATURE_FROM_DRIVER_LENGTH - 1);
-  int read_error = errno;
-  close(fd);
-  if (-1 == ret) {
-    FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "read error(%d,%s)", read_error, strerror(read_error));
-    return eFrameworkunifiedStatusFail;
-  }
-
-  errno = 0;
-  int64_t temp = strtol(sz_temperature, NULL, DECIMAL);
-  if (errno) {
-    FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "strtol error(%d,%s)", errno, strerror(errno));
-    return eFrameworkunifiedStatusFail;
-  }
-
-  *temperature = temp;
-  return eFrameworkunifiedStatusOK;
-}
-
-// Get SoC temperature value.
-EFrameworkunifiedStatus GetSoCTemperature(float *temperature) {
-  if (NULL == temperature) {
-    FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "parameter *temperature is null");
-    return eFrameworkunifiedStatusNullPointer;
-  }
-
-  // Get temperature from thermal_zone0
-  int64_t temperature0 = 0;
-  EFrameworkunifiedStatus e_status = GetCoreTemperature(&temperature0, THERMAL_ZONE0_TEMPERATURE_PATH);
-  if (eFrameworkunifiedStatusOK != e_status) {
-    FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "get temperature0 failed");
-    return eFrameworkunifiedStatusFail;
-  }
-
-  // Get temperature from thermal_zone1
-  int64_t temperature1 = 0;
-  e_status = GetCoreTemperature(&temperature1, THERMAL_ZONE1_TEMPERATURE_PATH);
-  if (eFrameworkunifiedStatusOK != e_status) {
-    FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "get temperature1 failed");
-    return eFrameworkunifiedStatusFail;
-  }
-
-  // Get temperature from thermal_zone2
-  int64_t temperature2 = 0;
-  e_status = GetCoreTemperature(&temperature2, THERMAL_ZONE2_TEMPERATURE_PATH);
-  if (eFrameworkunifiedStatusOK != e_status) {
-    FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "get temperature2 failed");
-    return eFrameworkunifiedStatusFail;
-  }
-
-  // get max temperature
-  int64_t max_temperature = temperature0;
-  if (max_temperature < temperature1) {
-    max_temperature = temperature1;
-  }
-  if (max_temperature < temperature2) {
-    max_temperature = temperature2;
-  }
-
-  *temperature = max_temperature / 1000.0f;
-  return eFrameworkunifiedStatusOK;
-}