Skip to content

Commit 6224da5

Browse files
committed
config: Fix uncrustify check failures
Signed-off-by: Devaraj Ranganna <[email protected]>
1 parent aae9b6f commit 6224da5

File tree

8 files changed

+73
-83
lines changed

8 files changed

+73
-83
lines changed

Config/aws_configs/aws_clientcredential.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
*
2121
*/
2222

23-
// #define clientcredentialMQTT_BROKER_ENDPOINT ""
23+
/* #define clientcredentialMQTT_BROKER_ENDPOINT "" */
2424

2525
#ifndef clientcredentialMQTT_BROKER_ENDPOINT
26-
#error "Uncomment the clientcredentialMQTT_BROKER_ENDPOINT macro above and insert AWS IoT Core endpoint"
26+
#error "Uncomment the clientcredentialMQTT_BROKER_ENDPOINT macro above and insert AWS IoT Core endpoint"
2727
#endif /* clientcredentialMQTT_BROKER_ENDPOINT */
2828

2929
/**
@@ -34,10 +34,10 @@
3434
* Value is defined in "aws_clientcredential.h".
3535
*/
3636

37-
// #define clientcredentialIOT_THING_NAME ""
37+
/* #define clientcredentialIOT_THING_NAME "" */
3838

3939
#ifndef clientcredentialIOT_THING_NAME
40-
#error "Uncomment the clientcredentialIOT_THING_NAME macro above and insert MQTT client identifier"
40+
#error "Uncomment the clientcredentialIOT_THING_NAME macro above and insert MQTT client identifier"
4141
#endif /* clientcredentialIOT_THING_NAME */
4242

4343
/**
@@ -55,4 +55,4 @@
5555
#define clientcredentialWIFI_SSID ""
5656
#define clientcredentialWIFI_PASSWORD ""
5757
#define clientcredentialWIFI_SECURITY eWiFiSecurityWPA2
58-
#endif
58+
#endif /* ifndef __AWS_CLIENTCREDENTIAL__H__ */

Config/aws_configs/aws_mqtt_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/**
3535
* @brief Define assert for test project.
3636
*/
37-
#define mqttconfigASSERT( x ) if( ( x ) == 0 ) __asm("b . ");
37+
#define mqttconfigASSERT( x ) if( ( x ) == 0 ) __asm( "b . " );
3838

3939
/**
4040
* @brief Enable subscription management.
@@ -64,6 +64,6 @@
6464
/**
6565
* @brief Set this macro to 1 for enabling debug logs.
6666
*/
67-
#define mqttconfigENABLE_DEBUG_LOGS ( 0 )
67+
#define mqttconfigENABLE_DEBUG_LOGS ( 0 )
6868

6969
#endif /* _AWS_MQTT_CONFIG_H_ */

Config/aws_configs/core_mqtt_config.h

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
* macro sets the limit on how many simultaneous PUBLISH states an MQTT
4949
* context maintains.
5050
*/
51-
#define MQTT_STATE_ARRAY_MAX_COUNT ( 20U )
52-
// #define MQTT_RECV_POLLING_TIMEOUT_MS ( 250 )
51+
#define MQTT_STATE_ARRAY_MAX_COUNT ( 20U )
52+
/* #define MQTT_RECV_POLLING_TIMEOUT_MS ( 250 ) */
5353

5454
/*_RB_ To document and add to the mqtt config defaults header file. */
5555
#define MQTT_AGENT_COMMAND_QUEUE_LENGTH ( 32 )
@@ -75,14 +75,4 @@
7575
*/
7676
#define MQTT_AGENT_MAX_SUBSCRIPTION_FILTER_LENGTH ( 100 )
7777

78-
/**
79-
* @brief Dimensions the buffer used to serialize and deserialize MQTT packets.
80-
* @note Specified in bytes. Must be large enough to hold the maximum
81-
* anticipated MQTT payload.
82-
*/
83-
// #define MQTT_AGENT_NETWORK_BUFFER_SIZE ( 6 * 1024 )
84-
85-
86-
// #define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME ( 1 )
87-
8878
#endif /* ifndef CORE_MQTT_CONFIG_H */

