Skip to content

Commit

Permalink
Disable wi-sun features temporary
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Juha Heiskanen committed Sep 19, 2018
1 parent 7e3c16c commit 60e1545
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions source/6LoWPAN/ws/ws_bootstrap.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
return 0xffff;
}

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

etx = etx_local_etx_read(interface->id,attribute_index);
Expand Down
9 changes: 9 additions & 0 deletions source/6LoWPAN/ws/ws_llc_data_service.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

#define LLC_MESSAGE_QUEUE_LIST_SIZE_MAX 16 //Do not config over 30 never
#define MPX_USER_SIZE 2
//#define ULAD_BT_IE

typedef struct {
uint16_t user_id; /**< User ID for identify MPX User */
Expand Down Expand Up @@ -577,7 +578,11 @@ static uint16_t ws_mpx_header_size_get(llc_data_base_t *base, uint16_t user_id)
//TODO add WS_WP_NESTED_IE support
uint16_t header_size = 0;
if (user_id == MPX_LOWPAN_ENC_USER_ID) {
#ifdef ULAD_BT_IE
header_size += 7 + 8 + 5 + 2; //UTT+BTT+ MPX + Padding
#else
header_size += 7 + 5 + 2; //UTT+ MPX + Padding
#endif
if (base->ie_params.vendor_header_length) {
header_size += base->ie_params.vendor_header_length + 3;
}
Expand Down Expand Up @@ -615,7 +620,9 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
wp_nested_ie_sub_list_t nested_wp_id;
memset(&nested_wp_id, 0, sizeof(wp_nested_ie_sub_list_t));
ie_header_mask.utt_ie = true;
#ifdef ULAD_BT_IE
ie_header_mask.bt_ie = true;
#endif
if (base->ie_params.vendor_header_length && user_id == MPX_LOWPAN_ENC_USER_ID) {
ie_header_mask.vh_ie = true;
}
Expand Down Expand Up @@ -676,7 +683,9 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
//Write UTT

ptr = ws_wh_utt_write(ptr, message->messsage_type);
#ifdef ULAD_BT_IE
ptr = ws_wh_bt_write(ptr);
#endif

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

0 comments on commit 60e1545

Please sign in to comment.