Skip to content

Commit 117bdbb

Browse files
cvinayakaescolar
cvinayak
authored and
aescolar
committed
Bluetooth: Controller: Use len instead of length in PDU structs
To be consistent in naming as len instead of length in PDU struct definitions. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent f4b4f30 commit 117bdbb

File tree

6 files changed

+98
-90
lines changed

6 files changed

+98
-90
lines changed

‎subsys/bluetooth/controller/ll_sw/isoal.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ static isoal_status_t isoal_rx_unframed_consume(struct isoal_sink *sink,
663663
/* If status is not ISOAL_PDU_STATUS_VALID, length and LLID cannot be trusted */
664664
llid = pdu_meta->pdu->ll_id;
665665
pdu_err = (pdu_meta->meta->status != ISOAL_PDU_STATUS_VALID);
666-
length = pdu_meta->pdu->length;
666+
length = pdu_meta->pdu->len;
667667
/* A zero length PDU with LLID 0b01 (PDU_BIS_LLID_START_CONTINUE) would be a padding PDU.
668668
* However if there are errors in the PDU, it could be an incorrectly receive non-padding
669669
* PDU. Therefore only consider a PDU with errors as padding if received after the end
@@ -861,7 +861,7 @@ static isoal_sdu_status_t isoal_check_seg_header(struct pdu_iso_sdu_sh *seg_hdr,
861861
}
862862

863863
if (pdu_size_remaining >= PDU_ISO_SEG_HDR_SIZE &&
864-
pdu_size_remaining >= PDU_ISO_SEG_HDR_SIZE + seg_hdr->length) {
864+
pdu_size_remaining >= PDU_ISO_SEG_HDR_SIZE + seg_hdr->len) {
865865

866866
/* Valid if there is sufficient data for the segment header and
867867
* there is sufficient data for the required length of the
@@ -911,20 +911,20 @@ static isoal_status_t isoal_rx_framed_consume(struct isoal_sink *sink,
911911
err = ISOAL_STATUS_OK;
912912
next_state = ISOAL_START;
913913
pdu_err = (pdu_meta->meta->status != ISOAL_PDU_STATUS_VALID);
914-
pdu_padding = (pdu_meta->pdu->length == 0);
914+
pdu_padding = (pdu_meta->pdu->len == 0);
915915

916916
if (sp->fsm == ISOAL_START) {
917917
seq_err = false;
918918
} else {
919919
seq_err = (meta->payload_number != (sp->prev_pdu_id + 1));
920920
}
921921

922-
end_of_pdu = ((uint8_t *) pdu_meta->pdu->payload) + pdu_meta->pdu->length - 1;
922+
end_of_pdu = ((uint8_t *) pdu_meta->pdu->payload) + pdu_meta->pdu->len - 1;
923923
seg_hdr = (pdu_err || seq_err || pdu_padding) ? NULL :
924924
(struct pdu_iso_sdu_sh *) pdu_meta->pdu->payload;
925925

926926
seg_err = false;
927-
if (seg_hdr && isoal_check_seg_header(seg_hdr, pdu_meta->pdu->length) ==
927+
if (seg_hdr && isoal_check_seg_header(seg_hdr, pdu_meta->pdu->len) ==
928928
ISOAL_SDU_STATUS_LOST_DATA) {
929929
seg_err = true;
930930
seg_hdr = NULL;
@@ -1037,7 +1037,7 @@ static isoal_status_t isoal_rx_framed_consume(struct isoal_sink *sink,
10371037
*/
10381038
uint8_t offset = ((uint8_t *) seg_hdr) + PDU_ISO_SEG_HDR_SIZE -
10391039
pdu_meta->pdu->payload;
1040-
uint8_t length = seg_hdr->length;
1040+
uint8_t length = seg_hdr->len;
10411041

10421042
if (!sc) {
10431043
/* time_offset included in header, don't copy offset field to SDU */
@@ -1057,7 +1057,7 @@ static isoal_status_t isoal_rx_framed_consume(struct isoal_sink *sink,
10571057

10581058
/* Find next segment header, set to null if past end of PDU */
10591059
seg_hdr = (struct pdu_iso_sdu_sh *) (((uint8_t *) seg_hdr) +
1060-
seg_hdr->length + PDU_ISO_SEG_HDR_SIZE);
1060+
seg_hdr->len + PDU_ISO_SEG_HDR_SIZE);
10611061

10621062
if (((uint8_t *) seg_hdr) > end_of_pdu) {
10631063
seg_hdr = NULL;
@@ -1434,7 +1434,7 @@ static isoal_status_t isoal_tx_pdu_emit(const struct isoal_source *source_ctx,
14341434
/* Set PDU LLID */
14351435
produced_pdu->contents.pdu->ll_id = pdu_ll_id;
14361436
/* Set PDU length */
1437-
produced_pdu->contents.pdu->length = (uint8_t)payload_size;
1437+
produced_pdu->contents.pdu->len = (uint8_t)payload_size;
14381438

14391439
/* Attempt to enqueue the node towards the LL */
14401440
status = source_ctx->session.pdu_emit(node_tx, handle);
@@ -1771,15 +1771,15 @@ static isoal_status_t isoal_insert_seg_header_timeoffset(struct isoal_source *so
17711771

17721772
seg_hdr.sc = sc;
17731773
seg_hdr.cmplt = cmplt;
1774-
seg_hdr.length = sc ? 0 : PDU_ISO_SEG_TIMEOFFSET_SIZE;
1774+
seg_hdr.len = sc ? 0 : PDU_ISO_SEG_TIMEOFFSET_SIZE;
17751775

17761776
if (!sc) {
17771777
seg_hdr.timeoffset = time_offset;
17781778
}
17791779

17801780
/* Store header */
17811781
pp->seg_hdr_sc = seg_hdr.sc;
1782-
pp->seg_hdr_length = seg_hdr.length;
1782+
pp->seg_hdr_length = seg_hdr.len;
17831783

17841784
/* Save location of last segmentation header so that it can be updated
17851785
* as data is written.
@@ -1822,7 +1822,7 @@ static isoal_status_t isoal_update_seg_header_cmplt_length(struct isoal_source *
18221822
/* Update the complete flag and length */
18231823
seg_hdr.cmplt = cmplt;
18241824
pp->seg_hdr_length += add_length;
1825-
seg_hdr.length = pp->seg_hdr_length;
1825+
seg_hdr.len = pp->seg_hdr_length;
18261826

18271827

18281828
/* Re-write the segmentation header at the same location */

‎subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ static void payload_set(uint8_t type, uint8_t len, uint8_t cte_len, uint8_t cte_
541541
struct pdu_dtm *pdu = radio_pkt_scratch_get();
542542

543543
pdu->type = type;
544-
pdu->length = len;
544+
pdu->len = len;
545545

546546
#if defined(CONFIG_BT_CTLR_DF_CTE_TX)
547547
pdu->cp = cte_len ? 1U : 0U;

‎subsys/bluetooth/controller/ll_sw/pdu.h

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,9 @@ struct pdu_iso {
992992
uint8_t hdr_other:6;
993993
uint8_t ll_id:2;
994994
#endif /* CONFIG_LITTLE_ENDIAN */
995-
uint8_t length;
995+
996+
uint8_t len;
997+
996998
uint8_t payload[0];
997999
} __packed;
9981000

@@ -1006,17 +1008,17 @@ struct pdu_iso_sdu_sh {
10061008
uint8_t cmplt:1;
10071009
uint8_t rfu:6;
10081010

1009-
uint8_t length;
1011+
uint8_t len;
10101012
/* Note, timeoffset only available in first segment of sdu */
10111013
uint32_t timeoffset:24;
10121014
uint32_t payload:8;
1013-
10141015
#else
10151016
uint8_t rfu:6;
10161017
uint8_t cmplt:1;
10171018
uint8_t sc:1;
10181019

1019-
uint8_t length;
1020+
uint8_t len;
1021+
10201022
/* Note, timeoffset only available in first segment of sdu */
10211023
uint32_t payload:8;
10221024
uint32_t timeoffset:24;
@@ -1050,7 +1052,9 @@ struct pdu_cis {
10501052
uint8_t nesn:1;
10511053
uint8_t ll_id:2;
10521054
#endif /* CONFIG_LITTLE_ENDIAN */
1053-
uint8_t length;
1055+
1056+
uint8_t len;
1057+
10541058
uint8_t payload[0];
10551059
} __packed;
10561060

@@ -1102,7 +1106,9 @@ struct pdu_bis {
11021106
uint8_t cssn:3;
11031107
uint8_t ll_id:2;
11041108
#endif /* CONFIG_LITTLE_ENDIAN */
1109+
11051110
uint8_t len;
1111+
11061112
union {
11071113
uint8_t payload[0];
11081114
struct pdu_big_ctrl ctrl;
@@ -1187,7 +1193,9 @@ struct pdu_dtm {
11871193
uint8_t rfu0:1;
11881194
uint8_t type:4;
11891195
#endif /* CONFIG_LITTLE_ENDIAN */
1190-
uint8_t length;
1196+
1197+
uint8_t len;
1198+
11911199
#if defined(CONFIG_BT_CTLR_DF_CTE_TX)
11921200
union {
11931201
uint8_t resv; /* TODO: remove nRF specific code */

‎tests/bluetooth/ctrl_isoal/src/isoal_test_common.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void isoal_test_create_unframed_pdu(uint8_t llid,
8787
pdu_meta->meta->status = status;
8888

8989
pdu_meta->pdu->ll_id = llid;
90-
pdu_meta->pdu->length = length;
90+
pdu_meta->pdu->len = length;
9191
memcpy(pdu_meta->pdu->payload, dataptr, length);
9292

9393
isoal_test_debug_print_rx_pdu(pdu_meta);
@@ -111,7 +111,7 @@ uint16_t isoal_test_insert_segment(bool sc, bool cmplt, uint32_t time_offset, ui
111111
uint8_t hdr_write_size;
112112
uint16_t pdu_data_loc;
113113

114-
pdu_payload_size = pdu_meta->pdu->length + length + PDU_ISO_SEG_HDR_SIZE +
114+
pdu_payload_size = pdu_meta->pdu->len + length + PDU_ISO_SEG_HDR_SIZE +
115115
(sc ? 0 : PDU_ISO_SEG_TIMEOFFSET_SIZE);
116116
hdr_write_size = PDU_ISO_SEG_HDR_SIZE + (sc ? 0 : PDU_ISO_SEG_TIMEOFFSET_SIZE);
117117
memset(&seg_hdr, 0, sizeof(seg_hdr));
@@ -121,18 +121,18 @@ uint16_t isoal_test_insert_segment(bool sc, bool cmplt, uint32_t time_offset, ui
121121

122122
seg_hdr.sc = sc;
123123
seg_hdr.cmplt = cmplt;
124-
seg_hdr.length = length + (sc ? 0 : PDU_ISO_SEG_TIMEOFFSET_SIZE);
124+
seg_hdr.len = length + (sc ? 0 : PDU_ISO_SEG_TIMEOFFSET_SIZE);
125125

126126
if (!sc) {
127127
seg_hdr.timeoffset = time_offset;
128128
}
129129

130-
memcpy(&pdu_meta->pdu->payload[pdu_meta->pdu->length], &seg_hdr, hdr_write_size);
131-
pdu_meta->pdu->length += hdr_write_size;
130+
memcpy(&pdu_meta->pdu->payload[pdu_meta->pdu->len], &seg_hdr, hdr_write_size);
131+
pdu_meta->pdu->len += hdr_write_size;
132132

133-
memcpy(&pdu_meta->pdu->payload[pdu_meta->pdu->length], dataptr, length);
134-
pdu_data_loc = pdu_meta->pdu->length;
135-
pdu_meta->pdu->length += length;
133+
memcpy(&pdu_meta->pdu->payload[pdu_meta->pdu->len], dataptr, length);
134+
pdu_data_loc = pdu_meta->pdu->len;
135+
pdu_meta->pdu->len += length;
136136

137137
isoal_test_debug_print_rx_pdu(pdu_meta);
138138

@@ -161,7 +161,7 @@ void isoal_test_create_framed_pdu_base(uint64_t payload_number, uint32_t timesta
161161
pdu_meta->meta->status = status;
162162

163163
pdu_meta->pdu->ll_id = PDU_BIS_LLID_FRAMED;
164-
pdu_meta->pdu->length = 0;
164+
pdu_meta->pdu->len = 0;
165165

166166
isoal_test_debug_print_rx_pdu(pdu_meta);
167167
}

‎tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_rx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9881,7 +9881,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_seg_err1)
98819881
sdu_timeoffset, &rx_pdu_meta_buf.pdu_meta);
98829882

98839883
/* Set an invalid length and incomplete header */
9884-
rx_pdu_meta_buf.pdu_meta.pdu->length = 3;
9884+
rx_pdu_meta_buf.pdu_meta.pdu->len = 3;
98859885

98869886
/* Set callback function return values */
98879887
push_custom_sink_sdu_alloc_test_output_buffer(&sdu_buffer[0]);
@@ -10173,7 +10173,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_seg_err2)
1017310173
sdu_timeoffset, &rx_pdu_meta_buf.pdu_meta);
1017410174

1017510175
/* Set an invalid length */
10176-
rx_pdu_meta_buf.pdu_meta.pdu->length -= 5;
10176+
rx_pdu_meta_buf.pdu_meta.pdu->len -= 5;
1017710177

1017810178
/* Set callback function return values */
1017910179
push_custom_sink_sdu_alloc_test_output_buffer(&sdu_buffer[1]);

0 commit comments

Comments
 (0)