Skip to content

Commit 619e401

Browse files
Remove non-standard use_segment_header field; use #ifdef exclusively
Co-authored-by: Michal-Pogorzelec <80826463+Michal-Pogorzelec@users.noreply.github.com>
1 parent 9de6c2c commit 619e401

3 files changed

Lines changed: 4 additions & 16 deletions

File tree

examples/tc_example.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ int main(void) {
5858

5959
printf("\nDecoding frame...\n");
6060
sdlp_tc_frame_t decoded_frame;
61-
memset(&decoded_frame, 0, sizeof(decoded_frame));
62-
#ifdef TC_SEGMENT_HEADER_ENABLED
63-
decoded_frame.use_segment_header = 1;
64-
#endif
6561
result = sdlp_tc_decode_frame(buffer, encoded_size, &decoded_frame);
6662

6763
if (result != SDLP_SUCCESS) {

include/sdlp_tc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ typedef struct {
4444
typedef struct {
4545
sdlp_tc_header_t header;
4646
#ifdef TC_SEGMENT_HEADER_ENABLED
47-
uint8_t use_segment_header; /* non-zero if segment header is present */
4847
sdlp_tc_segment_header_t segment_header;
4948
#endif
5049
uint8_t data[TC_MAX_DATA_SIZE];

src/sdlp_tc.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ int sdlp_tc_encode_frame(const sdlp_tc_frame_t *frame, uint8_t *buffer,
3535
TC_FRAME_ERROR_CONTROL_SIZE;
3636

3737
#ifdef TC_SEGMENT_HEADER_ENABLED
38-
if (frame->use_segment_header && !frame->header.control_command_flag) {
38+
if (!frame->header.control_command_flag) {
3939
required_size += TC_SEGMENT_HEADER_SIZE;
4040
}
4141
#endif
@@ -57,7 +57,7 @@ int sdlp_tc_encode_frame(const sdlp_tc_frame_t *frame, uint8_t *buffer,
5757
buffer[offset++] = frame->header.frame_length & 0xFF;
5858

5959
#ifdef TC_SEGMENT_HEADER_ENABLED
60-
if (frame->use_segment_header && !frame->header.control_command_flag) {
60+
if (!frame->header.control_command_flag) {
6161
buffer[offset++] = ((frame->segment_header.sequence_flags & 0x03) << 6) |
6262
(frame->segment_header.map_id & 0x3F);
6363
}
@@ -81,14 +81,8 @@ int sdlp_tc_decode_frame(const uint8_t *buffer, size_t buffer_size,
8181
return SDLP_ERROR_INVALID_PARAM;
8282
}
8383

84-
#ifdef TC_SEGMENT_HEADER_ENABLED
85-
uint8_t saved_use_seg_hdr = frame->use_segment_header;
86-
#endif
8784
memset(frame, 0, sizeof(sdlp_tc_frame_t));
88-
#ifdef TC_SEGMENT_HEADER_ENABLED
89-
frame->use_segment_header = saved_use_seg_hdr;
90-
#endif
91-
85+
9286
size_t offset = 0;
9387

9488
frame->header.transfer_frame_version = (buffer[offset] >> 6) & 0x03;
@@ -105,7 +99,7 @@ int sdlp_tc_decode_frame(const uint8_t *buffer, size_t buffer_size,
10599
offset += 2;
106100

107101
#ifdef TC_SEGMENT_HEADER_ENABLED
108-
if (frame->use_segment_header && !frame->header.control_command_flag) {
102+
if (!frame->header.control_command_flag) {
109103
if (buffer_size < TC_PRIMARY_HEADER_SIZE + TC_SEGMENT_HEADER_SIZE + TC_FRAME_ERROR_CONTROL_SIZE) {
110104
return SDLP_ERROR_INVALID_FRAME;
111105
}
@@ -146,7 +140,6 @@ int sdlp_tc_set_segment_header(sdlp_tc_frame_t *frame, uint8_t sequence_flags, u
146140
}
147141
frame->segment_header.sequence_flags = sequence_flags & 0x03;
148142
frame->segment_header.map_id = map_id & 0x3F;
149-
frame->use_segment_header = 1;
150143
return SDLP_SUCCESS;
151144
}
152145
#endif

0 commit comments

Comments
 (0)