Skip to content

Commit b272386

Browse files
dawidprzybylodawidprzybylo
committed
nfc: ndef: Fix code style issues
Fixes code style for nfc/ndef files. Signed-off-by: Dawid Przybylo <dawid.przybylo@nordicsemi.no>
1 parent 4374989 commit b272386

21 files changed

Lines changed: 273 additions & 492 deletions

‎include/bm/nfc/ndef/ch.h‎

Lines changed: 61 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ struct nfc_ndef_ch_hc_rec {
7474
*/
7575
enum nfc_ndef_ch_ac_rec_cps {
7676
/** Alternative Carrier inactive. */
77-
NFC_AC_CPS_INACTIVE = 0x00,
77+
NFC_AC_CPS_INACTIVE = 0x00,
7878

7979
/** Alternative Carrier active. */
80-
NFC_AC_CPS_ACTIVE = 0x01,
80+
NFC_AC_CPS_ACTIVE = 0x01,
8181

8282
/** Alternative Carrier activating. */
83-
NFC_AC_CPS_ACTIVATING = 0x02,
83+
NFC_AC_CPS_ACTIVATING = 0x02,
8484

8585
/** Alternative Carrier power status unknown. */
86-
NFC_AC_CPS_UNKNOWN = 0x03
86+
NFC_AC_CPS_UNKNOWN = 0x03
8787
};
8888

8989
/** Mask of Carrier Power State bits in a first ac record byte. */
@@ -162,8 +162,8 @@ struct nfc_ndef_ch_rec {
162162
* @retval 0 If the operation was successful.
163163
* Otherwise, a (negative) error code is returned.
164164
*/
165-
int nfc_ndef_ch_rec_payload_encode(const struct nfc_ndef_ch_rec *ch_rec,
166-
uint8_t *buf, uint32_t *len);
165+
int nfc_ndef_ch_rec_payload_encode(const struct nfc_ndef_ch_rec *ch_rec, uint8_t *buf,
166+
uint32_t *len);
167167

168168
/**
169169
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -186,25 +186,15 @@ int nfc_ndef_ch_rec_payload_encode(const struct nfc_ndef_ch_rec *ch_rec,
186186
* Connection Handover specification.
187187
* @param[in] _max_records Maximum number of local records.
188188
*/
189-
#define NFC_NDEF_CH_RECORD_DESC_DEF(_name, \
190-
_rec_type_field, \
191-
_major_version, \
192-
_minor_version, \
193-
_max_records) \
194-
NFC_NDEF_MSG_DEF(_name, _max_records); \
195-
struct nfc_ndef_ch_rec _name##_nfc_ch_rec = { \
196-
.major_version = _major_version, \
197-
.minor_version = _minor_version, \
198-
.local_records = &NFC_NDEF_MSG(_name) \
199-
}; \
200-
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, \
201-
TNF_WELL_KNOWN, \
202-
0, \
203-
0, \
204-
_rec_type_field, \
205-
NFC_NDEF_CH_REC_TYPE_LENGTH, \
206-
nfc_ndef_ch_rec_payload_encode, \
207-
&(_name##_nfc_ch_rec))
189+
#define NFC_NDEF_CH_RECORD_DESC_DEF(_name, _rec_type_field, _major_version, _minor_version, \
190+
_max_records) \
191+
NFC_NDEF_MSG_DEF(_name, _max_records); \
192+
struct nfc_ndef_ch_rec _name##_nfc_ch_rec = {.major_version = _major_version, \
193+
.minor_version = _minor_version, \
194+
.local_records = &NFC_NDEF_MSG(_name)}; \
195+
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, TNF_WELL_KNOWN, 0, 0, _rec_type_field, \
196+
NFC_NDEF_CH_REC_TYPE_LENGTH, \
197+
nfc_ndef_ch_rec_payload_encode, &(_name##_nfc_ch_rec))
208198

209199
/**
210200
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -226,15 +216,9 @@ int nfc_ndef_ch_rec_payload_encode(const struct nfc_ndef_ch_rec *ch_rec,
226216
* @param[in] _max_records Maximum number of local records
227217
* struct (ac records plus optional err record).
228218
*/
229-
#define NFC_NDEF_CH_HS_RECORD_DESC_DEF(_name, \
230-
_major_version, \
231-
_minor_version, \
232-
_max_records) \
233-
NFC_NDEF_CH_RECORD_DESC_DEF(_name, \
234-
nfc_ndef_ch_hs_rec_type_field, \
235-
_major_version, \
236-
_minor_version, \
237-
_max_records)
219+
#define NFC_NDEF_CH_HS_RECORD_DESC_DEF(_name, _major_version, _minor_version, _max_records) \
220+
NFC_NDEF_CH_RECORD_DESC_DEF(_name, nfc_ndef_ch_hs_rec_type_field, _major_version, \
221+
_minor_version, _max_records)
238222

