Skip to content

Commit 47ea57f

Browse files
susheel1795susheel1795
committed
Release 9.0.11100.29358
1 parent 53f964e commit 47ea57f

File tree

300 files changed

+5005
-6469
lines changed

Some content is hidden

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

300 files changed

+5005
-6469
lines changed

‎.gitignore

+7-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ public
2828
*.tmp_proj
2929
*.aps
3030
*.vssettings
31+
*.tlog
32+
*.recipe
33+
*.log
34+
*.idb
35+
*.pdb
3136
.vs
3237
x64
3338
Win32
@@ -76,4 +81,5 @@ ppm_compiler
7681
/ESIF/Products/ESIF_UI/Sources/solution/esif_ui_solution/bin/esif_ui_solution.dll
7782
/ESIF/Products/IPF_UI/Sources/solution/ipf_ui_solution/bin
7883
/ESIF/Products/IPF_UI/index.html
79-
/IPF/Linux
84+
/IPF/Linux
85+
/DPTF/Windows/Solution/.klocwork/

‎Common/Ver.h

+2-2
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 11001
24-
#define VER_BUILD 28546
23+
#define VER_HOTFIX 11100
24+
#define VER_BUILD 29358

‎Common/esif_ccb.h

-131
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,13 @@
5353

5454
#pragma once
5555

56-
#if !defined(ESIF_ATTR_KERNEL) && !defined(ESIF_ATTR_USER)
57-
/* User Mode Build */
58-
#define ESIF_ATTR_USER
59-
#endif
6056

61-
#if defined(_WIN32)
62-
#if !defined(ESIF_ATTR_OS_WINDOWS)
63-
/* Windows OS */
64-
#define ESIF_ATTR_OS_WINDOWS
65-
#endif
66-
#else
67-
#if !defined(ESIF_ATTR_OS_LINUX) && !defined(ESIF_ATTR_OS_CHROME) && !defined(ESIF_ATTR_OS_ANDROID)
68-
/* Linux Derived OS */
69-
#define ESIF_ATTR_OS_LINUX
70-
#endif
71-
#endif
7257

7358
#ifdef ESIF_ATTR_OS_CHROME
7459
/* Linux Derived OS */
7560
#define ESIF_ATTR_OS_LINUX
7661
#define ESIF_ATTR_OS "Chrome" /* OS Is Chromium */
7762
#endif
78-
#ifdef ESIF_ATTR_OS_ANDROID
79-
/* Linux Derived OS */
80-
#define ESIF_ATTR_OS_LINUX
81-
#define ESIF_ATTR_OS "Android" /* OS Is Android */
82-
#endif
8363
#if defined(ESIF_ATTR_OS_LINUX) && !defined(_GNU_SOURCE)
8464
/* -std=gnu99 support */
8565
#define _GNU_SOURCE
@@ -90,110 +70,13 @@
9070
#endif
9171

9272
/* OS Agnostic */
93-
#ifdef ESIF_ATTR_USER
9473
#include <stdio.h>
9574
#include <stdlib.h>
96-
#else
97-
#include <stddef.h>
98-
#endif
99-
100-
#ifdef ESIF_ATTR_OS_WINDOWS
101-
102-
/* Windows OS */
103-
#pragma strict_gs_check(on)
104-
105-
#ifdef ESIF_ATTR_USER
106-
#define _WINSOCKAPI_ /* Override for Winsock */
107-
#include <windows.h>
108-
109-
/* Avoids Serialization Warnings*/
110-
#define ESIF_SERIAL_FENCE() _mm_lfence()
111-
112-
#else
113-
#include <ntddk.h>
114-
#define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1) /* Invalid ESIF Handle */
115-
#endif
116-
117-
/* Add Linux Base Types for Windows */
118-
typedef unsigned char u8; /* A BYTE */
119-
typedef unsigned short u16; /* A WORD */
120-
typedef unsigned int u32; /* A DWORD */
121-
typedef unsigned long long u64; /* A QWORD */
122-
123-
typedef char *esif_string; /* NULL-teriminated ANSI string */
124-
typedef HANDLE esif_os_handle_t;/* opaque OS Handle (not a pointer) */
125-
typedef u64 esif_handle_t; /* opaque ESIF 64-bit handle (may NOT be a pointer) */
126-
typedef u64 esif_context_t; /* opaque ESIF 64-bit context (may be a pointer) */
127-
128-
#define ESIF_ATTR_OS "Windows" /* OS Is Windows */
129-
#define ESIF_INLINE __inline /* Inline Function Directive */
130-
#define ESIF_FUNC __FUNCTION__ /* Current Function Name */
131-
#define ESIF_CALLCONV __cdecl /* SDK Calling Convention */
132-
#define ESIF_PATH_SEP "\\" /* Path Separator String */
133-
#define ESIF_EXPORT __declspec(dllexport) /* Used for Exported Symbols */
134-
#define ESIF_INVALID_HANDLE ((esif_handle_t)(-1)) /* Invalid ESIF Handle */
13575