Config/aws_configs/core_pkcs11_config.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
* @brief Malloc API used by core_pkcs11.h
4040
*/
4141
extern void * pvPortMalloc( size_t xWantedSize );
42-
#define PKCS11_MALLOC pvPortMalloc
42+
#define PKCS11_MALLOC pvPortMalloc
4343

4444
/**
4545
* @brief Free API used by core_pkcs11.h
4646
*/
4747
extern void vPortFree( void * pv );
48-
#define PKCS11_FREE vPortFree
48+
#define PKCS11_FREE vPortFree
4949

5050
/* A non-standard version of C_INITIALIZE should be used by this port. */
5151
/* #define pkcs11configC_INITIALIZE_ALT */
@@ -59,19 +59,19 @@ extern void vPortFree( void * pv );
5959
* both of those, the user PIN is assumed to be used herein for interoperability
6060
* purposes only, and not as a security feature.
6161
*/
62-
#define configPKCS11_DEFAULT_USER_PIN "0000"
62+
#define configPKCS11_DEFAULT_USER_PIN "0000"
6363

6464
/**
6565
* @brief Maximum length (in characters) for a PKCS #11 CKA_LABEL
6666
* attribute.
6767
*/
68-
#define pkcs11configMAX_LABEL_LENGTH 32
68+
#define pkcs11configMAX_LABEL_LENGTH 32
6969

7070
/**
7171
* @brief Maximum number of token objects that can be stored
7272
* by the PKCS #11 module.
7373
*/
74-
#define pkcs11configMAX_NUM_OBJECTS 6
74+
#define pkcs11configMAX_NUM_OBJECTS 6
7575

7676
/**
7777
* @brief Set to 1 if a PAL destroy object is implemented.
@@ -147,14 +147,14 @@ extern void vPortFree( void * pv );
147147
* Define the key ID of the device keys which will be saved as
148148
* persistent keys in TF-M. The key ID servers as the a name.
149149
*/
150-
#define PSA_DEVICE_PRIVATE_KEY_ID 0x01
151-
#define PSA_DEVICE_PUBLIC_KEY_ID 0x10
150+
#define PSA_DEVICE_PRIVATE_KEY_ID 0x01
151+
#define PSA_DEVICE_PUBLIC_KEY_ID 0x10
152152

153-
//
154-
// FIXME: are these needed?
155-
// extern void *MPU_pvPortMalloc( size_t xSize );
156-
// extern void MPU_vPortFree( void *pv );
153+
/* */
154+
/* FIXME: are these needed? */
155+
/* extern void *MPU_pvPortMalloc( size_t xSize ); */
156+
/* extern void MPU_vPortFree( void *pv ); */
157157

158-
// #define pvPortMalloc MPU_pvPortMalloc
159-
// #define vPortFree MPU_vPortFree
158+
/* #define pvPortMalloc MPU_pvPortMalloc */
159+
/* #define vPortFree MPU_vPortFree */
160160
#endif /* _AWS_PKCS11_CONFIG_H_ include guard. */

Config/aws_configs/demo_config.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* To use this demo, please configure the client's certificate and private key
3636
* in aws_configs/aws_clientcredential_keys.h
3737
* and credentials in aws_configs/aws_clientcredential.h.
38-
*
38+
*
3939
* For the AWS IoT MQTT broker, refer to the AWS documentation below for details
4040
* regarding client authentication.
4141
* https://docs.aws.amazon.com/iot/latest/developerguide/client-authentication.html
@@ -64,7 +64,7 @@
6464
/**
6565
* @brief The MQTT metrics string expected by AWS IoT.
6666
*/
67-
#define democonfigMQTT_USERNAME \
67+
#define democonfigMQTT_USERNAME \
6868
"?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
6969
"&MQTTLib=" democonfigMQTT_LIB
7070

@@ -74,9 +74,9 @@
7474
#define democonfigMQTT_USERNAME_LENGTH ( ( uint16_t ) ( sizeof( democonfigMQTT_USERNAME ) - 1 ) )
7575