239223
/**
240224
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -256,15 +240,9 @@ int nfc_ndef_ch_rec_payload_encode(const struct nfc_ndef_ch_rec *ch_rec,
256240
* @param[in] _max_records Maximum number of local records
257241
* (cr record plus ac records).
258242
*/
259-
#define NFC_NDEF_CH_HR_RECORD_DESC_DEF(_name, \
260-
_major_version, \
261-
_minor_version, \
262-
_max_records) \
263-
NFC_NDEF_CH_RECORD_DESC_DEF(_name, \
264-
nfc_ndef_ch_hr_rec_type_field, \
265-
_major_version, \
266-
_minor_version, \
267-
_max_records)
243+
#define NFC_NDEF_CH_HR_RECORD_DESC_DEF(_name, _major_version, _minor_version, _max_records) \
244+
NFC_NDEF_CH_RECORD_DESC_DEF(_name, nfc_ndef_ch_hr_rec_type_field, _major_version, \
245+
_minor_version, _max_records)
268246

269247
/**
270248
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -286,15 +264,9 @@ int nfc_ndef_ch_rec_payload_encode(const struct nfc_ndef_ch_rec *ch_rec,
286264
* @param[in] _max_records Maximum number of local records
287265
* (ac records).
288266
*/
289-
#define NFC_NDEF_CH_HM_RECORD_DESC_DEF(_name, \
290-
_major_version, \
291-
_minor_version, \
292-
_max_records) \
293-
NFC_NDEF_CH_RECORD_DESC_DEF(_name, \
294-
nfc_ndef_ch_hm_rec_type_field, \
295-
_major_version, \
296-
_minor_version, \
297-
_max_records)
267+
#define NFC_NDEF_CH_HM_RECORD_DESC_DEF(_name, _major_version, _minor_version, _max_records) \
268+
NFC_NDEF_CH_RECORD_DESC_DEF(_name, nfc_ndef_ch_hm_rec_type_field, _major_version, \
269+
_minor_version, _max_records)
298270

299271
/**
300272
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -313,15 +285,9 @@ int nfc_ndef_ch_rec_payload_encode(const struct nfc_ndef_ch_rec *ch_rec,
313285
* Connection Handover specification.
314286
* @param[in] _max_records Maximum number of local records (ac records).
315287
*/
316-
#define NFC_NDEF_CH_HI_RECORD_DESC_DEF(_name, \
317-
_major_version, \
318-
_minor_version, \
319-
_max_records) \
320-
NFC_NDEF_CH_RECORD_DESC_DEF(_name, \
321-
nfc_ndef_ch_hi_rec_type_field, \
322-
_major_version, \
323-
_minor_version, \
324-
_max_records)
288+
#define NFC_NDEF_CH_HI_RECORD_DESC_DEF(_name, _major_version, _minor_version, _max_records) \
289+
NFC_NDEF_CH_RECORD_DESC_DEF(_name, nfc_ndef_ch_hi_rec_type_field, _major_version, \
290+
_minor_version, _max_records)
325291

326292
/**
327293
* @brief Macro for accessing the NFC NDEF Handover Select record descriptor
@@ -366,8 +332,8 @@ int nfc_ndef_ch_rec_local_record_add(struct nfc_ndef_record_desc *ch_rec,
366332
* @retval 0 If the operation was successful.
367333
* Otherwise, a (negative) error code is returned.
368334
*/
369-
int nfc_ndef_ch_hc_rec_payload_encode(const struct nfc_ndef_ch_hc_rec *hc_rec,
370-
uint8_t *buf, uint32_t *len);
335+
int nfc_ndef_ch_hc_rec_payload_encode(const struct nfc_ndef_ch_hc_rec *hc_rec, uint8_t *buf,
336+
uint32_t *len);
371337