136-
#define ESIF_HANDLE_DEFAULT ((esif_handle_t)(0)) /* Reserved ESIF handle */
137-
#define ESIF_HANDLE_PRIMARY_PARTICIPANT ((esif_handle_t)(1)) /* Reserved ESIF primary participant handle */
138-
#define ESIF_HANDLE_MATCH_ANY_EVENT ((esif_handle_t)(-2)) /* Reserved ESIF handle */
139-
140-
#define ESIF_WS_LIBRARY_NAME "ipf_ws" /* Legacy Library/App Name for deprecated in-process web server*/
14176

142-
#define esif_ccb_isfullpath(fname) (fname[0] == '\\' || (isalpha(fname[0]) && fname[1] == ':'))
143-
144-
#ifdef __cplusplus
145-
#define ESIF_ELEMENT(x) /* C99 Designated Initializers unsupported in C++ */
146-
#else
147-
#define ESIF_ELEMENT(x) x = /* Support C99 Designated Initializers */
148-
#endif
149-
150-
/* Avoids "conditional constant is an expression" warnings for do...while(0) loops */
151-
#define ESIF_CONSTEXPR(expr) __pragma(warning(push)) __pragma(warning(disable:4127)) (expr) __pragma(warning(pop))
152-
153-
/* Sleep Interface */
154-
#define esif_ccb_sleep(sec) Sleep(sec * 1000)
155-
#define esif_ccb_sleep_msec(msec) Sleep(msec)
156-
157-
/* Deduce Platform based on predefined compiler flags */
158-
#ifdef _WIN64
159-
#define ESIF_ATTR_64BIT
160-
#endif
161-
162-
/* Deduce Debug Build for Windows. Non-Windows can define this in Makefile */
163-
#ifdef _DEBUG
164-
#define ESIF_ATTR_DEBUG
165-
#endif
166-
167-
#ifdef ESIF_ATTR_DEBUG
168-
#ifdef ESIF_ATTR_USER
169-
#define ESIF_ASSERT(x) \
170-
do { \
171-
if ESIF_CONSTEXPR(!(x)) \
172-
DebugBreak(); \
173-
} while ESIF_CONSTEXPR(0)
174-
175-
#else /* !ESIF_ATTR_USER */
176-
#define ESIF_ASSERT(x) ASSERT(x)
177-
#endif /* !ESIF_ATTR_USER */
178-
#else /* !ESIF_ATTR_DEBUG */
179-
#define ESIF_ASSERT(x) (0)
180-
#endif /* !ESIF_ATTR_DEBUG */
181-
182-
183-
#ifdef ESIF_ATTR_USER
184-
/* Byte Ordering Utilities (Winsock2.h) */
185-
#define esif_ccb_htons(val) htons(val)
186-
#define esif_ccb_htonl(val) htonl(val)
187-
#define esif_ccb_htonll(val) htonll(val)
188-
#endif
189-
190-
#endif /* WINDOWS */
191-
192-
#ifdef ESIF_ATTR_OS_LINUX
19377

19478
/* All Linux Derived OS */
19579

196-
#ifdef ESIF_ATTR_USER
19780
#include <unistd.h> /* POSIX API */
19881

