Skip to content

Commit 60e1545

Browse files
author
Juha Heiskanen
committed
Disable wi-sun features temporary
Remove Broadacst timing information from ULAD Accept etx to return without check timing or shedule information This can be revert when driver MTU is dynamic. Change-Id: Ib497578139ff35d51fcea9d467ada26bfc649265
1 parent 7e3c16c commit 60e1545

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

source/6LoWPAN/ws/ws_bootstrap.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
521521
return 0xffff;
522522
}
523523

524+
#if 0
524525
//If we are not following gbobal Broadcast synch
525526
if (!interface->ws_info->pan_information.use_parent_bs) {
526527
//We must know both information's here
@@ -534,6 +535,7 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
534535
return 0xffff;
535536
}
536537
}
538+
#endif
537539
}
538540

539541
etx = etx_local_etx_read(interface->id,attribute_index);

source/6LoWPAN/ws/ws_llc_data_service.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
#define LLC_MESSAGE_QUEUE_LIST_SIZE_MAX 16 //Do not config over 30 never
4444
#define MPX_USER_SIZE 2
45+
//#define ULAD_BT_IE
4546

4647
typedef struct {
4748
uint16_t user_id; /**< User ID for identify MPX User */
@@ -577,7 +578,11 @@ static uint16_t ws_mpx_header_size_get(llc_data_base_t *base, uint16_t user_id)
577578
//TODO add WS_WP_NESTED_IE support
578579
uint16_t header_size = 0;
579580
if (user_id == MPX_LOWPAN_ENC_USER_ID) {
581+
#ifdef ULAD_BT_IE
580582
header_size += 7 + 8 + 5 + 2; //UTT+BTT+ MPX + Padding
583+
#else
584+
header_size += 7 + 5 + 2; //UTT+ MPX + Padding
585+
#endif
581586
if (base->ie_params.vendor_header_length) {
582587
header_size += base->ie_params.vendor_header_length + 3;
583588
}
@@ -615,7 +620,9 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
615620
wp_nested_ie_sub_list_t nested_wp_id;
616621
memset(&nested_wp_id, 0, sizeof(wp_nested_ie_sub_list_t));
617622
ie_header_mask.utt_ie = true;
623+
#ifdef ULAD_BT_IE
618624
ie_header_mask.bt_ie = true;
625+
#endif
619626
if (base->ie_params.vendor_header_length && user_id == MPX_LOWPAN_ENC_USER_ID) {
620627
ie_header_mask.vh_ie = true;
621628
}
@@ -676,7 +683,9 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
676683
//Write UTT
677684

678685
ptr = ws_wh_utt_write(ptr, message->messsage_type);
686+
#ifdef ULAD_BT_IE
679687
ptr = ws_wh_bt_write(ptr);
688+
#endif
680689

681690
if (user_id == MPX_LOWPAN_ENC_USER_ID && ie_header_mask.vh_ie) {
682691
ptr = ws_wh_vh_write(ptr, base->ie_params.vendor_header_data, base->ie_params.vendor_header_length);

0 commit comments

Comments
 (0)