mirror of
https://github.com/openharmony/developtools_syscap_codec.git
synced 2026-08-27 02:11:19 -04:00
Merge branch 'master' of https://gitee.com/openharmony/developtools_syscap_codec into syscap-extern
Change-Id: I4958028e552cd85fa31ae44f86c6b8129f291914
This commit is contained in:
@@ -13,8 +13,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef _SYSCAP_DEFINE_H
|
||||
#define _SYSCAP_DEFINE_H
|
||||
#ifndef SYSCAP_DEFINE_H
|
||||
#define SYSCAP_DEFINE_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -283,6 +283,7 @@ typedef enum SystemCapabilityNum {
|
||||
GRAPHIC_SURFACE_LITE,
|
||||
GRAPHIC_GRAPHIC_UTILS_LITE,
|
||||
WINDOW_WINDOW_MANAGER_LITE,
|
||||
DRIVER_DEVICEMANAGER_EXTENSION,
|
||||
// Add before here
|
||||
SYSCAP_NUM_MAX = 500
|
||||
} SyscapNum;
|
||||
@@ -547,6 +548,7 @@ const static SyscapWithNum g_arraySyscap[] = {
|
||||
{"SystemCapability.Graphic.SurfaceLite", GRAPHIC_SURFACE_LITE},
|
||||
{"SystemCapability.Graphic.GraphicUtilsLite", GRAPHIC_GRAPHIC_UTILS_LITE},
|
||||
{"SystemCapability.Window.WindowManagerLite", WINDOW_WINDOW_MANAGER_LITE},
|
||||
{"SystemCapability.Driver.DeviceManager.Extension", DRIVER_DEVICEMANAGER_EXTENSION},
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -554,4 +556,4 @@ const static SyscapWithNum g_arraySyscap[] = {
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
#endif /* __cplusplus */
|
||||
#endif // _SYSCAP_DEFINE_H
|
||||
#endif // SYSCAP_DEFINE_H
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef _CREATE_PCID_H
|
||||
#define _CREATE_PCID_H
|
||||
#ifndef CREATE_PCID_H
|
||||
#define CREATE_PCID_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -29,7 +29,7 @@ typedef struct ProductCompatibilityID {
|
||||
uint8_t osSyscap[OS_SYSCAP_BYTES];
|
||||
} PCIDMain;
|
||||
|
||||
typedef struct pcidHeader {
|
||||
typedef struct PcidHeader {
|
||||
uint16_t apiVersion : 15;
|
||||
uint16_t apiVersionType : 1;
|
||||
uint16_t systemType : 3;
|
||||
|
||||
Reference in New Issue
Block a user