Skip to content

Commit

Permalink
Function and parameter rename.
Browse files Browse the repository at this point in the history
  • Loading branch information
Juha Heiskanen authored and juhhei01 committed Feb 13, 2018
1 parent 5af7992 commit 15d4465
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions source/6LoWPAN/ws/ws_llc_data_service.c
Expand Up @@ -122,7 +122,7 @@ static mpx_user_t * ws_llc_mpx_user_discover(mpx_class_t *mpx_class, uint16_t us
static llc_data_base_t * ws_llc_base_allocate(void);
static void ws_llc_mac_confirm_cb(const mac_api_t* api, const mcps_data_conf_t *data, const mcps_data_conf_payload_t *conf_data);
static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t *data, const mcps_data_ie_list_t *ie_ext);
static uint16_t ws_mpx_over_head_size_get(llc_data_base_t *base, uint16_t user_id);
static uint16_t ws_mpx_header_size_get(llc_data_base_t *base, uint16_t user_id);
static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data_req_s *data, uint16_t user_id);
static int8_t ws_llc_mpx_data_cb_register(const mpx_api_t* api, mpx_data_confirm *confirm_cb, mpx_data_indication *indication_cb, uint16_t user_id);
static uint16_t ws_llc_mpx_header_size_get(const mpx_api_t * api, uint16_t user_id);
Expand Down Expand Up @@ -466,24 +466,24 @@ static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t

}

static uint16_t ws_mpx_over_head_size_get(llc_data_base_t *base, uint16_t user_id)
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 over_head_size = 0;
uint16_t header_size = 0;
if (user_id == MPX_LOWPAN_ENC_USER_ID) {
over_head_size += 7+ 5 + 2; //UTT+ MPX + Padding
header_size += 7+ 5 + 2; //UTT+ MPX + Padding
if (base->ie_params.vendor_header_length) {
over_head_size += base->ie_params.vendor_header_length + 3;
header_size += base->ie_params.vendor_header_length + 3;
}

if (base->ie_params.vendor_payload_length) {
over_head_size += base->ie_params.vendor_header_length + 4;
header_size += base->ie_params.vendor_header_length + 4;
}
} else if (MPX_KEY_MANAGEMENT_ENC_USER_ID) {
over_head_size += 7+ 5 + 2;
header_size += 7+ 5 + 2;
}

return over_head_size;
return header_size;
}

static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data_req_s *data, uint16_t user_id)
Expand Down Expand Up @@ -604,7 +604,7 @@ static uint16_t ws_llc_mpx_header_size_get(const mpx_api_t * api, uint16_t user_
return 0;
}

return ws_mpx_over_head_size_get(base, user_id);
return ws_mpx_header_size_get(base, user_id);
}

static void ws_llc_mpx_data_purge_request(const mpx_api_t *api, struct mcps_purge_s *purge, uint16_t user_id)
Expand Down

0 comments on commit 15d4465

Please sign in to comment.