ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12502 from DavidLin1577/patch-4 

Fixed macro error
pull/12510/head
Martin Kojtal 2020-02-25 09:52:29 +00:00 committed by GitHub
parent 745a4b4513 7f1443de88
commit a3f8202cde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TESTS/network/emac/emac_util.cpp
View File

@ -203,7 +203,7 @@ void emac_if_validate_outgoing_msg(void)
if (outgoing_msgs[i].flags & RESPONSE_RECEIVED) {
int failure = outgoing_msgs[i].flags & (INVALID_LENGHT | INVALID_DATA);
int failure = outgoing_msgs[i].flags & (INVALID_LENGTH | INVALID_DATA);
if (failure) {
SET_ERROR_FLAGS(MSG_VALID_ERROR);
@ -212,7 +212,7 @@ void emac_if_validate_outgoing_msg(void)
if (!(outgoing_msgs[i].flags & PRINTED)) {
if ((trace_level & TRACE_SUCCESS) || ((trace_level & TRACE_FAILURE) && failure)) {
printf("response: receipt number %i %s %s %s\r\n\r\n", outgoing_msgs[i].receipt_number,
outgoing_msgs[i].flags & INVALID_LENGHT ? "LENGTH INVALID" : "LENGTH OK",
outgoing_msgs[i].flags & INVALID_LENGTH ? "LENGTH INVALID" : "LENGTH OK",
outgoing_msgs[i].flags & INVALID_DATA ? "DATA INVALID" : "DATA OK",
outgoing_msgs[i].flags & BROADCAST ? "BROADCAST" : "UNICAST");
outgoing_msgs[i].flags |= PRINTED;
@ -252,11 +252,11 @@ bool emac_if_update_reply_to_outgoing_msg(int receipt_number, int length, int in
minimum frame length or sent length (in case frame has been converted to be longer than minimum
length does not validate length) */
if (length != ETH_FRAME_MIN_LEN && length != ETH_FRAME_PADD_LEN && outgoing_msgs[outgoing_msg_index].length != length && length < ETH_FRAME_MIN_LEN) {
outgoing_msgs[outgoing_msg_index].flags |= INVALID_LENGHT;
outgoing_msgs[outgoing_msg_index].flags |= INVALID_LENGTH;
}
} else {
if (outgoing_msgs[outgoing_msg_index].length != length) {
outgoing_msgs[outgoing_msg_index].flags |= INVALID_LENGHT;
outgoing_msgs[outgoing_msg_index].flags |= INVALID_LENGTH;
}
}
if (invalid_data_index && invalid_data_index < outgoing_msgs[outgoing_msg_index].length) {

2
TESTS/network/emac/emac_util.h
View File

@ -36,7 +36,7 @@ extern const unsigned char eth_mac_broadcast_addr[];
// Message validation flags
#define BROADCAST 0x01
#define RESPONSE_RECEIVED 0x02
#define INVALID_LENGHT 0x04
#define INVALID_LENGTH 0x04
#define INVALID_DATA 0x08
#define PRINTED 0x10
// Validates outgoing messages for replies, sets error flags on error