Skip to content

Commit 0495c57

Browse files
nmariyapnmariyap
authored
Merge pull request #39 from intel/rel_1_0_113_61
Release 9.0.11361.32710
2 parents 2ca0c98 + 89f67eb commit 0495c57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+17642
-300
lines changed

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,4 @@ ppm_compiler
8484
/DPTF/Sources/Tools/dttui/Sources/solution/esif_ui_solution/bin/esif_ui_solution.dll
8585
/ESIF/Products/IPF_UI/Sources/solution/ipf_ui_solution/bin
8686
/ESIF/Products/IPF_UI/index.html
87-
/IPF/Linux
88-
/DPTF/Windows/Solution/.klocwork/
87+
/DPTF/Windows/Solution/.klocwork/

‎Common/Ver.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020

2121
#define VER_MAJOR 1
2222
#define VER_MINOR 0
23-
#define VER_HOTFIX 11300
24-
#define VER_BUILD 31932
23+
#define VER_HOTFIX 11361
24+
#define VER_BUILD 32710

‎Common/esif_ccb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ typedef unsigned long long u64;
110110
#define ESIF_HANDLE_PRIMARY_PARTICIPANT ((esif_handle_t)(1)) /* Reserved ESIF handle */
111111
#define ESIF_HANDLE_MATCH_ANY_EVENT ((esif_handle_t)(-2)) /* Reserved ESIF handle */
112112

113-
#define ESIF_WS_LIBRARY_NAME "esif_ws" /* Legacy Library/App Name for deprecated in-process web server*/
113+
#define ESIF_WS_LIBRARY_NAME "ipf_ws" /* Legacy Library/App Name for deprecated in-process web server*/
114114

115115
#define esif_ccb_isfullpath(fname) (fname[0] == '/')
116116

‎Common/esif_sdk_iface_compress.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "esif_ccb.h"
2222

23-
#define ESIFCMP_LIBRARY "esif_cmp" // Name of Loadable .dll or .so Library
23+
#define ESIFCMP_LIBRARY "ipf_cmp" // Name of Loadable .dll or .so Library
2424
#define ESIFCMP_COMPRESSOR "IpfCompress" // Name of Exported Symbol in Library to Compress data
2525
#define ESIFCMP_DECOMPRESSOR "IpfDecompress" // Name of Exported Symbol in Library to Decompress data
2626
#define ESIFCMP_ERROR_OUTPUT_EOF 7 // Output Buffer too small return code (SZ_ERROR_OUTPUT_EOF)