7676
/* these are set in "aws_clientcredential.h and iot_default_root_certificates.h" */
77-
#define democonfigCLIENT_IDENTIFIER clientcredentialIOT_THING_NAME
78-
#define democonfigMQTT_BROKER_ENDPOINT clientcredentialMQTT_BROKER_ENDPOINT
79-
#define democonfigMQTT_BROKER_PORT clientcredentialMQTT_BROKER_PORT
80-
#define democonfigROOT_CA_PEM tlsATS1_ROOT_CERTIFICATE_PEM
77+
#define democonfigCLIENT_IDENTIFIER clientcredentialIOT_THING_NAME
78+
#define democonfigMQTT_BROKER_ENDPOINT clientcredentialMQTT_BROKER_ENDPOINT
79+
#define democonfigMQTT_BROKER_PORT clientcredentialMQTT_BROKER_PORT
80+
#define democonfigROOT_CA_PEM tlsATS1_ROOT_CERTIFICATE_PEM
8181

8282
#endif /* DEMO_CONFIG_H */

Config/aws_configs/mqtt_agent_demo_config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@
117117
/**
118118
* @brief The number of simple subscribe-publish tasks to create for the demo
119119
*/
120-
#define democonfigNUM_SIMPLE_SUB_PUB_TASKS_TO_CREATE 1
121-
#define democonfigSIMPLE_SUB_PUB_TASK_STACK_SIZE ( configMINIMAL_STACK_SIZE * 4 )
120+
#define democonfigNUM_SIMPLE_SUB_PUB_TASKS_TO_CREATE 1
121+
#define democonfigSIMPLE_SUB_PUB_TASK_STACK_SIZE ( configMINIMAL_STACK_SIZE * 4 )
122122

123123

124124
/**
125125
* @brief The maximum number of times to run the demo's task creation loop.
126126
*/
127-
#define democonfigMQTT_MAX_DEMO_COUNT ( 3 )
127+
#define democonfigMQTT_MAX_DEMO_COUNT ( 3 )
128128

129129
#endif /* MQTT_DEMO_CONNECTION_SHARING_CONFIG_H */

Config/aws_configs/mqtt_demo_mutual_auth_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
*
9595
* #define democonfigMQTT_BROKER_PORT "...insert here..."
9696
*/
97-
#define democonfigMQTT_BROKER_PORT 8883
97+
#define democonfigMQTT_BROKER_PORT 8883
9898

9999
/**
100100
* @brief Size of the network buffer for MQTT packets.

Config/tfm-config/project_config.h

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,84 +3,84 @@
33
* SPDX-License-Identifier: BSD-3-Clause
44
*/
55

6-
#define PLATFORM_SERVICE_INPUT_BUFFER_SIZE 64
6+
#define PLATFORM_SERVICE_INPUT_BUFFER_SIZE 64
77

8-
#define PLATFORM_SERVICE_OUTPUT_BUFFER_SIZE 64
8+
#define PLATFORM_SERVICE_OUTPUT_BUFFER_SIZE 64
99

10-
#define PLATFORM_SP_STACK_SIZE 0x500
10+
#define PLATFORM_SP_STACK_SIZE 0x500
1111

12-
#define PLATFORM_NV_COUNTER_MODULE_DISABLED 0
12+
#define PLATFORM_NV_COUNTER_MODULE_DISABLED 0
1313

14-
#define CRYPTO_ENGINE_BUF_SIZE 0x8000
14+
#define CRYPTO_ENGINE_BUF_SIZE 0x8000
1515

16-
#define CRYPTO_CONC_OPER_NUM 8
16+
#define CRYPTO_CONC_OPER_NUM 8
1717

18-
#define CRYPTO_RNG_MODULE_ENABLED 1
18+
#define CRYPTO_RNG_MODULE_ENABLED 1
1919

20-
#define CRYPTO_KEY_MODULE_ENABLED 1
20+
#define CRYPTO_KEY_MODULE_ENABLED 1
2121

22-
#define CRYPTO_AEAD_MODULE_ENABLED 1
22+
#define CRYPTO_AEAD_MODULE_ENABLED 1
2323

24-
#define CRYPTO_MAC_MODULE_ENABLED 1
24+
#define CRYPTO_MAC_MODULE_ENABLED 1
2525

26-
#define CRYPTO_HASH_MODULE_ENABLED 1
26+
#define CRYPTO_HASH_MODULE_ENABLED 1
2727

28-
#define CRYPTO_CIPHER_MODULE_ENABLED 1
28+
#define CRYPTO_CIPHER_MODULE_ENABLED 1
2929