19982
/* Common Windows Symbols */
@@ -206,7 +89,6 @@ typedef u64 esif_context_t; /* opaque ESIF 64-bit context (may be a pointer) */
20689
#include <x86intrin.h>
20790
#define ESIF_SERIAL_FENCE() _mm_lfence()
20891

209-
#endif
21092

21193
/* Add Linux Base Types */
21294
typedef unsigned char u8;
@@ -238,18 +120,8 @@ typedef u64 esif_handle_t; /* opaque ESIF 64-bit handle (may not be a pointer) *
238120
typedef u64 esif_context_t; /* opaque ESIF 64-bit context (may be a pointer) */
239121

240122
#ifdef ESIF_ATTR_DEBUG
241-
# ifdef ESIF_ATTR_USER
242123
# include <assert.h>
243124
# define ESIF_ASSERT(x) assert(x)
244-
# else
245-
# define ESIF_ASSERT(x) \
246-
do { \
247-
if (x) \
248-
break; \
249-
printk(KERN_EMERG "!ESIF_ASSERT! [%s@%s#%d]: %s\n", ESIF_FUNC, __FILE__, __LINE__, #x); \
250-
BUG(); \
251-
} while (0)
252-
# endif
253125
#else
254126
# define ESIF_ASSERT(x)
255127
#endif
@@ -274,7 +146,6 @@ typedef u64 esif_context_t; /* opaque ESIF 64-bit context (may be a pointer) */
274146
/* Used for constant expressions, such as do...while(0) loops */
275147
#define ESIF_CONSTEXPR(expr) (expr)
276148

277-
#ifdef ESIF_ATTR_USER
278149
/* Byte Ordering Utilities */
279150
#include <arpa/inet.h> /* htonl */
280151
#define esif_ccb_htons(val) htons(val)
@@ -286,9 +157,7 @@ static ESIF_INLINE u64 esif_ccb_htonll(u64 value)
286157
u32 lo = htonl((u32)value);
287158
return (((u64)lo) << 32) | hi;
288159
}
289-
#endif
290160

291-
#endif /* LINUX */
292161

293162
/*
294163
* OS Agnostic

‎Common/esif_ccb_atomic.h

+2-14
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,16 @@
5353

5454
#pragma once
5555

56+
#include "esif_ccb.h"
57+
5658
/*
5759
* C/C++ OS-Agnostic Universal Implementation of atomic integer operations.
5860
* Interface is based on native Linux atomic_t kernel type (atomic.h)
5961
* Note: atomic_t is 32 or 64 bit, depending on OS/Platform so treat as opaque
6062
*/
6163

62-
#if defined(ESIF_ATTR_KERNEL)
63-
64-
#if defined(ESIF_ATTR_OS_WINDOWS)
65-
#include "esif_ccb_atomic_win_kern.h"
66-
#elif defined(ESIF_ATTR_OS_LINUX)
67-
#include "esif_ccb_atomic_lin_kern.h"
68-
#endif
6964

70-
#elif defined(ESIF_ATTR_USER)
71-
72-
#if defined(ESIF_ATTR_OS_WINDOWS)
73-
#include "esif_ccb_atomic_win_user.h"
74-
#elif defined(ESIF_ATTR_OS_LINUX)
7565
#include "esif_ccb_atomic_lin_user.h"
76-
#endif
7766

7867
/* Disable User-Mode Atomic operations. Use at your own risk */
7968
#if defined(ATOMIC_LIB_DISABLE)
@@ -86,4 +75,3 @@
8675
# define atomic_sub(i, v) (*(v) -= (i))
8776
#endif
8877

89-
#endif /* USER */

‎Common/esif_ccb_atomic_lin_user.h

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#pragma once
2020

21-
#if defined(ESIF_ATTR_OS_LINUX) && defined(ESIF_ATTR_USER)
2221

2322
/* Linux User: Use native x86/x64 type and __atomic builtin functions [gcc 4.7.0 or higher] */
2423