372338
/**
373339
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -386,19 +352,12 @@ int nfc_ndef_ch_hc_rec_payload_encode(const struct nfc_ndef_ch_hc_rec *hc_rec,
386352
* @param[in] _payload_id_length Length of the payload.
387353
* @param[in] _payload_desc Description of the payload.
388354
*/
389-
#define NFC_NDEF_CH_HC_RECORD_DESC_DEF(_name, \
390-
_payload_id, \
391-
_payload_id_length, \
392-
_payload_desc) \
393-
\
394-
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, \
395-
TNF_WELL_KNOWN, \
396-
_payload_id, \
397-
_payload_id_length, \
398-
nfc_ndef_ch_hc_rec_type_field, \
399-
NFC_NDEF_CH_REC_TYPE_LENGTH, \
400-
nfc_ndef_ch_hc_rec_payload_encode, \
401-
(_payload_desc))
355+
#define NFC_NDEF_CH_HC_RECORD_DESC_DEF(_name, _payload_id, _payload_id_length, _payload_desc) \
356+
\
357+
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, TNF_WELL_KNOWN, _payload_id, _payload_id_length, \
358+
nfc_ndef_ch_hc_rec_type_field, \
359+
NFC_NDEF_CH_REC_TYPE_LENGTH, \
360+
nfc_ndef_ch_hc_rec_payload_encode, (_payload_desc))
402361

403362
/**
404363
* @brief Macro for accessing the NFC NDEF Handover Carrier record descriptor
@@ -420,8 +379,8 @@ int nfc_ndef_ch_hc_rec_payload_encode(const struct nfc_ndef_ch_hc_rec *hc_rec,
420379
* @retval 0 If the operation was successful.
421380
* Otherwise, a (negative) error code is returned.
422381
*/
423-
int nfc_ndef_ch_ac_rec_payload_encode(const struct nfc_ndef_ch_ac_rec *nfc_rec_ac,
424-
uint8_t *buf, uint32_t *len);
382+
int nfc_ndef_ch_ac_rec_payload_encode(const struct nfc_ndef_ch_ac_rec *nfc_rec_ac, uint8_t *buf,
383+
uint32_t *len);
425384

426385
/**
427386
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -442,29 +401,19 @@ int nfc_ndef_ch_ac_rec_payload_encode(const struct nfc_ndef_ch_ac_rec *nfc_rec_a
442401
* @param[in] _max_aux_data_ref_cnt Maximum number of Auxiliary Data Reference
443402
* fields.
444403
*/
445-
#define NFC_NDEF_CH_AC_RECORD_DESC_DEF(_name, \
446-
_cps, \
447-
_carr_data_ref_len, \
448-
_carr_data_ref, \
449-
_max_aux_data_ref_cnt) \
450-
struct nfc_ndef_ch_ac_rec_ref \
451-
_name##nfc_ndef_ch_ac_rec_ref[_max_aux_data_ref_cnt]; \
452-
struct nfc_ndef_ch_ac_rec \
453-
_name##_nfc_ac_rec = { \
454-
.cps = _cps, \
455-
.carrier_data_ref = { _carr_data_ref_len, _carr_data_ref }, \
456-
.max_aux_data_ref_cnt = _max_aux_data_ref_cnt, \
457-
.aux_data_ref_cnt = 0, \
458-
.aux_data_ref = _name##nfc_ndef_ch_ac_rec_ref \
459-
}; \
460-
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, \
461-
TNF_WELL_KNOWN, \
462-
0, \
463-
0, \
464-
nfc_ndef_ch_ac_rec_type_field, \
465-
NFC_NDEF_CH_REC_TYPE_LENGTH, \
466-
nfc_ndef_ch_ac_rec_payload_encode, \
467-
&(_name##_nfc_ac_rec))
404+
#define NFC_NDEF_CH_AC_RECORD_DESC_DEF(_name, _cps, _carr_data_ref_len, _carr_data_ref, \
405+
_max_aux_data_ref_cnt) \
406+
struct nfc_ndef_ch_ac_rec_ref _name##nfc_ndef_ch_ac_rec_ref[_max_aux_data_ref_cnt]; \
407+
struct nfc_ndef_ch_ac_rec _name##_nfc_ac_rec = { \
408+
.cps = _cps, \
409+
.carrier_data_ref = {_carr_data_ref_len, _carr_data_ref}, \
410+
.max_aux_data_ref_cnt = _max_aux_data_ref_cnt, \
411+
.aux_data_ref_cnt = 0, \
412+
.aux_data_ref = _name##nfc_ndef_ch_ac_rec_ref}; \
413+
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, TNF_WELL_KNOWN, 0, 0, \
414+
nfc_ndef_ch_ac_rec_type_field, \
415+
NFC_NDEF_CH_REC_TYPE_LENGTH, \
416+
nfc_ndef_ch_ac_rec_payload_encode, &(_name##_nfc_ac_rec))
468417

469418
/**
470419
* @brief Macro for accessing the NFC NDEF Alternative Carrier record descriptor
@@ -495,8 +444,7 @@ void nfc_ndef_ch_ac_rec_auxiliary_data_ref_clear(struct nfc_ndef_record_desc *ac
495444
* Otherwise, a (negative) error code is returned.
496445
*/
497446
int nfc_ndef_ch_ac_rec_auxiliary_data_ref_add(struct nfc_ndef_record_desc *ac_rec,
498-
const uint8_t *aux_data,
499-
uint8_t aux_length);
447+
const uint8_t *aux_data, uint8_t aux_length);
500448