30-
#define CRYPTO_ASYM_SIGN_MODULE_ENABLED 1
30+
#define CRYPTO_ASYM_SIGN_MODULE_ENABLED 1
3131

32-
#define CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED 1
32+
#define CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED 1
3333

34-
#define CRYPTO_KEY_DERIVATION_MODULE_ENABLED 1
34+
#define CRYPTO_KEY_DERIVATION_MODULE_ENABLED 1
3535

36-
#define CRYPTO_IOVEC_BUFFER_SIZE 5120
36+
#define CRYPTO_IOVEC_BUFFER_SIZE 5120
3737

38-
#define CRYPTO_NV_SEED 1
38+
#define CRYPTO_NV_SEED 1
3939

40-
#define CRYPTO_SINGLE_PART_FUNCS_DISABLED 0
40+
#define CRYPTO_SINGLE_PART_FUNCS_DISABLED 0
4141

42-
#define CRYPTO_STACK_SIZE 0x1B00
42+
#define CRYPTO_STACK_SIZE 0x1B00
4343

44-
#define TFM_FWU_BUF_SIZE PSA_FWU_MAX_WRITE_SIZE
44+
#define TFM_FWU_BUF_SIZE PSA_FWU_MAX_WRITE_SIZE
4545

46-
#define FWU_STACK_SIZE 0x600
46+
#define FWU_STACK_SIZE 0x600
4747

48-
#define ATTEST_INCLUDE_OPTIONAL_CLAIMS 1
48+
#define ATTEST_INCLUDE_OPTIONAL_CLAIMS 1
4949

50-
#define ATTEST_INCLUDE_COSE_KEY_ID 0
50+
#define ATTEST_INCLUDE_COSE_KEY_ID 0
5151

52-
#define ATTEST_STACK_SIZE 0x700
52+
#define ATTEST_STACK_SIZE 0x700
5353

54-
#define ATTEST_TOKEN_PROFILE_PSA_IOT_1 1
54+
#define ATTEST_TOKEN_PROFILE_PSA_IOT_1 1
5555

56-
#define ITS_CREATE_FLASH_LAYOUT 1
56+
#define ITS_CREATE_FLASH_LAYOUT 1
5757

58-
#define ITS_RAM_FS 0
58+
#define ITS_RAM_FS 0
5959

60-
#define ITS_VALIDATE_METADATA_FROM_FLASH 1
60+
#define ITS_VALIDATE_METADATA_FROM_FLASH 1
6161

62-
#define ITS_MAX_ASSET_SIZE 1300
62+
#define ITS_MAX_ASSET_SIZE 1300
6363

64-
#define ITS_BUF_SIZE ITS_MAX_ASSET_SIZE
64+
#define ITS_BUF_SIZE ITS_MAX_ASSET_SIZE
6565

66-
#define ITS_NUM_ASSETS 10
66+
#define ITS_NUM_ASSETS 10
6767

68-
#define ITS_STACK_SIZE 0x720
68+
#define ITS_STACK_SIZE 0x720
6969

70-
#define PS_CREATE_FLASH_LAYOUT 1
70+
#define PS_CREATE_FLASH_LAYOUT 1
7171

72-
#define PS_RAM_FS 0
72+
#define PS_RAM_FS 0
7373

74-
#define PS_ROLLBACK_PROTECTION 1
74+
#define PS_ROLLBACK_PROTECTION 1
7575

76-
#define PS_VALIDATE_METADATA_FROM_FLASH 1
76+
#define PS_VALIDATE_METADATA_FROM_FLASH 1
7777

78-
#define PS_MAX_ASSET_SIZE 2048
78+
#define PS_MAX_ASSET_SIZE 2048
7979

80-
#define PS_NUM_ASSETS 10
80+
#define PS_NUM_ASSETS 10
8181

82-
#define PS_STACK_SIZE 0x700
82+
#define PS_STACK_SIZE 0x700
8383

84-
#define CONFIG_TFM_CONN_HANDLE_MAX_NUM 8
84+
#define CONFIG_TFM_CONN_HANDLE_MAX_NUM 8
8585

86-
#define CONFIG_TFM_DOORBELL_API 0
86+
#define CONFIG_TFM_DOORBELL_API 0

0 commit comments

Comments
 (0)