diff options
| author |   takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 13:17:27 +0900 |
|---|---|---|
| committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 13:17:27 +0900 |
| commit | d1ef5faae9f97d0a477733f6c518901d0e924a13 (patch) | |
| tree | 8dc230d99c442869346c175c3fdb1d89ad0c4b6d | |
| parent | 235ab8f4a66f124005f6bd259f42eed19064a6df (diff) | |
ss-interfaceunified branch 0.1sandbox/ToshikazuOhiwa/ss-interfaceunified
75 files changed, 207 insertions, 692 deletions
diff --git a/interface_unified/Makefile.client b/interface_unified/Makefile.client index 926ba4a3..de16e15c 100644 --- a/interface_unified/Makefile.client +++ b/interface_unified/Makefile.client @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. +# @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. @@ -19,12 +19,14 @@ SUBDIRS := library install:install_cfg install_cfg_pram install_cfg_pram: - install -d -m 775 $(DESTDIR)/usr/agl/conf/systemmanager - install -m 644 -t $(DESTDIR)/usr/agl/conf/systemmanager scfg_pram/*.cfg + install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata + install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg install_cfg: - install -d -m 775 $(DESTDIR)/usr/agl/share/systemmanager/scfg - install -m 644 -t $(DESTDIR)/usr/agl/share/systemmanager/scfg scfg/*.cfg + install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata + install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg + install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata + install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata scfg/ss_logger.cfg include ../system_service.mk diff --git a/interface_unified/library/Makefile b/interface_unified/library/Makefile index 3e97fb7a..e7845504 100644 --- a/interface_unified/library/Makefile +++ b/interface_unified/library/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/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.h b/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.h index 568f9c0b..62f32b94 100644 --- a/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.h +++ b/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.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/interface_unified/library/include/ss_last_to_order_local.h b/interface_unified/library/include/ss_last_to_order_local.h index e3c9b191..889a7334 100644 --- a/interface_unified/library/include/ss_last_to_order_local.h +++ b/interface_unified/library/include/ss_last_to_order_local.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. @@ -33,7 +33,7 @@ #include <string> -#define SS_LAST_TO_ORDER_CONF_PATH "/usr/agl/conf/systemmanager/sm_last2order.cfo" +#define SS_LAST_TO_ORDER_CONF_PATH "/usr/agl/conf/BS/ss/system_manager/rodata/sm_last2order.cfo" #endif // INTERFACE_UNIFIED_LIBRARY_INCLUDE_SS_LAST_TO_ORDER_LOCAL_H_ /** @}*/ diff --git a/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.h b/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.h index 7805e673..8989bf6b 100644 --- a/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.h +++ b/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.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/interface_unified/library/include/ss_power_if_interfaceunifiedlog.h b/interface_unified/library/include/ss_power_if_interfaceunifiedlog.h index 903ea882..d198030e 100644 --- a/interface_unified/library/include/ss_power_if_interfaceunifiedlog.h +++ b/interface_unified/library/include/ss_power_if_interfaceunifiedlog.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/interface_unified/library/include/ss_system_if_interfaceunifiedlog.h b/interface_unified/library/include/ss_system_if_interfaceunifiedlog.h index 16914c07..81ef0167 100644 --- a/interface_unified/library/include/ss_system_if_interfaceunifiedlog.h +++ b/interface_unified/library/include/ss_system_if_interfaceunifiedlog.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/interface_unified/library/include/ss_system_timer_local.h b/interface_unified/library/include/ss_system_timer_local.h index 8600200c..d694bdd0 100644 --- a/interface_unified/library/include/ss_system_timer_local.h +++ b/interface_unified/library/include/ss_system_timer_local.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/interface_unified/library/include/system_service/interface_unified.h b/interface_unified/library/include/system_service/interface_unified.h index e172f2e5..a25423a8 100644 --- a/interface_unified/library/include/system_service/interface_unified.h +++ b/interface_unified/library/include/system_service/interface_unified.h @@ -1,5 +1,5 @@ // -// @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. +// @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. diff --git a/interface_unified/library/include/system_service/interfaceunified_system_application.h b/interface_unified/library/include/system_service/interfaceunified_system_application.h index dfe3a8b1..fe5224ed 100644 --- a/interface_unified/library/include/system_service/interfaceunified_system_application.h +++ b/interface_unified/library/include/system_service/interfaceunified_system_application.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/interface_unified/library/include/system_service/interfaceunified_system_types.h b/interface_unified/library/include/system_service/interfaceunified_system_types.h index 35eb2c3d..d3d3abd9 100644 --- a/interface_unified/library/include/system_service/interfaceunified_system_types.h +++ b/interface_unified/library/include/system_service/interfaceunified_system_types.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/interface_unified/library/include/system_service/ss_boot_map.h b/interface_unified/library/include/system_service/ss_boot_map.h index 4c09f104..364d5edf 100644 --- a/interface_unified/library/include/system_service/ss_boot_map.h +++ b/interface_unified/library/include/system_service/ss_boot_map.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2019-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/interface_unified/library/include/system_service/ss_client_names.h b/interface_unified/library/include/system_service/ss_client_names.h index ec5c09a0..23604a19 100644 --- a/interface_unified/library/include/system_service/ss_client_names.h +++ b/interface_unified/library/include/system_service/ss_client_names.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/interface_unified/library/include/system_service/ss_devicedetection_service.h b/interface_unified/library/include/system_service/ss_devicedetection_service.h index 960be01a..134ab1fb 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service.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. @@ -95,6 +95,18 @@ typedef struct _UsbInfo { */ uint8_t reserved[2]; /** + * \~english Manufacturer Name + */ + CHAR manufacturerName[SS_DEV_NAME_SIZE]; // Manufacturer Name + /** + * \~english Product Name + */ + CHAR productName[SS_DEV_NAME_SIZE]; // Product Name + /** + * \~english Serial Number + */ + CHAR serial_no[SS_DEV_NAME_SIZE]; // Serial Number + /** * \~english Device file path */ int8_t deviceFile[FILEPATH_SIZE]; // Device file path @@ -486,6 +498,33 @@ typedef struct _VehicleCtrlDetectInfo { int8_t deviceFile[FILEPATH_SIZE]; // Vehicle control device file }SS_VehicleCtrlDetectInfo; +// Structure for audio detect info. +/** + * \~english Structure for audio detect info. + */ +typedef struct _AudioDetectInfo { + /** + * \~english Insert:TURE, Remove:FALSE + */ + BOOL bIsDeviceAvailable; + /** + * \~english USB Infomation + */ + SS_UsbInfo usb_info; + /** + * \~english Audio control device file + */ + int8_t audio_ctrl[FILEPATH_SIZE]; + /** + * \~english Audio Playback device file + */ + int8_t audio_play[FILEPATH_SIZE]; + /** + * \~english Audio Capture device file + */ + int8_t audio_capture[FILEPATH_SIZE]; +}SS_AudioDetectInfo; + // Structure that is available when SS_DEV_DETECT_USB_DSRC_APP_EV is published. /** * \~english Structure that is available when SS_DEV_DETECT_USB_DSRC_APP_EV is published. diff --git a/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.h b/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.h index 12999ca1..1ad7e672 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.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. @@ -392,6 +392,7 @@ class DeviceDetectionServiceIf { /// - SS_DEV_INFO_SD_FORMAT_COMP_EV : Notify the SD format results /// - SS_DEV_DETECT_ANY_USB_DCM_NCM_EV : Notify the insertion and removal and network IF name of the USB /// NCM class device(for DCM) + /// - SS_DEV_INFO_ANY_USB_DVDP_EV : Notify the insertion and removal of the DVD-P device /// \~english @par /// For SS_DEV_INFO_ANY_USB_NOTIFY_EV, it is also notified in the event the following conditions. /// - When the enumeration failed. @@ -489,6 +490,7 @@ class DeviceDetectionServiceIf { /// - SS_DEV_DETECT_FILEPATHNAME_EV : Notify the specified file access in pfilepath /// - SS_DEV_DETECT_ANY_USB_DCM_NCM_EV : Notify the insertion and removal and network IF name of the USB /// NCM class device(for DCM) + /// - SS_DEV_INFO_ANY_USB_DVDP_EV : Notify the insertion and removal of the DVD-P device /// \~english @par /// For SS_DEV_INFO_ANY_USB_NOTIFY_EV, it is also notified in the event the following conditions. /// - When the enumeration failed. @@ -879,10 +881,6 @@ class DeviceDetectionServiceIf { /// uint8_t - USB port number /// \~english @param [in] inteval /// uint8_t - interval (interval * 100 [msec]) - /// \~english @par - /// - USB0 : SS_DEV_USB_PORT0 - /// - USB1 : SS_DEV_USB_PORT1 - /// - USB2 : SS_DEV_USB_PORT2 /// \~english @retval eFrameworkunifiedStatusOK Success /// \~english @retval eFrameworkunifiedStatusInvldParam Invalid parameter /// \~english @retval eFrameworkunifiedStatusInvldHandle Invalid handle @@ -898,12 +896,12 @@ class DeviceDetectionServiceIf { /// - SS_DeviceDetectionService process has been started. /// - Generation/initialization of Dispatcher for the Application (FrameworkunifiedCreateDispatcherWithoutLoop etc) \n /// has been done, and Availability of Device Detection Service is TRUE. + /// - Checking USB port number should be done before calling this API. /// \~english @par Change of the internal state /// - The internal state is not changed. /// \~english @par Causes of failures /// - HANDLES in the class member variables (m_hSession) is NULL. [eFrameworkunifiedStatusInvldHandle] /// - Environment variable (TARGET_BOARD) is not defined. [eFrameworkunifiedStatusFail] - /// - Port number of USB, which is specified by the argument (port) is not correct(Not USB0/USB1/USB2). /// [eFrameworkunifiedStatusInvldParam] /// - Name of the target board in the environment variable (TARGET_BOARD) is not correct. [eFrameworkunifiedStatusInvldParam] /// - HANDLE (m_hSession) in the class member variables are not appropriate(which is invalid). @@ -938,7 +936,7 @@ class DeviceDetectionServiceIf { /// Environment variable (TARGET_BOARD) is defined in the configure options \n /// specified at the time of build. \n /// (Example. TARGET_BOARD:_CWORD71__CWORD91__e2_na_t__CWORD84_2__CWORD71_) \n - /// Before reset SS_DEV_USB_PORT1(for DCM), the device files(dcm_acm, dcm_vc, dcm_wdm)\n + /// Before reset USB port for DCM, the device files(dcm_acm, dcm_vc, dcm_wdm) \n /// related to DCM-related must be closed. \n /// *) Device file may not be created correctly when the process of Disconnect/Connect \n /// without closing to work. diff --git a/interface_unified/library/include/system_service/ss_devicedetection_service_local.h b/interface_unified/library/include/system_service/ss_devicedetection_service_local.h index 245b71d7..c85e6b30 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service_local.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service_local.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/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.h b/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.h index 98a75c43..7de03b98 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.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/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.h b/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.h index 99da3884..cb54ee57 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.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. @@ -126,6 +126,10 @@ typedef enum _DeviceDetectionServerEvents { * \~english Notify whenever a USB NCM device is connected/removed (for DCM) */ SS_DEV_DETECT_ANY_USB_DCM_NCM_EV = 140, + /** + * \~english Notify whenever a DVD-P device is connected/removed + */ + SS_DEV_INFO_ANY_USB_DVDP_EV = 141, } SS_DeviceDetectionServerEvents; #ifdef __cplusplus diff --git a/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.h b/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.h index c8fd16b8..4b7be37a 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.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/interface_unified/library/include/system_service/ss_devicedetection_service_types.h b/interface_unified/library/include/system_service/ss_devicedetection_service_types.h index 03f0ff4f..c5ab1c3b 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service_types.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service_types.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/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.h b/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.h index 0203912a..dafd4d4e 100644 --- a/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.h +++ b/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.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/interface_unified/library/include/system_service/ss_error_event_common.h b/interface_unified/library/include/system_service/ss_error_event_common.h index b8772a46..ce7677f9 100644 --- a/interface_unified/library/include/system_service/ss_error_event_common.h +++ b/interface_unified/library/include/system_service/ss_error_event_common.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. @@ -88,21 +88,14 @@ enum EArtifactId { eArtifactIdCmsLogs, eArtifactIDInternalDTC, eArtifactIdComDebugLog, // << ID 15 - eArtifactIdRadioDebugLog, - eArtifactIdConnectivityDebugLog, eArtifactIdKernelBootLog, - eArtifactIdGraphicsDebugLog, - eArtifactIdSysLog, eArtifactIdPstoreLog, eArtifactIdClearAllLog, eArtifactIdNaviLog, - eArtifactIdWinSysLog, - eArtifactIdAppFwLog, - eArtifactIdTomoyoLog, eArtifactIdScreenShot, // These three Log entries have to remain eArtifactIdDebugFolder2Content, // at the end of the list eArtifactIdDebugFolderContent, - eArtifactIdMaxValue // << 30 + eArtifactIdMaxValue // << 23 }; struct ARTIFACT_RESPONSE { diff --git a/interface_unified/library/include/system_service/ss_error_event_common_local.h b/interface_unified/library/include/system_service/ss_error_event_common_local.h index dfbfa5de..47da0d30 100644 --- a/interface_unified/library/include/system_service/ss_error_event_common_local.h +++ b/interface_unified/library/include/system_service/ss_error_event_common_local.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/interface_unified/library/include/system_service/ss_error_message.h b/interface_unified/library/include/system_service/ss_error_message.h index d2542e89..e810d7ba 100644 --- a/interface_unified/library/include/system_service/ss_error_message.h +++ b/interface_unified/library/include/system_service/ss_error_message.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/interface_unified/library/include/system_service/ss_heartbeat_if.h b/interface_unified/library/include/system_service/ss_heartbeat_if.h index 4fcf43df..e5a94e55 100644 --- a/interface_unified/library/include/system_service/ss_heartbeat_if.h +++ b/interface_unified/library/include/system_service/ss_heartbeat_if.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/interface_unified/library/include/system_service/ss_heartbeat_notifications.h b/interface_unified/library/include/system_service/ss_heartbeat_notifications.h index e50baba8..8b25fe15 100644 --- a/interface_unified/library/include/system_service/ss_heartbeat_notifications.h +++ b/interface_unified/library/include/system_service/ss_heartbeat_notifications.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/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.h b/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.h index d8c521cd..6d31d047 100644 --- a/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.h +++ b/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.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/interface_unified/library/include/system_service/ss_last_to_order.h b/interface_unified/library/include/system_service/ss_last_to_order.h index 64670fb1..5a3b8b02 100644 --- a/interface_unified/library/include/system_service/ss_last_to_order.h +++ b/interface_unified/library/include/system_service/ss_last_to_order.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/interface_unified/library/include/system_service/ss_logger_service.h b/interface_unified/library/include/system_service/ss_logger_service.h index 1361f3e0..67ecb08b 100644 --- a/interface_unified/library/include/system_service/ss_logger_service.h +++ b/interface_unified/library/include/system_service/ss_logger_service.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/interface_unified/library/include/system_service/ss_logger_service_ifc.h b/interface_unified/library/include/system_service/ss_logger_service_ifc.h index 174227a6..2646c732 100644 --- a/interface_unified/library/include/system_service/ss_logger_service_ifc.h +++ b/interface_unified/library/include/system_service/ss_logger_service_ifc.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/interface_unified/library/include/system_service/ss_logger_service_local.h b/interface_unified/library/include/system_service/ss_logger_service_local.h index 9169dc58..0261f2e7 100644 --- a/interface_unified/library/include/system_service/ss_logger_service_local.h +++ b/interface_unified/library/include/system_service/ss_logger_service_local.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/interface_unified/library/include/system_service/ss_logger_service_notifications.h b/interface_unified/library/include/system_service/ss_logger_service_notifications.h index c89aa5af..7a5fc3dc 100644 --- a/interface_unified/library/include/system_service/ss_logger_service_notifications.h +++ b/interface_unified/library/include/system_service/ss_logger_service_notifications.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/interface_unified/library/include/system_service/ss_logger_service_protocol.h b/interface_unified/library/include/system_service/ss_logger_service_protocol.h index 0a0002ac..36c602c2 100644 --- a/interface_unified/library/include/system_service/ss_logger_service_protocol.h +++ b/interface_unified/library/include/system_service/ss_logger_service_protocol.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/interface_unified/library/include/system_service/ss_logger_store_logs.h b/interface_unified/library/include/system_service/ss_logger_store_logs.h index 1cf9dce7..7c68fd9d 100644 --- a/interface_unified/library/include/system_service/ss_logger_store_logs.h +++ b/interface_unified/library/include/system_service/ss_logger_store_logs.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. @@ -42,7 +42,7 @@ #ifdef _cplusplus extern "C" { #endif -#define SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG "/ramd/log/frameworkunifiedlog/SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG" +#define SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG" typedef enum { SS_STORELOGS_INTERFACEUNIFIEDLOG = 0, diff --git a/interface_unified/library/include/system_service/ss_power_service.h b/interface_unified/library/include/system_service/ss_power_service.h index 656c4314..15ba0338 100644 --- a/interface_unified/library/include/system_service/ss_power_service.h +++ b/interface_unified/library/include/system_service/ss_power_service.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. @@ -276,7 +276,7 @@ typedef enum { // * }ePowerSrvStartupStageType, EPWR_STARTUP_STAGE_TYPE; // * // * typedef struct _SystemModeInfo { // * - EPWR_USER_MODE_TYPE lastUserMode; // * + EPWR_USER_MODE_TYPE lastUserMode; // NOTE: Don't use this. just only remained for backward compatibility. EPWR_LHC_TYPE limpHomeCutoff; // * EPWR_PROD_MODE_TYPE productionMode; // * EPWR_TRANSPORT_MODE_TYPE transportMode; // * diff --git a/interface_unified/library/include/system_service/ss_power_service_if.h b/interface_unified/library/include/system_service/ss_power_service_if.h index edb7dc9e..d0ace60c 100644 --- a/interface_unified/library/include/system_service/ss_power_service_if.h +++ b/interface_unified/library/include/system_service/ss_power_service_if.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/interface_unified/library/include/system_service/ss_power_service_local.h b/interface_unified/library/include/system_service/ss_power_service_local.h index 4cf33a93..51a284aa 100644 --- a/interface_unified/library/include/system_service/ss_power_service_local.h +++ b/interface_unified/library/include/system_service/ss_power_service_local.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/interface_unified/library/include/system_service/ss_power_service_notifications.h b/interface_unified/library/include/system_service/ss_power_service_notifications.h index f5f156b1..b25172df 100644 --- a/interface_unified/library/include/system_service/ss_power_service_notifications.h +++ b/interface_unified/library/include/system_service/ss_power_service_notifications.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/interface_unified/library/include/system_service/ss_power_service_notifications_local.h b/interface_unified/library/include/system_service/ss_power_service_notifications_local.h index 8cd68dbc..a06c0309 100644 --- a/interface_unified/library/include/system_service/ss_power_service_notifications_local.h +++ b/interface_unified/library/include/system_service/ss_power_service_notifications_local.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/interface_unified/library/include/system_service/ss_power_service_protocol.h b/interface_unified/library/include/system_service/ss_power_service_protocol.h index e632e879..92860e8e 100644 --- a/interface_unified/library/include/system_service/ss_power_service_protocol.h +++ b/interface_unified/library/include/system_service/ss_power_service_protocol.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/interface_unified/library/include/system_service/ss_services.h b/interface_unified/library/include/system_service/ss_services.h index c8b6b4d6..d414670e 100644 --- a/interface_unified/library/include/system_service/ss_services.h +++ b/interface_unified/library/include/system_service/ss_services.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/interface_unified/library/include/system_service/ss_sm_client_if.h b/interface_unified/library/include/system_service/ss_sm_client_if.h index 44fa6509..70b9425f 100644 --- a/interface_unified/library/include/system_service/ss_sm_client_if.h +++ b/interface_unified/library/include/system_service/ss_sm_client_if.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. @@ -77,76 +77,6 @@ extern EFrameworkunifiedStatus RegisterSMSessionAckCallback(EFrameworkunifiedStatus (*CallbackPtr)(HANDLE)); ///////////////////////////////////////////////////////////////////////////////////// -/// \ingroup SendBootModeSetRequestToSystemManager -/// \~english @par Summary -/// API to record the mode of the next boot in a non-volatile area. -/// \~english @param [in] hostBootMode -/// ESMBootModeInfo - BOOT mode information -/// \~english @par -/// - e_SS_SM_BOOT_MODE_APPLICATION : Normal start -/// - e_SS_SM_BOOT_MODE_PROGRAMMING : Version up start -/// \~english @retval eFrameworkunifiedStatusOK Success -/// \~english @retval eFrameworkunifiedStatusInvldParam Invalid parameter -/// \~english @retval eFrameworkunifiedStatusNullPointer Invalid pointer -/// \~english @retval eFrameworkunifiedStatusInvldHandle Invalid handle -/// \~english @retval eFrameworkunifiedStatusInvldHndlType Invalid type of handle -/// \~english @retval eFrameworkunifiedStatusMsgQFull Message queue is full -/// \~english @retval eFrameworkunifiedStatusErrNoEBADF Invalid File-Descriptor -/// \~english @retval eFrameworkunifiedStatusErrNoEINTR An interrupt is generated by the system call (signal) -/// \~english @retval eFrameworkunifiedStatusInvldBufSize Invalid buffer-size -/// \~english @retval eFrameworkunifiedStatusFail Some sort of error occurred -/// \~english @retval eFrameworkunifiedStatusErrOther Other error(It failed to open/allocation of shared memory) -/// \~english @par Preconditions -/// - Dispatcher for the System Manager is generated, and Availability of the service is TRUE. -/// \~english @par Change of the internal state -/// - The internal state is not changed. -/// \~english @par Causes of failures -/// - Specified BOOT mode information is invalid(In the case of value which does not correspond to enum -/// ESMBootModeInfo). [eFrameworkunifiedStatusInvldParam] -/// - System Manager of the session does not exist. [eFrameworkunifiedStatusNullPointer] -/// - System Manager handle for the session is NULL. [eFrameworkunifiedStatusInvldHandle] -/// - System Manager handle type for the session is not a transmission type. [eFrameworkunifiedStatusInvldHndlType] -/// - System Manager message queue for the session is full. [eFrameworkunifiedStatusMsgQFull] -/// - Transmission for the file descriptor of System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusErrNoEBADF] -/// - Place to interrupt by the system call (signal) has occurred during the transmission of the System Manager -/// message for the session. [eFrameworkunifiedStatusErrNoEINTR] -/// - Size of the transmission buffer of the System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusInvldBufSize] -/// - Any error has occurred at the time of transmission of the System Manager message for the session. -/// [eFrameworkunifiedStatusFail] -/// - Transmission of System Manager message for the session fails to shared memory access. [eFrameworkunifiedStatusErrOther] -/// \~english @par Classification -/// Public -/// \~english @par Type -/// Method only -/// \~english @par Detail -/// This function is called to set boot mode information in System Manager.\n -/// To set the next time BOOT mode, in the Notification name of NTFY_SSHUBootModes, broadcast to Subscribers.\n -/// Message specification of asynchronous response is sent to the caller.as follows: -/// - Command:\ref SS_SM_BOOT_MODE_SET_RESP -/// - Message Data:\ref TSystemManagerBootModeRequestResponse -/// \~english @code -/// typedef struct T_SystemManagerBootModeRequestResponse -/// { -/// ESMBootModeInfo hostBootMode; -/// EFrameworkunifiedStatus eFrameworkunifiedStatus; -/// }TSystemManagerBootModeRequestResponse; -/// #define NTFY_SSHUBootModes "SS_SysManager/HeadUnitBootModes" -/// @endcode -/// \~english @par -/// hostBootMode:BOOT mode -/// - e_SS_SM_BOOT_MODE_APPLICATION: Normal start -/// - e_SS_SM_BOOT_MODE_PROGRAMMING: Version up start -/// \~english @par -/// eFrameworkunifiedStatus:Result -/// - eFrameworkunifiedStatusOK:Success -/// - Except eFrameworkunifiedStatusOK:Fail -/// \~english @see None -//////////////////////////////////////////////////////////////////////////////////// -extern EFrameworkunifiedStatus SendBootModeSetRequestToSystemManager(ESMBootModeInfo hostBootMode); - -///////////////////////////////////////////////////////////////////////////////////// /// \ingroup SetDataResetModeToSystemManager /// \~english @par Summary /// API to record the data reset mode of the next boot in a non-volatile area. @@ -329,174 +259,6 @@ extern EFrameworkunifiedStatus SetProgUpdateStateToSystemManager(SMProgUpdateSta extern EFrameworkunifiedStatus SendCpuResetRequestToSystemManager(ESMCpuResetReason l_eCpuResetReason, std::string f_messageStr = "", std::string f_suffixStr = ""); -///////////////////////////////////////////////////////////////////////////////////// -/// \ingroup SetBootLoaderInfoRequestToSystemManager -/// \~english @par Summary -/// API to perform a write request to the specified field of shared memory with BootLoader. -/// \~english @param [in] f_type -/// ESMBootInfoType - Configuration information type -/// \~english @param [in] f_value -/// UI_32 - Set value -/// \~english @par -/// enum ESMBootInfoType Variable -/// - e_SS_SM_BOOT_INFO_MDUPDATE : Writing to LBM_RAM_t.mdUpdate -/// - e_SS_SM_BOOT_INFO_SDUPDATE : Writing to LBM_RAM_t.sdUpdate -/// \~english @retval eFrameworkunifiedStatusOK Success -/// \~english @retval eFrameworkunifiedStatusInvldParam Invalid parameter -/// \~english @retval eFrameworkunifiedStatusNullPointer Invalid pointer -/// \~english @retval eFrameworkunifiedStatusInvldHandle Invalid handle -/// \~english @retval eFrameworkunifiedStatusInvldHndlType Invalid type of handle -/// \~english @retval eFrameworkunifiedStatusMsgQFull Message queue is full -/// \~english @retval eFrameworkunifiedStatusErrNoEBADF Invalid File-Descriptor -/// \~english @retval eFrameworkunifiedStatusErrNoEINTR An interrupt is generated by the system call (signal) -/// \~english @retval eFrameworkunifiedStatusInvldBufSize Invalid buffer-size -/// \~english @retval eFrameworkunifiedStatusBadConnection Socket connection error -/// \~english @retval eFrameworkunifiedStatusFail Some sort of error occurred -/// \~english @retval eFrameworkunifiedStatusErrOther Other error(It failed to open/allocation of shared memory) -/// \~english @par Preconditions -/// - Dispatcher for the System Manager is generated, and Availability of the service is TRUE. -/// \~english @par Change of the internal state -/// - The internal state is not changed. -/// \~english @par Causes of failures -/// - Information type is illegal (in the case of a value that does not correspond to the enum ESMBootInfoType). -/// [eFrameworkunifiedStatusInvldParam] -/// - System Manager of the session does not exist. [eFrameworkunifiedStatusNullPointer] -/// - System Manager handle for the session is NULL. [eFrameworkunifiedStatusInvldHandle] -/// - System Manager handle type for the session is not a send and receive type. [eFrameworkunifiedStatusInvldHndlType] -/// - System Manager message queue for the session is full. [eFrameworkunifiedStatusMsgQFull] -/// - Send and receive for the file descriptor of System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusErrNoEBADF] -/// - Place to interrupt by the system call (signal) has occurred during the send and receive of the System -/// Manager message for the session. [eFrameworkunifiedStatusErrNoEINTR] -/// - Size of the send and receive buffer of the System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusInvldBufSize] -/// - Send and receive and reception of System Manager message for the session fails to socket connection. -/// [eFrameworkunifiedStatusBadConnection] -/// - Any error has occurred at the time of send and receive of the System Manager message for the session. -/// [eFrameworkunifiedStatusFail] -/// - Send and receive of System Manager message for the session fails to shared memory access. -/// [eFrameworkunifiedStatusErrOther] -/// \~english @par Classification -/// Public -/// \~english @par Type -/// Sync only(None communication) -/// \~english @par Detail -/// For the specified field in f_type, writing of the value of f_value.\n -/// See the include/cls/ss_boot_map.h for the meaning of the value of each field and f_value. -/// \~english @see -/// None -//////////////////////////////////////////////////////////////////////////////////// -extern EFrameworkunifiedStatus SetBootLoaderInfoRequestToSystemManager(ESMBootInfoType f_type, UI_32 f_value); - - -///////////////////////////////////////////////////////////////////////////////////// -/// \ingroup GetBootLoaderInfoRequestToSystemManager -/// \~english @par Summary -/// This function is called to get Boot-Loader Information. -/// \~english @param [out] p_info -/// void* - pointer for Boot-Loader Information -/// \~english @retval eFrameworkunifiedStatusOK Success -/// \~english @retval eFrameworkunifiedStatusNullPointer Invalid pointer -/// \~english @retval eFrameworkunifiedStatusInvldHandle Invalid handle -/// \~english @retval eFrameworkunifiedStatusInvldHndlType Invalid type of handle -/// \~english @retval eFrameworkunifiedStatusMsgQFull Message queue is full -/// \~english @retval eFrameworkunifiedStatusErrNoEBADF Invalid File-Descriptor -/// \~english @retval eFrameworkunifiedStatusErrNoEINTR An interrupt is generated by the system call (signal) -/// \~english @retval eFrameworkunifiedStatusInvldBufSize Invalid buffer-size -/// \~english @retval eFrameworkunifiedStatusBadConnection Socket connection error -/// \~english @retval eFrameworkunifiedStatusFail Some sort of error occurred -/// \~english @retval eFrameworkunifiedStatusErrOther Other error(It failed to open/allocation of shared memory) -/// \~english @par Preconditions -/// - Dispatcher for the System Manager is generated, and Availability of the service is TRUE. -/// \~english @par Change of the internal state -/// - The internal state is not changed. -/// \~english @par Causes of failures -/// - System Manager of the session does not exist. [eFrameworkunifiedStatusNullPointer] -/// - System Manager handle for the session is NULL. [eFrameworkunifiedStatusInvldHandle] -/// - System Manager handle type for the session is not a send and receive type. [eFrameworkunifiedStatusInvldHndlType] -/// - System Manager message queue for the session is full. [eFrameworkunifiedStatusMsgQFull] -/// - Send and receive for the file descriptor of System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusErrNoEBADF] -/// - Place to interrupt by the system call (signal) has occurred during the send and receive of the System -/// Manager message for the session. [eFrameworkunifiedStatusErrNoEINTR] -/// - Size of the send and receive buffer of the System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusInvldBufSize] -/// - Send and receive and reception of System Manager message for the session fails to socket connection. -/// [eFrameworkunifiedStatusBadConnection] -/// - Any error has occurred at the time of send and receive of the System Manager message for the session. -/// [eFrameworkunifiedStatusFail] -/// - Send and receive of System Manager message for the session fails to shared memory access. -/// [eFrameworkunifiedStatusErrOther] -/// \~english @par Classification -/// Public -/// \~english @par Type -/// Sync only(None communication) -/// \~english @par Detail -/// Get the Boot-Loader Information. -/// \~english @see -/// None -//////////////////////////////////////////////////////////////////////////////////// -extern EFrameworkunifiedStatus GetBootLoaderInfoRequestToSystemManager(void *p_info); - - -///////////////////////////////////////////////////////////////////////////////////// -/// \ingroup SetWakeupOrderToSystemManager -/// \~english @par Summary -/// API to save the boot order. -/// \~english @param [in] f_orderName -/// std::string - Boot order defined name -/// \~english @par -/// - Boot order defined name, it is 0-32byte. -/// \~english @retval eFrameworkunifiedStatusOK Success -/// \~english @retval eFrameworkunifiedStatusInvldParam Invalid parameter -/// \~english @retval eFrameworkunifiedStatusNullPointer Invalid pointer -/// \~english @retval eFrameworkunifiedStatusInvldHandle Invalid handle -/// \~english @retval eFrameworkunifiedStatusInvldHndlType Invalid type of handle -/// \~english @retval eFrameworkunifiedStatusMsgQFull Message queue is full -/// \~english @retval eFrameworkunifiedStatusErrNoEBADF Invalid File-Descriptor -/// \~english @retval eFrameworkunifiedStatusErrNoEINTR An interrupt is generated by the system call (signal) -/// \~english @retval eFrameworkunifiedStatusInvldBufSize Invalid buffer-size -/// \~english @retval eFrameworkunifiedStatusBadConnection Socket connection error -/// \~english @retval eFrameworkunifiedStatusFail Some sort of error occurred -/// \~english @retval eFrameworkunifiedStatusErrOther Other error(It failed to open/allocation of shared memory) -/// \~english @par Preconditions -/// - Dispatcher for the System Manager is generated, and Availability of the service is TRUE. -/// \~english @par Change of the internal state -/// - The internal state is not changed. -/// \~english @par Causes of failures -/// - Start-up sequence defined name (f_orderName) exceeds the 32Byte. [eFrameworkunifiedStatusInvldParam] -/// - System Manager of the session does not exist. [eFrameworkunifiedStatusNullPointer] -/// - System Manager handle for the session is NULL. [eFrameworkunifiedStatusInvldHandle] -/// - System Manager handle type for the session is not a send and receive type. [eFrameworkunifiedStatusInvldHndlType] -/// - System Manager message queue for the session is full. [eFrameworkunifiedStatusMsgQFull] -/// - Send and receive for the file descriptor of System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusErrNoEBADF] -/// - Place to interrupt by the system call (signal) has occurred during the send and receive of the System -/// Manager message for the session. [eFrameworkunifiedStatusErrNoEINTR] -/// - Size of the send and receive buffer of the System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusInvldBufSize] -/// - Send and receive and reception of System Manager message for the session fails to socket connection. -/// [eFrameworkunifiedStatusBadConnection] -/// - Any error has occurred at the time of send and receive of the System Manager message for the session. -/// [eFrameworkunifiedStatusFail] -/// - Send and receive of System Manager message for the session fails to shared memory access. -/// [eFrameworkunifiedStatusErrOther] -/// \~english @par Classification -/// Public -/// \~english @par Type -/// Sync only(None communication) -/// \~english @par Detail -/// It recorded the specified boot order in the f_orderName, the function return.\n -/// The value specified in the f_orderName able to refer to the include/cls/agl_wakeup_order.h .\n -/// If you specify a string of Length = 0 to f_orderName, discard the boot order. (= The default boot order) \n -/// In the order in which they are defined in the Order Configuration of the boot sequence specified in this \n -/// API at system startup do the start-up of the Group. \n -/// Boot sequence, discarded at the time of destruction of the completion of start-up time and the DRAM backup \n -/// of all services. -/// \~english @see None -//////////////////////////////////////////////////////////////////////////////////// -extern EFrameworkunifiedStatus SetWakeupOrderToSystemManager(std::string f_orderName); - //////////////////////////////////////////////////////////////////////////////////////////// /// \ingroup SetNextWakeupTypeToSystemManager /// \~english @par Summary @@ -525,57 +287,6 @@ extern EFrameworkunifiedStatus SetWakeupOrderToSystemManager(std::string f_order //////////////////////////////////////////////////////////////////////////////////////////// extern EFrameworkunifiedStatus SetNextWakeupTypeToSystemManager(ESMNextWakeupType f_wakeupType); -///////////////////////////////////////////////////////////////////////////////////// -/// \ingroup SendVarCodeDataToSystemManager -/// \~english @par Summary -/// In debugging, API to log the character information of variable code. -/// \~english @param [in] f_uiLength -/// UI_32 - Data length of f_data -/// \~english @param [in] f_data -/// void - Variable code(char type) -/// \~english @retval eFrameworkunifiedStatusOK Success -/// \~english @retval eFrameworkunifiedStatusInvldBuf Invalid buffer -/// \~english @retval eFrameworkunifiedStatusNullPointer Invalid pointer -/// \~english @retval eFrameworkunifiedStatusInvldHandle Invalid handle -/// \~english @retval eFrameworkunifiedStatusInvldHndlType Invalid type of handle -/// \~english @retval eFrameworkunifiedStatusMsgQFull Message queue is full -/// \~english @retval eFrameworkunifiedStatusErrNoEBADF Invalid File-Descriptor -/// \~english @retval eFrameworkunifiedStatusErrNoEINTR An interrupt is generated by the system call (signal) -/// \~english @retval eFrameworkunifiedStatusInvldBufSize Invalid buffer-size -/// \~english @retval eFrameworkunifiedStatusFail Some sort of error occurred -/// \~english @retval eFrameworkunifiedStatusErrOther Other error(It failed to open/allocation of shared memory) -/// \~english @par Preconditions -/// - Dispatcher for the System Manager is generated, and Availability of the service is TRUE. -/// \~english @par Change of the internal state -/// - The internal state is not changed. -/// \~english @par Causes of failures -/// - Variable code f_data is NULL. [eFrameworkunifiedStatusInvldBuf] -/// - System Manager of the session does not exist. [eFrameworkunifiedStatusNullPointer] -/// - System Manager handle for the session is NULL. [eFrameworkunifiedStatusInvldHandle] -/// - System Manager handle type for the session is not a transmission type. [eFrameworkunifiedStatusInvldHndlType] -/// - System Manager message queue for the session is full. [eFrameworkunifiedStatusMsgQFull] -/// - Transmission for the file descriptor of System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusErrNoEBADF] -/// - Place to interrupt by the system call (signal) has occurred during the transmission of the System Manager -/// message for the session. [eFrameworkunifiedStatusErrNoEINTR] -/// - Size of the transmission buffer of the System Manager message for the session is invalid. -/// [eFrameworkunifiedStatusInvldBufSize] -/// - Any error has occurred at the time of transmission of the System Manager message for the session. -/// [eFrameworkunifiedStatusFail] -/// - Transmission of System Manager message for the session fails to shared memory access. [eFrameworkunifiedStatusErrOther] -/// \~english @par Classification -/// Public -/// \~english @par Type -/// Fire and Forget only -/// \~english @par Detail -/// The character string information specified in f_data upon LOG saving, -/// and outputs the system information LOG. -/// \~english @see SendClearLogsRequestToSystemManager -//////////////////////////////////////////////////////////////////////////////////// -extern EFrameworkunifiedStatus SendVarCodeDataToSystemManager(UI_32 f_uiLength, - void *f_data); - - ///////////////////////////////////////////////////////////////////////////////////// /// \ingroup Set_UseStopCompleteNotificationVsInterfaceunifiedOnStopFnc_StateVar diff --git a/interface_unified/library/include/system_service/ss_sm_client_if_local.h b/interface_unified/library/include/system_service/ss_sm_client_if_local.h index 092795e0..a4d0fa99 100644 --- a/interface_unified/library/include/system_service/ss_sm_client_if_local.h +++ b/interface_unified/library/include/system_service/ss_sm_client_if_local.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/interface_unified/library/include/system_service/ss_sm_thread_names.h b/interface_unified/library/include/system_service/ss_sm_thread_names.h index a2dae872..61ee2759 100644 --- a/interface_unified/library/include/system_service/ss_sm_thread_names.h +++ b/interface_unified/library/include/system_service/ss_sm_thread_names.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/interface_unified/library/include/system_service/ss_sm_thread_names_local.h b/interface_unified/library/include/system_service/ss_sm_thread_names_local.h index c3b2d494..36dda068 100644 --- a/interface_unified/library/include/system_service/ss_sm_thread_names_local.h +++ b/interface_unified/library/include/system_service/ss_sm_thread_names_local.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/interface_unified/library/include/system_service/ss_string_maps.h b/interface_unified/library/include/system_service/ss_string_maps.h index 458e6bdd..4001ed44 100644 --- a/interface_unified/library/include/system_service/ss_string_maps.h +++ b/interface_unified/library/include/system_service/ss_string_maps.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/interface_unified/library/include/system_service/ss_sys_boot_area_map.h b/interface_unified/library/include/system_service/ss_sys_boot_area_map.h index f7ca5a2c..7df0c889 100644 --- a/interface_unified/library/include/system_service/ss_sys_boot_area_map.h +++ b/interface_unified/library/include/system_service/ss_sys_boot_area_map.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/interface_unified/library/include/system_service/ss_system_if.h b/interface_unified/library/include/system_service/ss_system_if.h index cbdab4c6..1e3ef149 100644 --- a/interface_unified/library/include/system_service/ss_system_if.h +++ b/interface_unified/library/include/system_service/ss_system_if.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/interface_unified/library/include/system_service/ss_system_manager_if.h b/interface_unified/library/include/system_service/ss_system_manager_if.h index a56b046d..e6b4f8de 100644 --- a/interface_unified/library/include/system_service/ss_system_manager_if.h +++ b/interface_unified/library/include/system_service/ss_system_manager_if.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. @@ -130,36 +130,12 @@ typedef enum { }ESMServiceWakeupStatus; /// \ingroup system_manager -typedef struct T_SystemManagerBootModeRequestResponse { - ESMBootModeInfo hostBootMode; - EFrameworkunifiedStatus eFrameworkunifiedStatus; -}TSystemManagerBootModeRequestResponse; - -typedef enum { - e_SS_SM_BOOT_INFO_MDUPDATE, - -// e_SS_SM_BOOT_INFO_SDUPDATE - e_SS_SM_BOOT_INFO_SDUPDATE, - e_SS_SM_BOOT_INFO_OPDTUPDATE - -}ESMBootInfoType; - -typedef struct { - ESMBootInfoType type; - UI_32 value; -}TSystemManagerBootInfoStruct; - -/// \ingroup system_manager /// \brief Data Reset Reason typedef struct T_SS_BootModeListStruct { ESMBootModeInfo hostBootMode; EPWR_SC__CWORD56__BOOT_MODE_TYPE _CWORD56_BootMode; } TSS_BootModeListStruct; -typedef struct T_SystemManagerWakeupOrderInfo { - char order_name[SS_SM_ORDER_NAME_MAX]; -} TSystemManagerWakeupOrderInfo; - //**************************************************************************** /// \ingroup system_manager * /// Data passed in the NTFY_SSSystemMgrPowerOnOff and * diff --git a/interface_unified/library/include/system_service/ss_system_manager_if_local.h b/interface_unified/library/include/system_service/ss_system_manager_if_local.h index 76b4b88f..5c67aa62 100644 --- a/interface_unified/library/include/system_service/ss_system_manager_if_local.h +++ b/interface_unified/library/include/system_service/ss_system_manager_if_local.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/interface_unified/library/include/system_service/ss_system_manager_notifications.h b/interface_unified/library/include/system_service/ss_system_manager_notifications.h index e846d6a0..008d4f3f 100644 --- a/interface_unified/library/include/system_service/ss_system_manager_notifications.h +++ b/interface_unified/library/include/system_service/ss_system_manager_notifications.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. @@ -36,7 +36,6 @@ #define NTFY_SSSystemMgrPowerOnOff SERVICE_SYSMANAGER"/PowerOnOffState" ///< Power ON notification for // Audio & Display #define NTFY_SSSystemMgrStartUpType SERVICE_SYSMANAGER"/StartUpType" ///< Notification for start up type -#define NTFY_SSHUBootModes SERVICE_SYSMANAGER"/HeadUnitBootModes" ///< Notification for boot modes #define NTFY_SSServiceWakeupStatus SERVICE_SYSMANAGER"/ServiceWakeupStatus" ///< Service Wakeup state #define NTFY_SSNeedAplRestart SERVICE_SYSMANAGER"/NeedAplRestart" ///< Notification for Need APL Restart diff --git a/interface_unified/library/include/system_service/ss_system_manager_notifications_local.h b/interface_unified/library/include/system_service/ss_system_manager_notifications_local.h index ca151670..cbb743fe 100644 --- a/interface_unified/library/include/system_service/ss_system_manager_notifications_local.h +++ b/interface_unified/library/include/system_service/ss_system_manager_notifications_local.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/interface_unified/library/include/system_service/ss_system_manager_protocol.h b/interface_unified/library/include/system_service/ss_system_manager_protocol.h index c3d7ac22..99d7e13a 100644 --- a/interface_unified/library/include/system_service/ss_system_manager_protocol.h +++ b/interface_unified/library/include/system_service/ss_system_manager_protocol.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. @@ -76,23 +76,6 @@ typedef enum _SS_SystemManagerProtocol { //************************************************************************* //************************************************************************* - // Boot Mode Protocol: * - // * - // Request by Privileged clients to set the system boot mode: * - // Application, or * - // Programming * - // * - // The Set Request message carries the requested Boot Mode. * - // The Set Response message carries the pass/fail of the Set request, * - // and if the Set request succeeded, the Boot Mode at the time the * - // Response message was generated. * - , SS_SM_BOOT_MODE_SET_REQ //!< Client to Service (Sys Mgr) - , SS_SM_BOOT_MODE_SET_RESP //!< Service (Sys Mgr) to Client - // * - // End of Boot Mode Protocol * - //************************************************************************* - - //************************************************************************* // Reset Mode Protocol: * // * // Request by Privileged clients to set the data reset mode: * @@ -208,12 +191,6 @@ typedef enum _SS_SystemManagerProtocol { // End of User Mode Protocol * //************************************************************************* - , SS_SM_DEBUG_VAR_CODE_DATA_SET_REQ //!< \~english - , SS_SM_SET_BOOTLOADER_INFO //!< \~english - - , SS_SM_GET_BOOTLOADER_INFO //!< \~english - - , SS_SM_WAKEUP_ORDER_SET_REQ //!< \~english , SS_SM_NEXT_WAKEUP_TYPE_SET_REQ //!< \~english //************************************************************************* diff --git a/interface_unified/library/include/system_service/ss_system_manager_protocol_local.h b/interface_unified/library/include/system_service/ss_system_manager_protocol_local.h index 24941bca..5f868205 100644 --- a/interface_unified/library/include/system_service/ss_system_manager_protocol_local.h +++ b/interface_unified/library/include/system_service/ss_system_manager_protocol_local.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/interface_unified/library/include/system_service/ss_system_process.h b/interface_unified/library/include/system_service/ss_system_process.h index ed3693a4..a4ae743a 100644 --- a/interface_unified/library/include/system_service/ss_system_process.h +++ b/interface_unified/library/include/system_service/ss_system_process.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. @@ -102,7 +102,8 @@ class Process { /// \ingroup Process /// \~english @par Summary /// - Default Constructor, called when the class is instantiated. - /// \~english @param None + /// \~english @param [in] - cpu_assign + /// - Assignment information of CPU. /// \~english @retval None /// \~english @par Preconditions /// -no preconditions @@ -118,7 +119,7 @@ class Process { /// - initialize all var in class as default value /// \~english @see ~Process //////////////////////////////////////////////////////////////////////////////////// - Process(); + Process(int cpu_assign = 0x0); ///////////////////////////////////////////////////////////////////////////////////// /// \ingroup Process @@ -1021,6 +1022,7 @@ class Process { long m_lValidationTag; // Used to check if this is a valid // NOLINT (runtime/int) // object or not. + int m_cpu_assign; pid_t m_tProcessId; // This is the process ID for this process. All command, control, // and status gathering will use this ID. eProcessLoadMode m_eProcessLoadMode; // This is the process load mode provided by the caller when this diff --git a/interface_unified/library/include/system_service/ss_system_timer.h b/interface_unified/library/include/system_service/ss_system_timer.h index 2a80c7e2..f95d1f9f 100644 --- a/interface_unified/library/include/system_service/ss_system_timer.h +++ b/interface_unified/library/include/system_service/ss_system_timer.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. @@ -663,7 +663,7 @@ class TimerCtrl { HANDLE m_hApp; /// UI_32 m_nTimersMax; /// std::list<UI_32> m_aTimers; /// - std::map<UI_32, Timer&> m_rTimers; /// + std::map<UI_32, Timer*> m_rTimers; /// }; diff --git a/interface_unified/library/include/system_service/ss_system_types.h b/interface_unified/library/include/system_service/ss_system_types.h index ac1668bb..adcaf2b2 100644 --- a/interface_unified/library/include/system_service/ss_system_types.h +++ b/interface_unified/library/include/system_service/ss_system_types.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/interface_unified/library/include/system_service/ss_templates.h b/interface_unified/library/include/system_service/ss_templates.h index c7e4f301..581e616a 100644 --- a/interface_unified/library/include/system_service/ss_templates.h +++ b/interface_unified/library/include/system_service/ss_templates.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. @@ -92,7 +92,7 @@ template <typename T> EFrameworkunifiedStatus ReadMsg( l_eStatus = eFrameworkunifiedStatusInvldHandle; } else if (sizeof(Data) != FrameworkunifiedGetMsgLength(hApp)) { FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__ - , " Error: message buffer sizes mismatch: expected %d, received %d" + , " Error: message buffer sizes mismatch: expected %ld, received %d" , sizeof(Data), FrameworkunifiedGetMsgLength(hApp)); l_eStatus = eFrameworkunifiedStatusInvldParam; } else if ( eFrameworkunifiedStatusOK != (l_eStatus = diff --git a/interface_unified/library/include/system_service/ss_test_clients.h b/interface_unified/library/include/system_service/ss_test_clients.h index a10c57b0..a50e61f5 100644 --- a/interface_unified/library/include/system_service/ss_test_clients.h +++ b/interface_unified/library/include/system_service/ss_test_clients.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/interface_unified/library/include/system_service/ss_version.h b/interface_unified/library/include/system_service/ss_version.h index 3dd9b5c9..856f334f 100644 --- a/interface_unified/library/include/system_service/ss_version.h +++ b/interface_unified/library/include/system_service/ss_version.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/interface_unified/library/src/libSS_SystemIfUnified.ver b/interface_unified/library/src/libSS_SystemIfUnified.ver index 64375507..7a646f21 100644 --- a/interface_unified/library/src/libSS_SystemIfUnified.ver +++ b/interface_unified/library/src/libSS_SystemIfUnified.ver @@ -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/interface_unified/library/src/makefile_PosixBasedOS001 b/interface_unified/library/src/makefile_PosixBasedOS001 index e5e4b984..68fa52e5 100644 --- a/interface_unified/library/src/makefile_PosixBasedOS001 +++ b/interface_unified/library/src/makefile_PosixBasedOS001 @@ -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/interface_unified/library/src/ss_devicedetection_service_ifc.cpp b/interface_unified/library/src/ss_devicedetection_service_ifc.cpp index cc76510f..1f68df6c 100644 --- a/interface_unified/library/src/ss_devicedetection_service_ifc.cpp +++ b/interface_unified/library/src/ss_devicedetection_service_ifc.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. @@ -24,7 +24,6 @@ #include <native_service/frameworkunified_framework_if.h> #include <native_service/frameworkunified_types.h> #include <native_service/frameworkunified_framework_types.h> -#include <other_service/VP_GetEnv.h> #include <string.h> #ifdef AGL_STUB @@ -409,6 +408,7 @@ BOOL DeviceDetectionServiceIf::CheckDetectEvent( case SS_DEV_INFO_ANY_USB_NOTIFY_EV: case SS_DEV_DETECT_ANY_USB__CWORD57__ROLE_EV: case SS_DEV_INFO_SD_FORMAT_COMP_EV: + case SS_DEV_INFO_ANY_USB_DVDP_EV: chkevt = TRUE; break; default: @@ -582,52 +582,9 @@ EFrameworkunifiedStatus DeviceDetectionServiceIf::UmountSD(uint8_t part_num, return eStatus; } -static EFrameworkunifiedStatus UsbVBusResetParamChk(int8_t port) { - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); - char* env; - env = getenv("TARGET_BOARD"); - if (env == NULL) { - return eFrameworkunifiedStatusFail; - } - - switch (port) { - case SS_DEV_USB_PORT0: - case SS_DEV_USB_PORT1: - case SS_DEV_USB_PORT2: - break; - default: - FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "Invalid Port Value[%d].", port); - return eFrameworkunifiedStatusInvldParam; - } - - /* - * Note. - * Check the support status of the target board and port. - */ - - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "-"); - return eFrameworkunifiedStatusOK; -} - static const uint8_t VBUS_RESET_INTERVAL_MIN = 11; -static EFrameworkunifiedStatus UsbVBusResetIntervalChk(int8_t port, uint8_t interval) -{ - if (port == SS_DEV_USB_PORT1 || port == SS_DEV_USB_PORT2) { - goto invalidParam; - } - if (interval < VBUS_RESET_INTERVAL_MIN) { - goto invalidParam; - } - return eFrameworkunifiedStatusOK; - -invalidParam: - FRAMEWORKUNIFIEDLOG(ZONE_WARN, __func__, "Invalid Param port:%d interval:%d.", port, interval); - return eFrameworkunifiedStatusInvldParam; -} - -static EFrameworkunifiedStatus SendUsbVBusResetMsg(HANDLE handle, int8_t port, uint8_t interval, bool check_interval) -{ +static EFrameworkunifiedStatus SendUsbVBusResetMsg(HANDLE handle, int8_t port, uint8_t interval) { FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __func__, "+"); EFrameworkunifiedStatus eStatus = eFrameworkunifiedStatusOK; @@ -636,18 +593,6 @@ static EFrameworkunifiedStatus SendUsbVBusResetMsg(HANDLE handle, int8_t port, u return eFrameworkunifiedStatusInvldHandle; } - eStatus = UsbVBusResetParamChk(port); - if (eStatus != eFrameworkunifiedStatusOK) { - return eStatus; - } - - if (check_interval) { - eStatus = UsbVBusResetIntervalChk(port, interval); - if (eStatus != eFrameworkunifiedStatusOK) { - return eStatus; - } - } - int16_t data[] = {port, interval}; eStatus = FrameworkunifiedSendMsg(handle, SS_USB_VBUS_RESET, sizeof(data), data); @@ -659,14 +604,12 @@ static EFrameworkunifiedStatus SendUsbVBusResetMsg(HANDLE handle, int8_t port, u return eStatus; } -EFrameworkunifiedStatus DeviceDetectionServiceIf::UsbVBusReset(int8_t port, uint8_t interval) -{ - return SendUsbVBusResetMsg(m_hSession, port, interval, true); +EFrameworkunifiedStatus DeviceDetectionServiceIf::UsbVBusReset(int8_t port, uint8_t interval) { + return SendUsbVBusResetMsg(m_hSession, port, interval); } -EFrameworkunifiedStatus DeviceDetectionServiceIf::UsbVBusReset(int8_t port) -{ - return SendUsbVBusResetMsg(m_hSession, port, VBUS_RESET_INTERVAL_MIN, false); +EFrameworkunifiedStatus DeviceDetectionServiceIf::UsbVBusReset(int8_t port) { + return SendUsbVBusResetMsg(m_hSession, port, VBUS_RESET_INTERVAL_MIN); } EFrameworkunifiedStatus DeviceDetectionServiceIf::RoleSwStateNotify( diff --git a/interface_unified/library/src/ss_framework_if.cpp b/interface_unified/library/src/ss_framework_if.cpp index b78f9db5..91d323a0 100644 --- a/interface_unified/library/src/ss_framework_if.cpp +++ b/interface_unified/library/src/ss_framework_if.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/interface_unified/library/src/ss_heartbeat_client.cpp b/interface_unified/library/src/ss_heartbeat_client.cpp index a6290830..a080e9ac 100644 --- a/interface_unified/library/src/ss_heartbeat_client.cpp +++ b/interface_unified/library/src/ss_heartbeat_client.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/interface_unified/library/src/ss_last_to_order.cpp b/interface_unified/library/src/ss_last_to_order.cpp index 48aa6923..140101fe 100644 --- a/interface_unified/library/src/ss_last_to_order.cpp +++ b/interface_unified/library/src/ss_last_to_order.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/interface_unified/library/src/ss_logger_service_ifc.cpp b/interface_unified/library/src/ss_logger_service_ifc.cpp index 9337f817..1766bfad 100644 --- a/interface_unified/library/src/ss_logger_service_ifc.cpp +++ b/interface_unified/library/src/ss_logger_service_ifc.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/interface_unified/library/src/ss_power_client.cpp b/interface_unified/library/src/ss_power_client.cpp index ee54c515..30bdbaac 100644 --- a/interface_unified/library/src/ss_power_client.cpp +++ b/interface_unified/library/src/ss_power_client.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/interface_unified/library/src/ss_pwrsvc_if.cpp b/interface_unified/library/src/ss_pwrsvc_if.cpp index e3988937..86d8ebbe 100644 --- a/interface_unified/library/src/ss_pwrsvc_if.cpp +++ b/interface_unified/library/src/ss_pwrsvc_if.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/interface_unified/library/src/ss_sm_client.cpp b/interface_unified/library/src/ss_sm_client.cpp index 621b74b5..664a98d0 100644 --- a/interface_unified/library/src/ss_sm_client.cpp +++ b/interface_unified/library/src/ss_sm_client.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. @@ -895,77 +895,6 @@ EFrameworkunifiedStatus SendWakeUpToSystemManager(wakeInfo *pData) { } // End of EFrameworkunifiedStatus SendWakeUpToSystemManager(wakeInfo *pData) // LCOV_EXCL_STOP -/////////////////////////////////////////////////////////// -/// Function: SetBootLoaderInfoRequestToSystemManager -/// -/////////////////////////////////////////////////////////// -EFrameworkunifiedStatus SetBootLoaderInfoRequestToSystemManager(ESMBootInfoType f_type, - UI_32 f_value) { - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); - - EFrameworkunifiedStatus l_eStatus; - EFrameworkunifiedStatus l_resData; - TSystemManagerBootInfoStruct l_bootInfo; - - switch (f_type) { - case e_SS_SM_BOOT_INFO_MDUPDATE: - case e_SS_SM_BOOT_INFO_SDUPDATE: - - case e_SS_SM_BOOT_INFO_OPDTUPDATE: - break; - default: - return eFrameworkunifiedStatusInvldParam; - } - - l_bootInfo.type = f_type; - l_bootInfo.value = f_value; - - l_eStatus = InvokeSyncRequestToSystemManager( - SS_SM_SET_BOOTLOADER_INFO, "SS_SM_SET_BOOTLOADER_INFO", - sizeof(TSystemManagerBootInfoStruct), (PVOID) & l_bootInfo, - sizeof(l_resData), (PVOID) & l_resData); // LCOV_EXCL_BR_LINE 11:Unexpected branch - LOG_STATUS_IF_ERRORED(l_eStatus, "InvokeSyncRequestToSystemManager()"); - - if (eFrameworkunifiedStatusOK == l_eStatus) { - if (eFrameworkunifiedStatusOK != l_resData) - l_eStatus = l_resData; - } - - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "-"); - return l_eStatus; - -//} // End of EFrameworkunifiedStatus SetBootLoaderInfoRequestToSystemManager(wakeInfo *pData) -} // End of EFrameworkunifiedStatus SetBootLoaderInfoRequestToSystemManager(ESMBootInfoType f_type, UI_32 f_value) - - - -/////////////////////////////////////////////////////////// -/// Function: GetBootLoaderInfoRequestToSystemManager -/// -/////////////////////////////////////////////////////////// -EFrameworkunifiedStatus GetBootLoaderInfoRequestToSystemManager(void *p_info) -{ - EFrameworkunifiedStatus l_eStatus; - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); - - if (NULL == p_info) { - l_eStatus = eFrameworkunifiedStatusInvldParam; - LOG_ERROR("p_info = NULL"); - } else { - l_eStatus = InvokeSyncRequestToSystemManager(SS_SM_GET_BOOTLOADER_INFO, - "SS_SM_GET_BOOTLOADER_INFO", - 0, - NULL, - sizeof(LBM_RAM_t), - (PVOID)p_info); - LOG_STATUS_IF_ERRORED(l_eStatus, "InvokeSyncRequestToSystemManager()"); - } - - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "-"); - return l_eStatus; -} // End of EFrameworkunifiedStatus GetBootLoaderInfoRequestToSystemManager(void *p_info) - - // LCOV_EXCL_START 6:Because the condition cannot be set /////////////////////////////////////////////////////////// /// Function: SendShutdownToSystemManager @@ -1033,53 +962,6 @@ EFrameworkunifiedStatus AttachCallbackToSystemManager(HANDLE hApp, UI_32 iCmd, // LCOV_EXCL_STOP /////////////////////////////////////////////////////////// -/// Function: SendBootModeSetRequestToSystemManager -/// -/////////////////////////////////////////////////////////// -EFrameworkunifiedStatus SendBootModeSetRequestToSystemManager(ESMBootModeInfo hostBootMode) { - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); - EFrameworkunifiedStatus l_eStatus; - PCSTR p_sBootModeName; - - if (e_SS_SM_BOOT_MODE_INVALID == hostBootMode) { - l_eStatus = eFrameworkunifiedStatusInvldParam; - LOG_ERROR("e_SS_SM_BOOT_MODE_INVALID == hostBootMode"); - } else if (e_SS_SM_BOOT_MODE_APPLICATION == hostBootMode) { -// , e_SS_SM_BOOT_MODE_PROGRAMMING - l_eStatus = eFrameworkunifiedStatusOK; - p_sBootModeName = "BOOT_MODE_APPLICATION"; - } else if (e_SS_SM_BOOT_MODE_PROGRAMMING == hostBootMode) { - l_eStatus = eFrameworkunifiedStatusOK; - p_sBootModeName = "BOOT_MODE_PROGRAMMING"; - } else { - l_eStatus = eFrameworkunifiedStatusInvldParam; - FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, - " Error: Unknown hostBootMode value '0x%x', %s", hostBootMode, - GetStr(l_eStatus).c_str()); - } - - /* ( SS_SM_BOOT_MODE_GET_REQ == protocolID ) || - ( SS_SM_BOOT_MODE_SET_REQ == protocolID ) ) - */ - if (eFrameworkunifiedStatusOK == l_eStatus) { - TSystemManagerBootModeRequestResponse l_Data; - l_Data.hostBootMode = hostBootMode; - l_Data.eFrameworkunifiedStatus = eFrameworkunifiedStatusOK; - FRAMEWORKUNIFIEDLOG(ZONE_INFO, __FUNCTION__, - "%s: Sending SS_SM_BOOT_MODE_SET_REQ(%s) to %s.", - g_tSystemManagerSession.strIAm.c_str(), p_sBootModeName, - g_tSystemManagerSession.szServiceName.c_str()); - - l_eStatus = SendMsgToSystemManager( - SS_SM_BOOT_MODE_SET_REQ, sizeof(TSystemManagerBootModeRequestResponse), - (PCVOID) & l_Data); // LCOV_EXCL_BR_LINE 11:Unexpected branch - LOG_STATUS_IF_ERRORED(l_eStatus, "SendMsgToSystemManager()"); - } - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "-"); - return l_eStatus; -} // End of EFrameworkunifiedStatus SendBootModeSetRequestToSystemManager(ESMBootModeInfo hostBootMode) - -/////////////////////////////////////////////////////////// /// Function: SetDataResetModeToSystemManager /// /////////////////////////////////////////////////////////// @@ -1153,41 +1035,6 @@ EFrameworkunifiedStatus SetProgUpdateStateToSystemManager( } // End of EFrameworkunifiedStatus SetProgUpdateStateToSystemManager(SMProgUpdateState progUpdateState) /////////////////////////////////////////////////////////// -/// Function: SetWakeupOrderToSystemManager -/// -/////////////////////////////////////////////////////////// -EFrameworkunifiedStatus SetWakeupOrderToSystemManager(std::string f_orderName) { - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - EFrameworkunifiedStatus l_resData; - TSystemManagerWakeupOrderInfo orderName; - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); - - if (SS_SM_ORDER_NAME_MAX <= f_orderName.size()) { // LCOV_EXCL_BR_LINE 11:Unexpected branch - return eFrameworkunifiedStatusInvldParam; - } - - snprintf(orderName.order_name, sizeof(orderName.order_name), "%s", - f_orderName.c_str()); // LCOV_EXCL_BR_LINE 11:Unexpected branch - l_eStatus = InvokeSyncRequestToSystemManager(SS_SM_WAKEUP_ORDER_SET_REQ, - "SS_SM_WAKEUP_ORDER_SET_REQ", - sizeof(orderName), - (PVOID) & orderName, - sizeof(l_resData), - (PVOID) & l_resData); // LCOV_EXCL_BR_LINE 11:Unexpected branch - LOG_STATUS_IF_ERRORED(l_eStatus, "InvokeSyncRequestToSystemManager()"); - - if (eFrameworkunifiedStatusOK == l_eStatus) { - if (eFrameworkunifiedStatusOK != l_resData) { - l_eStatus = l_resData; - FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, " l_eStatus %d", l_eStatus); - } - } - - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "-"); - return l_eStatus; -} // End of EFrameworkunifiedStatus SetWakeupOrderToSystemManager(std::string f_orderName) - -/////////////////////////////////////////////////////////// /// Function: SetNextWakeupTypeToSystemManager /// /////////////////////////////////////////////////////////// @@ -1275,16 +1122,6 @@ EFrameworkunifiedStatus SendStartupConfirmationToSystemManager( } // End of EFrameworkunifiedStatus SendStartupConfirmationToSystemManager( // LCOV_EXCL_STOP -EFrameworkunifiedStatus SendVarCodeDataToSystemManager(UI_32 f_uiLength, void *f_data) { - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); - EFrameworkunifiedStatus l_eStatus; - l_eStatus = SendMsgToSystemManager(SS_SM_DEBUG_VAR_CODE_DATA_SET_REQ, - f_uiLength, f_data); - LOG_STATUS_IF_ERRORED(l_eStatus, "SendMsgToSystemManager()"); - FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "-"); - return l_eStatus; -} - // LCOV_EXCL_START 6:Because the condition cannot be set EFrameworkunifiedStatus SendSystemErrorToSystemManager(EFrameworkunifiedSystemError f_systemError) { FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); diff --git a/interface_unified/library/src/ss_string_maps.cpp b/interface_unified/library/src/ss_string_maps.cpp index d5aff75b..629043ac 100644 --- a/interface_unified/library/src/ss_string_maps.cpp +++ b/interface_unified/library/src/ss_string_maps.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. @@ -327,8 +327,6 @@ void Init_SS_SystemManagerProtocol_StrMap(std::map<SS_SystemManagerProtocol, SS_ MAP_ENTRY(m_strMap, SS_SM_SYSTEM_MODE_INFO_REQ); MAP_ENTRY(m_strMap, SS_SM_SYSTEM_MODE_INFO_RSPN); MAP_ENTRY(m_strMap, SS_SM_INITCOMP_REP); - MAP_ENTRY(m_strMap, SS_SM_BOOT_MODE_SET_REQ); - MAP_ENTRY(m_strMap, SS_SM_BOOT_MODE_SET_RESP); MAP_ENTRY(m_strMap, SS_SM_DATA_RESET_MODE_SET_REQ); MAP_ENTRY(m_strMap, SS_SM_PROG_UPDATE_STATE_SET_REQ); MAP_ENTRY(m_strMap, SS_SM_CPU_RESET_REQ); @@ -338,10 +336,6 @@ void Init_SS_SystemManagerProtocol_StrMap(std::map<SS_SystemManagerProtocol, SS_ MAP_ENTRY(m_strMap, SS_SM_POWER_REQUEST_MSG); MAP_ENTRY(m_strMap, SS_SM_POWER_REQUEST_MSG_RESP); MAP_ENTRY(m_strMap, SS_SM_USER_MODE_SET_RESP); - MAP_ENTRY(m_strMap, SS_SM_DEBUG_VAR_CODE_DATA_SET_REQ); - MAP_ENTRY(m_strMap, SS_SM_SET_BOOTLOADER_INFO); - - MAP_ENTRY(m_strMap, SS_SM_GET_BOOTLOADER_INFO); MAP_ENTRY(m_strMap, SS_SM_EVENT_ERROR); MAP_ENTRY(m_strMap, SS_SM_EVENT_ERROR_TO_SSL); @@ -373,7 +367,6 @@ void Init_SS_SystemManagerProtocol_StrMap(std::map<SS_SystemManagerProtocol, SS_ MAP_ENTRY(m_strMap, SS_SM_BOOT_MICRO_RESET_NTF); MAP_ENTRY(m_strMap, SS_SM_BOOT_MICRO_LOG_REQ); MAP_ENTRY(m_strMap, SS_SM_BOOT_MICRO_LOG_RSP); - MAP_ENTRY(m_strMap, SS_SM_WAKEUP_ORDER_SET_REQ); MAP_ENTRY(m_strMap, SS_SM_NEXT_WAKEUP_TYPE_SET_REQ); // LCOV_EXCL_BR_STOP 11:Excluded due to gcov restrictions(other) } // End of void Init_SS_SystemManagerProtocol_StrMap(std::map<SS_SystemManagerProtocol, SS_String> &m_strMap) diff --git a/interface_unified/library/src/ss_system_process.cpp b/interface_unified/library/src/ss_system_process.cpp index c531e53d..71a969a1 100644 --- a/interface_unified/library/src/ss_system_process.cpp +++ b/interface_unified/library/src/ss_system_process.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. @@ -50,8 +50,9 @@ gid_t iPrpocess_DEFAULT_PROCESS_GROUP = 4999; * * @return */ -Process::Process() : +Process::Process(int cpu_assign) : m_lValidationTag(lProcess_VALIDATION_VALUE), + m_cpu_assign(cpu_assign), m_tProcessId(-1), m_eProcessLoadMode(NOWAIT), m_strFile(""), @@ -328,6 +329,9 @@ void Process::CreateProcess( throw "CL_ProcessCreateAttrInit()"; } + if (0 != CL_ProcessCreateAttrSetCpuAssign(&clAttr, m_cpu_assign)) { + throw "CL_ProcessCreateAttrSetCpuAssign()"; + } switch (p_eSchedulingPolicy_i) { case FIFO: diff --git a/interface_unified/library/src/ss_system_timer.cpp b/interface_unified/library/src/ss_system_timer.cpp index 7a5b058c..24209fbc 100644 --- a/interface_unified/library/src/ss_system_timer.cpp +++ b/interface_unified/library/src/ss_system_timer.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. @@ -150,9 +150,9 @@ void TimerCtrl::Initialize(HANDLE hApp) { void TimerCtrl::Shutdown() { m_aTimers.clear(); while (m_rTimers.begin() != m_rTimers.end()) { - Timer& timer = m_rTimers.begin()->second; - timer.Shutdown(); - delete &timer; + Timer* p_timer = m_rTimers.begin()->second; + p_timer->Shutdown(); + delete p_timer; m_rTimers.erase(m_rTimers.begin()); } } @@ -161,8 +161,8 @@ UI_32 TimerCtrl::CreateTimer(CbFuncPtr CbFn) { if (!m_aTimers.empty()) { UI_32 id = m_aTimers.front(); m_aTimers.pop_front(); - Timer& timer = *new Timer(m_hApp, id, CbFn); - m_rTimers.insert(std::pair<UI_32, Timer&>(id, timer)); + Timer* p_timer = new Timer(m_hApp, id, CbFn); + m_rTimers.insert(std::pair<UI_32, Timer*>(id, p_timer)); return id; } return 0; @@ -170,9 +170,9 @@ UI_32 TimerCtrl::CreateTimer(CbFuncPtr CbFn) { UI_32 TimerCtrl::DeleteTimer(UI_32 id) { if (m_rTimers.find(id) != m_rTimers.end()) { - Timer& timer = m_rTimers.find(id)->second; - timer.Shutdown(); - delete &timer; + Timer* p_timer = m_rTimers.find(id)->second; + p_timer->Shutdown(); + delete p_timer; m_rTimers.erase(m_rTimers.find(id)); m_aTimers.push_back(id); return id; @@ -182,16 +182,16 @@ UI_32 TimerCtrl::DeleteTimer(UI_32 id) { UI_32 TimerCtrl::SetTimer(UI_32 id, UI_32 ss, UI_32 sms, UI_32 rs, UI_32 rms) { if (m_rTimers.find(id) != m_rTimers.end()) { - Timer& timer = m_rTimers.find(id)->second; - timer.SetTime(ss, sms, rs, rms); + Timer* p_timer = m_rTimers.find(id)->second; + p_timer->SetTime(ss, sms, rs, rms); return id; } return 0; } UI_32 TimerCtrl::StartTimer(UI_32 id, UI_32 ss, UI_32 sms, UI_32 rs, UI_32 rms) { if (m_rTimers.find(id) != m_rTimers.end()) { - Timer& timer = m_rTimers.find(id)->second; - timer.Start(ss, sms, rs, rms); + Timer* p_timer = m_rTimers.find(id)->second; + p_timer->Start(ss, sms, rs, rms); return id; } return 0; @@ -199,10 +199,10 @@ UI_32 TimerCtrl::StartTimer(UI_32 id, UI_32 ss, UI_32 sms, UI_32 rs, UI_32 rms) UI_32 TimerCtrl::StartTimerMulti(UI_32 id, UI_32 ss, UI_32 sms, UI_32 rs, UI_32 rms, UI_32 subId) { if (m_rTimers.find(id) != m_rTimers.end()) { - Timer& timer = m_rTimers.find(id)->second; - timer.Shutdown(); - timer.Reinitialize(id + subId); - timer.Start(ss, sms, rs, rms); + Timer* p_timer = m_rTimers.find(id)->second; + p_timer->Shutdown(); + p_timer->Reinitialize(id + subId); + p_timer->Start(ss, sms, rs, rms); return id; } return 0; @@ -210,8 +210,8 @@ UI_32 TimerCtrl::StartTimerMulti(UI_32 id, UI_32 ss, UI_32 sms, UI_32 rs, UI_32 UI_32 TimerCtrl::StartTimer(UI_32 id) { if (m_rTimers.find(id) != m_rTimers.end()) { - Timer& timer = m_rTimers.find(id)->second; - timer.Start(); + Timer* p_timer = m_rTimers.find(id)->second; + p_timer->Start(); return id; } return 0; @@ -219,8 +219,8 @@ UI_32 TimerCtrl::StartTimer(UI_32 id) { UI_32 TimerCtrl::StopTimer(UI_32 id) { if (m_rTimers.find(id) != m_rTimers.end()) { - Timer& timer = m_rTimers.find(id)->second; - timer.Stop(); + Timer* p_timer = m_rTimers.find(id)->second; + p_timer->Stop(); return id; } return 0; diff --git a/interface_unified/scfg/ss_logger.cfg b/interface_unified/scfg/ss_logger.cfg index 9be717fd..ffb4c502 100644 --- a/interface_unified/scfg/ss_logger.cfg +++ b/interface_unified/scfg/ss_logger.cfg @@ -1,8 +1,8 @@ [LOGGING] LogMaxFileSize=5242880 PerformanceLogSize=262144 -EmmcOutputPath=/nv/log/frameworkunifiedlog -EmmcOutputNaviLogPath=/nv/log2/awlog +EmmcOutputPath=/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog +EmmcOutputNaviLogPath=/nv/BS/ss/logger_service/rwdata/log2/awlog Usb0MountPath=/mnt/sda1 Usb1MountPath=/mnt/sdb1 SdMountPath=/fs/sd0 @@ -15,6 +15,43 @@ EmmcOutputGrpRelaunchMax=5 EmmcOutputNaviLogMax=10 EmmcOutputNaviLogNmlMax=20 EmmcOutputNaviLogErrMax=10 +ExternalLogNum=6 +ExternalLogMax=20 + +# "[EXTERNAL_X]" have to start from "1" to ExternalLogNum +# "ExtLogPath" is file or directory path of External log +# "OutputPath" is file or directory path in Archive file +# "Remove" is removed or not after it is archived + +[EXTERNAL_1] +ExtLogPath=/ramd/log/frameworkunifiedlog/radio +OutputPath=radio +Remove=false + +[EXTERNAL_2] +ExtLogPath=/ramd/log/frameworkunifiedlog/connectivity +OutputPath=connectivity +Remove=false + +[EXTERNAL_3] +ExtLogPath=/ramd/log/frameworkunifiedlog/graphics.log +OutputPath=graphics.log +Remove=false + +[EXTERNAL_4] +ExtLogPath=/ramd/log/frameworkunifiedlog/winsys.log +OutputPath=winsys.log +Remove=false + +[EXTERNAL_5] +ExtLogPath=/ramd/log/frameworkunifiedlog/appfw +OutputPath=appfw +Remove=false + +[EXTERNAL_6] +ExtLogPath=/nv/ptdata/sec/tomoyo +OutputPath=tomoyo +Remove=true [SETLOGMASK] MASK0=0xDC000000 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. |