@@ -69,4 +68,3 @@ typedef volatile atomic_basetype atomic_t;
6968
#define atomic_sub(i, v) __atomic_fetch_sub(v, i, __ATOMIC_SEQ_CST)
7069
#endif /* !DISABLE */
7170

72-
#endif /* LINUX USER */

‎Common/esif_ccb_cpuid.h

+2-12
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353

5454
#pragma once
5555

56+
#include "esif_ccb.h"
57+
5658
/*
5759
* C/C++ OS-Agnostic Universal Implementation of the cpuid intrinsic.
5860
*/
@@ -123,17 +125,5 @@ typedef struct esif_ccb_cpuid_s {
123125

124126
#pragma pack(pop)
125127

126-
#if defined(ESIF_ATTR_KERNEL)
127-
#if defined(ESIF_ATTR_OS_WINDOWS)
128-
#include "esif_ccb_cpuid_win_kern.h"
129-
#elif defined(ESIF_ATTR_OS_LINUX)
130-
#include "esif_ccb_cpuid_lin_kern.h"
131-
#endif
132-
#elif defined(ESIF_ATTR_USER)
133-
#if defined(ESIF_ATTR_OS_WINDOWS)
134-
#include "esif_ccb_cpuid_win_user.h"
135-
#elif defined(ESIF_ATTR_OS_LINUX)
136128
#include "esif_ccb_cpuid_lin_user.h"
137-
#endif
138129

139-
#endif /* USER */

‎Common/esif_ccb_cpuid_lin_user.h

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#pragma once
2020

21-
#if defined(ESIF_ATTR_OS_LINUX) && defined(ESIF_ATTR_USER)
2221

2322
#include <cpuid.h>
2423

@@ -31,4 +30,3 @@ static ESIF_INLINE void esif_ccb_cpuid(esif_ccb_cpuid_t *cpuidPtr)
3130
&cpuidPtr->edx);
3231
}
3332

34-
#endif /* LINUX USER */

‎Common/esif_ccb_env.h

-25
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,9 @@
1818

1919
#pragma once
2020

21-
#if defined(ESIF_ATTR_USER)
22-
2321
#include "esif_ccb.h"
2422

25-
#if defined(ESIF_ATTR_OS_WINDOWS)
26-
27-
// Get Environment variable
28-
static ESIF_INLINE char *esif_ccb_getenv(const char *name)
29-
{
30-
char *path = NULL;
31-
size_t len = 0;
32-
33-
if (_dupenv_s(&path, &len, name) != 0)
34-
path = NULL;
35-
return path;
36-
}
37-
38-
static ESIF_INLINE void esif_ccb_envfree(char *name)
39-
{
40-
if (name) {
41-
free(name);
42-
}
43-
}
44-
4523

46-
#elif defined(ESIF_ATTR_OS_LINUX)
4724

4825
#include <stdlib.h>
4926

@@ -52,6 +29,4 @@ static ESIF_INLINE void esif_ccb_envfree(char *name)
5229

5330
#define esif_ccb_envfree(arg) ((void)(0))
5431

55-
#endif /* LINUX */
5632

57-
#endif /* USER */

‎Common/esif_ccb_file.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,8 @@
1818

1919
#pragma once
2020

21-
#if defined(ESIF_ATTR_USER)
22-
2321
#include "esif_ccb.h"
2422

25-
#if defined(ESIF_ATTR_OS_WINDOWS)
26-
#include "esif_ccb_file_win_user.h"
27-
#elif defined(ESIF_ATTR_OS_LINUX)
23+
2824
#include "esif_ccb_file_lin_user.h"
29-
#endif
3025

31-
#endif /* USER */

‎Common/esif_ccb_file_lin_user.h

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#pragma once
2020

21-
#if defined(ESIF_ATTR_OS_LINUX) && defined(ESIF_ATTR_USER)
2221

2322
#include <errno.h>
2423
#include <unistd.h>
@@ -291,4 +290,3 @@ static ESIF_INLINE void esif_ccb_file_enum_close(esif_ccb_file_enum_t find_handl
291290
esif_ccb_free(find_handle);
292291
}
293292

294-
#endif /* LINUX USER */

0 commit comments

Comments
 (0)