Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

Commit 9644114

Browse files
authored
Merge pull request ARMmbed#1774 from ARMmbed/debug_trace_fix
Removed debug trace which could be called at interrupt routine
2 parents 1373a5f + 1e490f0 commit 9644114

File tree

3 files changed

+6
-22
lines changed

3 files changed

+6
-22
lines changed

source/MAC/IEEE802_15_4/mac_header_helper_functions.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -607,15 +607,11 @@ bool mac_header_information_elements_parse(mac_pre_parsed_frame_t *buffer)
607607
while (buffer->mac_payload_length >= 2) {
608608

609609
if (!mac_parse_header_ie(&header_ie, ptr)) {
610-
tr_debug("Not supported header %u", *ptr);
611-
ptr++;
612-
tr_debug("Not supported header %u", *ptr);
613610
return false;
614611
}
615612

616613
buffer->mac_payload_length -= 2;
617614
if (header_ie.length > buffer->mac_payload_length) {
618-
tr_debug("Not supported length");
619615
return false;
620616
}
621617

@@ -625,7 +621,6 @@ bool mac_header_information_elements_parse(mac_pre_parsed_frame_t *buffer)
625621
ptr += (2 + header_ie.length);
626622

627623
if (header_ie.id == MAC_HEADER_TERMINATION1_IE_ID) {
628-
//tr_debug("Termintad");
629624
break;
630625
} else if (header_ie.id == MAC_HEADER_TERMINATION2_IE_ID) {
631626
buffer->macPayloadPtr = ptr;

source/MAC/IEEE802_15_4/mac_mcps_sap.c

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,6 @@ static int8_t mac_command_sap_rx_handler(mac_pre_parsed_frame_t *buf, protocol_i
873873
case MAC_DATA_REQ:
874874
//Here 2 check
875875
if (mac_indirect_data_req_handle(buf, rf_mac_setup) == 0) {
876-
tr_debug("Trig Dummy packet");
877876
mac_lib_res_no_data_to_req(buf, rf_mac_setup);
878877
}
879878
retval = 0;
@@ -1120,7 +1119,6 @@ static void mac_pd_data_confirm_handle(protocol_interface_rf_mac_setup_s *rf_mac
11201119
mcps_data_confirm_handle(rf_mac_setup, buffer, NULL);
11211120
} else {
11221121
if (mcps_pd_data_request(rf_mac_setup, buffer) != 0) {
1123-
tr_debug("Asynch Request fail");
11241122
rf_mac_setup->active_pd_data_request = NULL;
11251123
mcps_data_confirm_handle(rf_mac_setup, buffer, NULL);
11261124
} else {
@@ -1699,7 +1697,6 @@ int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, const m
16991697
//Add MHR length to total length
17001698
frame_length += buffer->mac_header_length_with_security + buffer->security_mic_len;
17011699
if ((frame_length) > dev_driver->phy_MTU - 2) {
1702-
tr_debug("Too Long %u, %u pa %u header %u mic %u",frame_length, mac_payload_length, buffer->mac_header_length_with_security, buffer->security_mic_len, dev_driver->phy_MTU);
17031700
buffer->status = MLME_FRAME_TOO_LONG;
17041701

17051702
if (buffer->fcf_dsn.securityEnabled) {
@@ -1734,7 +1731,6 @@ int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, const m
17341731
csma_params.cca_enabled = false;
17351732
rf_ptr->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CSMA_PARAMETERS, (uint8_t*) &csma_params);
17361733
if (rf_ptr->active_pd_data_request) {
1737-
tr_debug("Cancel Timer");
17381734
mac_pd_sap_set_phy_tx_time(rf_ptr, 0, false);
17391735
}
17401736

@@ -2101,9 +2097,8 @@ void mcps_sap_pd_confirm(void *mac_ptr)
21012097
.priority = ARM_LIB_HIGH_PRIORITY_EVENT,
21022098
};
21032099

2104-
if (eventOS_event_send(&event) != 0) {
2105-
tr_error("mcps_sap_pd_confirm(): event send failed");
2106-
}
2100+
eventOS_event_send(&event);
2101+
21072102
}
21082103

21092104
void mcps_sap_pd_ack(void *ack_ptr)
@@ -2120,9 +2115,7 @@ void mcps_sap_pd_ack(void *ack_ptr)
21202115
.priority = ARM_LIB_HIGH_PRIORITY_EVENT,
21212116
};
21222117

2123-
if (eventOS_event_send(&event) != 0) {
2124-
tr_error("mcps_sap_pd_confirm(): event send failed");
2125-
}
2118+
eventOS_event_send(&event);
21262119
}
21272120

21282121
void mcps_sap_trig_tx(void *mac_ptr)
@@ -2142,9 +2135,7 @@ void mcps_sap_trig_tx(void *mac_ptr)
21422135
.priority = ARM_LIB_MED_PRIORITY_EVENT,
21432136
};
21442137

2145-
if (eventOS_event_send(&event) != 0) {
2146-
tr_error("mcps_sap_trig_tx(): event send failed");
2147-
} else {
2138+
if (eventOS_event_send(&event) == 0) {
21482139
mac_set_active_event(mac_ptr, MAC_SAP_TRIG_TX);
21492140
}
21502141
}
@@ -2167,9 +2158,7 @@ void mac_generic_event_trig(uint8_t event_type, void *mac_ptr, bool low_latency)
21672158
.priority = priority,
21682159
};
21692160

2170-
if (eventOS_event_send(&event) != 0) {
2171-
tr_error("mac_generic_event_trig(): event send failed");
2172-
}
2161+
eventOS_event_send(&event);
21732162
}
21742163

21752164
void mac_mcps_buffer_queue_free(protocol_interface_rf_mac_setup_s *rf_mac_setup) {

source/MAC/IEEE802_15_4/mac_security_mib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ mlme_key_descriptor_t * mac_sec_key_description_get(protocol_interface_rf_mac_se
395395
key_description++;
396396
}
397397

398-
tr_debug("LookuPdata search fail %s", trace_array(lookup_data, 9));
398+
//tr_debug("LookuPdata search fail %s", trace_array(lookup_data, 9));
399399

400400
return NULL;
401401
}

0 commit comments

Comments
 (0)