501449
/**
502450
* @brief Constructor for an NFC NDEF Collision Resolution record payload.
@@ -512,8 +460,8 @@ int nfc_ndef_ch_ac_rec_auxiliary_data_ref_add(struct nfc_ndef_record_desc *ac_re
512460
* @retval 0 If the operation was successful.
513461
* Otherwise, a (negative) error code is returned.
514462
*/
515-
int nfc_ndef_ch_cr_rec_payload_encode(const struct nfc_ndef_ch_cr_rec *nfc_rec_cr,
516-
uint8_t *buf, uint32_t *len);
463+
int nfc_ndef_ch_cr_rec_payload_encode(const struct nfc_ndef_ch_cr_rec *nfc_rec_cr, uint8_t *buf,
464+
uint32_t *len);
517465

518466
/**
519467
* @brief Macro for creating and initializing an NFC NDEF record descriptor
@@ -531,20 +479,14 @@ int nfc_ndef_ch_cr_rec_payload_encode(const struct nfc_ndef_ch_cr_rec *nfc_rec_c
531479
* @param[in] _random_number Generated random number required to
532480
* resolve a collision.
533481
*/
534-
#define NFC_NDEF_CH_CR_RECORD_DESC_DEF(_name, \
535-
_random_number) \
536-
struct nfc_ndef_ch_cr_rec \
537-
_name##_nfc_cr_rec = { \
538-
.random = _random_number, \
539-
}; \
540-
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, \
541-
TNF_WELL_KNOWN, \
542-
0, \
543-
0, \
544-
nfc_ndef_ch_cr_rec_type_field, \
545-
NFC_NDEF_CH_REC_TYPE_LENGTH, \
546-
nfc_ndef_ch_cr_rec_payload_encode, \
547-
&(_name##_nfc_cr_rec))
482+
#define NFC_NDEF_CH_CR_RECORD_DESC_DEF(_name, _random_number) \
483+
struct nfc_ndef_ch_cr_rec _name##_nfc_cr_rec = { \
484+
.random = _random_number, \
485+
}; \
486+
NFC_NDEF_GENERIC_RECORD_DESC_DEF(_name, TNF_WELL_KNOWN, 0, 0, \
487+
nfc_ndef_ch_cr_rec_type_field, \
488+
NFC_NDEF_CH_REC_TYPE_LENGTH, \
489+
nfc_ndef_ch_cr_rec_payload_encode, &(_name##_nfc_cr_rec))
548490

549491
/** @brief Macro for accessing the NFC NDEF Alternative Carrier record
550492
* descriptor instance that was created with

‎include/bm/nfc/ndef/ch_msg.h‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ struct nfc_ndef_ch_msg_records {
5757
* @retval 0 If the operation was successful.
5858
* Otherwise, a (negative) error code is returned.
5959
*/
60-
int nfc_ndef_ch_msg_le_oob_encode(const struct nfc_ndef_le_oob_rec_payload_desc *oob,
61-
uint8_t *buf, size_t *len);
60+
int nfc_ndef_ch_msg_le_oob_encode(const struct nfc_ndef_le_oob_rec_payload_desc *oob, uint8_t *buf,
61+
size_t *len);
6262

6363
/**
6464
* @brief Create an NFC NDEF Handover Select message.
@@ -80,8 +80,7 @@ int nfc_ndef_ch_msg_le_oob_encode(const struct nfc_ndef_le_oob_rec_payload_desc
8080
* @retval 0 If the operation was successful.
8181
* Otherwise, a (negative) error code is returned.
8282
*/
83-
int nfc_ndef_ch_msg_hs_create(struct nfc_ndef_msg_desc *msg,
84-
struct nfc_ndef_record_desc *hs_rec,
83+
int nfc_ndef_ch_msg_hs_create(struct nfc_ndef_msg_desc *msg, struct nfc_ndef_record_desc *hs_rec,
8584
const struct nfc_ndef_ch_msg_records *records);
8685

8786
/**
@@ -105,8 +104,7 @@ int nfc_ndef_ch_msg_hs_create(struct nfc_ndef_msg_desc *msg,
105104
* @retval 0 If the operation was successful.
106105
* Otherwise, a (negative) error code is returned.
107106
*/
108-
int nfc_ndef_ch_msg_hr_create(struct nfc_ndef_msg_desc *msg,
109-
struct nfc_ndef_record_desc *hr_rec,
107+
int nfc_ndef_ch_msg_hr_create(struct nfc_ndef_msg_desc *msg, struct nfc_ndef_record_desc *hr_rec,
110108
const struct nfc_ndef_record_desc *cr_rec,
111109
const struct nfc_ndef_ch_msg_records *records);
112110

@@ -130,8 +128,7 @@ int nfc_ndef_ch_msg_hr_create(struct nfc_ndef_msg_desc *msg,
130128
* @retval 0 If the operation was successful.
131129
* Otherwise, a (negative) error code is returned.
132130
*/
133-
int nfc_ndef_ch_msg_hm_create(struct nfc_ndef_msg_desc *msg,
134-
struct nfc_ndef_record_desc *hm_rec,
131+
int nfc_ndef_ch_msg_hm_create(struct nfc_ndef_msg_desc *msg, struct nfc_ndef_record_desc *hm_rec,
135132
const struct nfc_ndef_ch_msg_records *records);
136133

137134
/**
@@ -154,8 +151,7 @@ int nfc_ndef_ch_msg_hm_create(struct nfc_ndef_msg_desc *msg,
154151
* @retval 0 If the operation was successful.
155152
* Otherwise, a (negative) error code is returned.
156153
*/
157-
int nfc_ndef_ch_msg_hi_create(struct nfc_ndef_msg_desc *msg,
158-
struct nfc_ndef_record_desc *hi_rec,
154+
int nfc_ndef_ch_msg_hi_create(struct nfc_ndef_msg_desc *msg, struct nfc_ndef_record_desc *hi_rec,
159155
const struct nfc_ndef_ch_msg_records *records);
160156

161157
#ifdef _cplusplus

‎include/bm/nfc/ndef/launchapp_msg.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
extern "C" {
2323
#endif
2424

25-
2625
/** @brief Function for encoding an NFC NDEF launch app message.
2726
*
2827
* This function encodes an NFC NDEF message into a buffer.
@@ -43,12 +42,9 @@ extern "C" {
4342
* @retval Other codes might be returned depending on the functions @ref nfc_ndef_msg_encode
4443
* and @ref nfc_ndef_msg_record_add
4544
*/
46-
int nfc_launchapp_msg_encode(uint8_t const *android_package_name,
47-
uint32_t android_package_name_len,
48-
uint8_t const *universal_link,
49-
uint32_t universal_link_len,
50-
uint8_t *buf,
51-
size_t *len);
45+
int nfc_launchapp_msg_encode(uint8_t const *android_package_name, uint32_t android_package_name_len,
46+
uint8_t const *universal_link, uint32_t universal_link_len,
47+
uint8_t *buf, size_t *len);
5248

5349
#ifdef __cplusplus
5450
}
@@ -58,4 +54,4 @@ int nfc_launchapp_msg_encode(uint8_t const *android_package_name,
5854
* @}
5955
*/
6056

61-
#endif /* BM_NFC_LAUNCHAPP_MSG_H__ */
57+
#endif /* BM_NFC_LAUNCHAPP_MSG_H__ */

‎include/bm/nfc/ndef/launchapp_rec.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,10 @@ extern const uint8_t ndef_android_launchapp_rec_type[NFC_ANDROID_REC_TYPE_LENGTH
5050
* @param[in] package_name Pointer to the Android package name string.
5151
* @param[in] package_name_length Length of the Android package name.
5252
*/
53-
#define NFC_NDEF_ANDROID_LAUNCHAPP_RECORD_DESC_DEF(name, \
54-
package_name, \
55-
package_name_length) \
56-
NFC_NDEF_RECORD_BIN_DATA_DEF(name, \
57-
TNF_EXTERNAL_TYPE, \
58-
NULL, \
59-
0, \
60-
ndef_android_launchapp_rec_type, \
61-
sizeof(ndef_android_launchapp_rec_type), \
62-
(package_name), \
63-
(package_name_length))
53+
#define NFC_NDEF_ANDROID_LAUNCHAPP_RECORD_DESC_DEF(name, package_name, package_name_length) \
54+
NFC_NDEF_RECORD_BIN_DATA_DEF( \
55+
name, TNF_EXTERNAL_TYPE, NULL, 0, ndef_android_launchapp_rec_type, \
56+
sizeof(ndef_android_launchapp_rec_type), (package_name), (package_name_length))
6457

6558
/**
6659
* @brief Macro for accessing the NFC NDEF Android Application Record descriptor

0 commit comments

Comments
 (0)