‎Common/esif_sdk_primitive_type.h

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,11 @@ typedef enum esif_primitive_type {
139139
GET_FAN_MODE_CAPABILITIES = 832,
140140
GET_FAN_OPERATING_MODE = 833,
141141
GET_FAN_PERFORMANCE_STATES = 85,
142-
GET_FAN_SPEED_THRESHOLD = 869,
142+
GET_FAN_SPEED_HIGH_THRESHOLD = 902,
143+
GET_FAN_SPEED_HIGH_THRESHOLD_SUR = 904,
144+
GET_FAN_SPEED_LOW_THRESHOLD = 903,
145+
GET_FAN_SPEED_LOW_THRESHOLD_SUR = 905,
143146
GET_FAN_SPEED_THRESHOLD_HYSTERESIS = 870,
144-
GET_FAN_SPEED_THRESHOLD_SUR = 871,
145147
GET_FAN_STATUS = 86,
146148
GET_FAST_POLL_TIME = 462,
147149
GET_FIVR_VERSION = 652,
@@ -415,8 +417,10 @@ typedef enum esif_primitive_type {
415417
SET_FAN_DIRECTION = 743,
416418
SET_FAN_LEVEL = 87,
417419
SET_FAN_OPERATING_MODE = 834,
418-
SET_FAN_SPEED_THRESHOLD = 872,
419-
SET_FAN_SPEED_THRESHOLD_SUR = 873,
420+
SET_FAN_SPEED_HIGH_THRESHOLD = 906,
421+
SET_FAN_SPEED_HIGH_THRESHOLD_SUR = 908,
422+
SET_FAN_SPEED_LOW_THRESHOLD = 907,
423+
SET_FAN_SPEED_LOW_THRESHOLD_SUR = 909,
420424
SET_FOREGROUND_APP_RATIO_PERIOD = 764,
421425
SET_HWPF_CONFIG = 608,
422426
SET_INTELLIGENT_THERMAL_MANAGEMENT_TABLE = 766,
@@ -581,7 +585,7 @@ typedef enum esif_primitive_type {
581585
} esif_primitive_type_t;
582586

583587
/* Max Enum Value for Iteration purposes */
584-
#define MAX_PRIMITIVE_ENUM_VALUE SET_DLVR_SSC_TO_CNVI
588+
#define MAX_PRIMITIVE_ENUM_VALUE SET_FAN_SPEED_LOW_THRESHOLD_SUR
585589

586590
static ESIF_INLINE esif_string esif_primitive_str(esif_primitive_type_t type)
587591
{
@@ -665,9 +669,11 @@ static ESIF_INLINE esif_string esif_primitive_str(esif_primitive_type_t type)
665669
ESIF_CASE_ENUM(GET_FAN_MODE_CAPABILITIES);
666670
ESIF_CASE_ENUM(GET_FAN_OPERATING_MODE);
667671
ESIF_CASE_ENUM(GET_FAN_PERFORMANCE_STATES);
668-
ESIF_CASE_ENUM(GET_FAN_SPEED_THRESHOLD);
672+
ESIF_CASE_ENUM(GET_FAN_SPEED_HIGH_THRESHOLD);
673+
ESIF_CASE_ENUM(GET_FAN_SPEED_HIGH_THRESHOLD_SUR);
674+
ESIF_CASE_ENUM(GET_FAN_SPEED_LOW_THRESHOLD);
675+
ESIF_CASE_ENUM(GET_FAN_SPEED_LOW_THRESHOLD_SUR);
669676
ESIF_CASE_ENUM(GET_FAN_SPEED_THRESHOLD_HYSTERESIS);
670-
ESIF_CASE_ENUM(GET_FAN_SPEED_THRESHOLD_SUR);
671677
ESIF_CASE_ENUM(GET_FAN_STATUS);
672678
ESIF_CASE_ENUM(GET_FAST_POLL_TIME);
673679
ESIF_CASE_ENUM(GET_FIVR_VERSION);
@@ -941,8 +947,10 @@ static ESIF_INLINE esif_string esif_primitive_str(esif_primitive_type_t type)
941947
ESIF_CASE_ENUM(SET_FAN_DIRECTION);
942948
ESIF_CASE_ENUM(SET_FAN_LEVEL);
943949
ESIF_CASE_ENUM(SET_FAN_OPERATING_MODE);
944-
ESIF_CASE_ENUM(SET_FAN_SPEED_THRESHOLD);
945-
ESIF_CASE_ENUM(SET_FAN_SPEED_THRESHOLD_SUR);
950+
ESIF_CASE_ENUM(SET_FAN_SPEED_HIGH_THRESHOLD);
951+
ESIF_CASE_ENUM(SET_FAN_SPEED_HIGH_THRESHOLD_SUR);
952+
ESIF_CASE_ENUM(SET_FAN_SPEED_LOW_THRESHOLD);
953+
ESIF_CASE_ENUM(SET_FAN_SPEED_LOW_THRESHOLD_SUR);
946954
ESIF_CASE_ENUM(SET_FOREGROUND_APP_RATIO_PERIOD);
947955
ESIF_CASE_ENUM(SET_HWPF_CONFIG);
948956
ESIF_CASE_ENUM(SET_INTELLIGENT_THERMAL_MANAGEMENT_TABLE);
@@ -1195,9 +1203,11 @@ static ESIF_INLINE esif_primitive_type_t esif_primitive_type_str2enum(const esif
11951203
ESIF_MAP_ENUM(GET_FAN_MODE_CAPABILITIES),
11961204
ESIF_MAP_ENUM(GET_FAN_OPERATING_MODE),
11971205
ESIF_MAP_ENUM(GET_FAN_PERFORMANCE_STATES),
1198-
ESIF_MAP_ENUM(GET_FAN_SPEED_THRESHOLD),
1206+
ESIF_MAP_ENUM(GET_FAN_SPEED_HIGH_THRESHOLD),
1207+
ESIF_MAP_ENUM(GET_FAN_SPEED_HIGH_THRESHOLD_SUR),
1208+
ESIF_MAP_ENUM(GET_FAN_SPEED_LOW_THRESHOLD),
1209+
ESIF_MAP_ENUM(GET_FAN_SPEED_LOW_THRESHOLD_SUR),
11991210
ESIF_MAP_ENUM(GET_FAN_SPEED_THRESHOLD_HYSTERESIS),
1200-
ESIF_MAP_ENUM(GET_FAN_SPEED_THRESHOLD_SUR),
12011211
ESIF_MAP_ENUM(GET_FAN_STATUS),
12021212
ESIF_MAP_ENUM(GET_FAST_POLL_TIME),
12031213
ESIF_MAP_ENUM(GET_FIVR_VERSION),
@@ -1471,8 +1481,10 @@ static ESIF_INLINE esif_primitive_type_t esif_primitive_type_str2enum(const esif
14711481
ESIF_MAP_ENUM(SET_FAN_DIRECTION),
14721482
ESIF_MAP_ENUM(SET_FAN_LEVEL),
14731483
ESIF_MAP_ENUM(SET_FAN_OPERATING_MODE),
1474-
ESIF_MAP_ENUM(SET_FAN_SPEED_THRESHOLD),
1475-
ESIF_MAP_ENUM(SET_FAN_SPEED_THRESHOLD_SUR),
1484+
ESIF_MAP_ENUM(SET_FAN_SPEED_HIGH_THRESHOLD),
1485+
ESIF_MAP_ENUM(SET_FAN_SPEED_HIGH_THRESHOLD_SUR),
1486+
ESIF_MAP_ENUM(SET_FAN_SPEED_LOW_THRESHOLD),
1487+
ESIF_MAP_ENUM(SET_FAN_SPEED_LOW_THRESHOLD_SUR),
14761488
ESIF_MAP_ENUM(SET_FOREGROUND_APP_RATIO_PERIOD),
14771489
ESIF_MAP_ENUM(SET_HWPF_CONFIG),
14781490
ESIF_MAP_ENUM(SET_INTELLIGENT_THERMAL_MANAGEMENT_TABLE),

‎Common/ipf_sdk_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <stdlib.h>
2525

2626
// Current IPF SDK Version: Major.Minor.Revision where same Major.Minor compatible with other Revisions, but not newer Major.Minor
27-
#define IPF_SDK_VERSION "1.0.11299"
27+
#define IPF_SDK_VERSION "1.0.11361"
2828

2929
typedef u64 ipfsdk_version_t; // IPF SDK Encoded Version Number
3030

‎DPTF/Sources/DptfVer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#define VER_MAJOR 9
2222
#define VER_MINOR 0
23-
#define VER_HOTFIX 11300
24-
#define VER_BUILD 31932
23+
#define VER_HOTFIX 11361
24+
#define VER_BUILD 32710
2525

2626
#define ARG_TOSTR(arg) #arg
2727
#define VER_TOSTR(arg) ARG_TOSTR(arg)

‎DPTF/Sources/Manager/ConfigCommand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void ConfigCommand::throwIfInvalidArgumentCount(const CommandArguments& argument
114114
{
115115
if (arguments.size() < 2)
116116
{
117-
const auto description = R"(\
117+
const auto description = R"(
118118
Invalid argument count given to 'config' command. Run 'dptf help' command for more information.)";
119119
throw command_failure(ESIF_E_INVALID_ARGUMENT_COUNT, description);
120120
}

‎DPTF/Sources/Manager/ConfigListCommand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void ConfigListCommand::throwIfBadArguments(const CommandArguments& arguments)
123123
{
124124
if (arguments.size() != 1)
125125
{
126-
const auto description = R"(\
126+
const auto description = R"(
127127
Invalid argument count given to 'config list' command. Run 'dptf help' command for more information.)";
128128
throw command_failure(ESIF_E_INVALID_ARGUMENT_COUNT, description);
129129
}

‎DPTF/Sources/Manager/HelpCommand.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ void HelpCommand::execute(const CommandArguments& arguments)
4040
// command would just compile all of the helps for each command
4141

4242
const string title = "DTT Help Command. Version " VERSION_STR " [" ESIF_ATTR_OS " " ESIF_PLATFORM_TYPE " " ESIF_BUILD_TYPE "]";
43-
const string key = R"(\
44-
Key: <> Required parameters\
45-
[] Optional parameters\
43+
const string key = R"(
44+
Key: <> Required parameters
45+
[] Optional parameters
4646
)";
4747
const string commands = getCommandHelpText();
4848

@@ -51,33 +51,33 @@ Key: <> Required parameters\
5151

5252
std::string HelpCommand::getCommandHelpText() const
5353
{
54-
return R"(\
55-
help Shows help info for available commands\
56-
reload policies Reloads all policies\
57-
policies enabled Returns a list of policies that are currently enabled\
58-
diag all Runs diagnostics on all policies and participants\
59-
diag policy <policy name> [file name] Runs diagnostics on a policy\
60-
diag part <participant name> [file name] Runs diagnostics on a participant\
61-
tableobject get <tablename> [dynamic policy uuid] Gets table from DataVault\
62-
tableobject get <tablename> <datavault> <key> Gets table from alternative DataVault source and key\
63-
tableobject get <tablename> <participant name> Gets participant table from DataVault\
64-
tableobject set <tablename> <value> [uuid] Sets table value to DataVault\
65-
tableobject set <tablename> <value> <datavault> <key> Sets table value to alternative DataVault source and key\
66-
tableobject set <tablename> <participant name> <value> Sets participant table value to DataVault\
67-
tableobject delete <tablename> [uuid] Deletes table from DataVault\
68-
tableobject delete <tablename> [uuid] <all> Deletes table from all DataVaults\
69-
tableobject delete <tablename> <participant name> Deletes participant table from DataVault\
70-
tableobject delete <tablename> <participant name> <all> Deletes participant table from all DataVaults\
71-
config delete <datavault> <key> Deletes DataVault key\
72-
config filterdb <configuration name> <regex> Displays filtered active configuration segment matching regex as key/value pairs\
73-
config list Shows all loaded configurations\
74-
config print <configuration name> Displays contents of a configuration as JSON\
75-
config printdb <configuration name> Displays contents of a configuration as key/value pairs\
76-
config reload Rescans directories for configurations\
77-
ui getgroups Returns groups for top level UI menu\
78-
ui getmodulesingroup <group ID> Returns module IDs for group ID\
79-
ui getmoduledata <group ID> <module ID> Returns XML data for group ID and module ID\
80-
capture [file name] Export settings to file\
81-
getCpuId Returns platform CPU ID without stepping\
54+
return R"(
55+
help Shows help info for available commands
56+
reload policies Reloads all policies
57+
policies enabled Returns a list of policies that are currently enabled
58+
diag all Runs diagnostics on all policies and participants
59+
diag policy <policy name> [file name] Runs diagnostics on a policy
60+
diag part <participant name> [file name] Runs diagnostics on a participant
61+
tableobject get <tablename> [dynamic policy uuid] Gets table from DataVault
62+
tableobject get <tablename> <datavault> <key> Gets table from alternative DataVault source and key
63+
tableobject get <tablename> <participant name> Gets participant table from DataVault
64+
tableobject set <tablename> <value> [uuid] Sets table value to DataVault
65+
tableobject set <tablename> <value> <datavault> <key> Sets table value to alternative DataVault source and key
66+
tableobject set <tablename> <participant name> <value> Sets participant table value to DataVault
67+
tableobject delete <tablename> [uuid] Deletes table from DataVault
68+
tableobject delete <tablename> [uuid] <all> Deletes table from all DataVaults
69+
tableobject delete <tablename> <participant name> Deletes participant table from DataVault
70+
tableobject delete <tablename> <participant name> <all> Deletes participant table from all DataVaults
71+
config delete <datavault> <key> Deletes DataVault key
72+
config filterdb <configuration name> <regex> Displays filtered active configuration segment matching regex as key/value pairs
73+
config list Shows all loaded configurations
74+
config print <configuration name> Displays contents of a configuration as JSON
75+
config printdb <configuration name> Displays contents of a configuration as key/value pairs
76+
config reload Rescans directories for configurations
77+
ui getgroups Returns groups for top level UI menu
78+
ui getmodulesingroup <group ID> Returns module IDs for group ID
79+
ui getmoduledata <group ID> <module ID> Returns XML data for group ID and module ID
80+
capture [file name] Export settings to file
81+
getCpuId Returns platform CPU ID without stepping
8282
)";
8383
}

0 commit comments

Comments
 (0)