fix: restore wrong modify of syscap_define.h.

- restore syscap  modify.
- update compile-time syscap define check progarm.

Signed-off-by: yudechen <chenyude@huawei.com>
Change-Id: I3d1116c8095a02fc039c0a77af2bd25d50f236c8
This commit is contained in:
yudechen
2022-12-06 19:02:22 +08:00
committed by chenyude
parent 22ff2fd9c5
commit fc727df793
4 changed files with 46 additions and 20 deletions
+11 -9
View File
@@ -46,10 +46,7 @@ typedef enum SystemCapabilityNum {
COMMUNICATION_BLUETOOTH_CORE,
COMMUNICATION_CONNECTEDTAG,
COMMUNICATION_NETMANAGER_CORE,
COMMUNICATION_NETMANAGER_ETHERNET,
COMMUNICATION_NETMANAGER_NETSHARING,
COMMUNICATION_NETMANAGER_MDNS,
COMMUNICATION_NETMANAGER_VPN,
COMMUNICATION_NETMANAGER_EXTENSION, // abandoned
COMMUNICATION_NETSTACK,
COMMUNICATION_NFC_CORE,
COMMUNICATION_SOFTBUS_CORE,
@@ -246,7 +243,6 @@ typedef enum SystemCapabilityNum {
RESOURCESCHEDULE_BACKGROUNDTASKMANAGER_EFFICIENCYRESOURCESAPPLY,
SECURITY_SECURITYGUARD,
SECURITY_CRYPTOFRAMEWORK,
// Add here
MULTIMODALINPUT_INPUT_COOPERATOR,
ABILITY_ABILITYRUNTIME_QUICKFIX,
SECURITY_DLPCREDENTIALSERVICE,
@@ -262,6 +258,11 @@ typedef enum SystemCapabilityNum {
MULTIMEDIA_AUDIO_INTERRUPT,
CLOUD_AAID,
MSDP_DEVICESTATUS_STATIONARY,
COMMUNICATION_NETMANAGER_ETHERNET,
COMMUNICATION_NETMANAGER_NETSHARING,
COMMUNICATION_NETMANAGER_MDNS,
COMMUNICATION_NETMANAGER_VPN,
// Add before here
SYSCAP_NUM_MAX = 960
} SyscapNum;
@@ -280,10 +281,7 @@ const static SyscapWithNum g_arraySyscap[] = {
{"SystemCapability.Communication.Bluetooth.Core", COMMUNICATION_BLUETOOTH_CORE},
{"SystemCapability.Communication.ConnectedTag", COMMUNICATION_CONNECTEDTAG},
{"SystemCapability.Communication.NetManager.Core", COMMUNICATION_NETMANAGER_CORE},
{"SystemCapability.Communication.NetManager.Ethernet", COMMUNICATION_NETMANAGER_ETHERNET},
{"SystemCapability.Communication.NetManager.NetSharing", COMMUNICATION_NETMANAGER_NETSHARING},
{"SystemCapability.Communication.NetManager.MDNS", COMMUNICATION_NETMANAGER_MDNS},
{"SystemCapability.Communication.NetManager.Vpn", COMMUNICATION_NETMANAGER_VPN},
{"SystemCapability.Communication.NetManager.Extension", COMMUNICATION_NETMANAGER_EXTENSION},
{"SystemCapability.Communication.NetStack", COMMUNICATION_NETSTACK},
{"SystemCapability.Communication.NFC.Core", COMMUNICATION_NFC_CORE},
{"SystemCapability.Communication.SoftBus.Core", COMMUNICATION_SOFTBUS_CORE},
@@ -502,6 +500,10 @@ const static SyscapWithNum g_arraySyscap[] = {
{"SystemCapability.Multimedia.Audio.Interrupt", MULTIMEDIA_AUDIO_INTERRUPT},
{"SystemCapability.Cloud.AAID", CLOUD_AAID},
{"SystemCapability.Msdp.DeviceStatus.Stationary", MSDP_DEVICESTATUS_STATIONARY},
{"SystemCapability.Communication.NetManager.Ethernet", COMMUNICATION_NETMANAGER_ETHERNET},
{"SystemCapability.Communication.NetManager.NetSharing", COMMUNICATION_NETMANAGER_NETSHARING},
{"SystemCapability.Communication.NetManager.MDNS", COMMUNICATION_NETMANAGER_MDNS},
{"SystemCapability.Communication.NetManager.Vpn", COMMUNICATION_NETMANAGER_VPN},
};
#ifdef __cplusplus