Skip to content

Commit

Permalink
Renamed operation mode to operating mode.
Browse files Browse the repository at this point in the history
  • Loading branch information
Juha Heiskanen committed Sep 8, 2021
1 parent 2f755bc commit 9d2386d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions nanostack/ws_management_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@ typedef struct ws_neighbour_info {


/**
* @brief ws_management_pcap_t Wi-SUN FAN 1.1 Phy Capability type and opeartion mode
* @brief ws_management_pcap_t Wi-SUN FAN 1.1 Phy Capability type and operating mode
*/
typedef struct ws_management_pcap {
/** Phy type */
uint8_t phy_type;
/** Phy operation mode */
uint16_t operation_mode;
/** Phy operating mode */
uint16_t operating_mode;
} ws_management_pcap_t;

/**
Expand Down
2 changes: 1 addition & 1 deletion source/6LoWPAN/ws/ws_common_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ typedef struct ws_panid_ie {
*/
typedef struct ws_pcap_ie {
unsigned phy_type: 3;
uint16_t operation_mode;
uint16_t operating_mode;
} ws_pcap_ie_t;

typedef struct ws_phy_cap_info {
Expand Down
4 changes: 2 additions & 2 deletions source/6LoWPAN/ws/ws_ie_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ uint8_t *ws_wp_nested_pcap_write(uint8_t *ptr, struct ws_phy_cap_info *pcap_list
*ptr++ = pcap_list->length_of_list;
for (int i = 0; i < pcap_list->length_of_list; i++) {
*ptr++ = pcap_list->pcap[i].phy_type;
ptr = common_write_16_bit_inverse(pcap_list->pcap[i].operation_mode, ptr);
ptr = common_write_16_bit_inverse(pcap_list->pcap[i].operating_mode, ptr);
}
return ptr;
}
Expand Down Expand Up @@ -1175,7 +1175,7 @@ bool ws_wp_nested_pcap_read(uint8_t *data, uint16_t length, struct ws_phy_cap_in

for (uint8_t i = 0; i < length_of_cap; i++) {
ws_pcap_list->pcap[i].phy_type = *data++ & 7;
ws_pcap_list->pcap[i].operation_mode = common_read_16_bit_inverse(data);
ws_pcap_list->pcap[i].operating_mode = common_read_16_bit_inverse(data);
data += 2;
}

Expand Down
2 changes: 1 addition & 1 deletion source/6LoWPAN/ws/ws_management_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ int ws_management_phy_capability_set(
cur->ws_info->phy_cap_info.length_of_list = pcap_list->length_of_list;
for (int i = 0; i < pcap_list->length_of_list; i++) {
cur->ws_info->phy_cap_info.pcap[i].phy_type = pcap_list->pcap[i].phy_type;
cur->ws_info->phy_cap_info.pcap[i].operation_mode = pcap_list->pcap[i].operation_mode;
cur->ws_info->phy_cap_info.pcap[i].operating_mode = pcap_list->pcap[i].operating_mode;
}

return 0;
Expand Down

0 comments on commit 9d2386d

Please sign in to comment.