Merge pull request ARMmbed#2335 from ARMmbed/sync_with_mbedos

Sync with Mbed OS

Author: Arto Kinnunen

source/MAC/IEEE802_15_4/mac_header_helper_functions.c

@@ -32,7 +32,7 @@ static uint8_t *mcps_mac_security_aux_header_start_pointer_get(const mac_pre_par
 static uint8_t *mac_header_information_elements_write(const mac_pre_build_frame_t *buffer, uint8_t *ptr);
 
 
-static uint8_t mac_fcf_lenght(const mac_fcf_sequence_t *header)
+static uint8_t mac_fcf_length(const mac_fcf_sequence_t *header)
 {
     uint8_t length;
     if (header->frameVersion == MAC_FRAME_VERSION_2015) {
@@ -298,7 +298,7 @@ static uint8_t *mac_header_write_fcf_dsn(const mac_fcf_sequence_t *header, uint8
 uint16_t mac_header_off_set_to_aux_header(const mac_fcf_sequence_t *fcf)
 {
     //Skip first FCF & address field
-    uint16_t offset = mac_fcf_lenght(fcf);//Skip FCF + DSN
+    uint16_t offset = mac_fcf_length(fcf);//Skip FCF + DSN
     offset += mac_dst_address_length_with_panid(fcf);
     offset += mac_address_length(fcf->SrcAddrMode);
     if (fcf->SrcPanPresents) {
@@ -351,7 +351,7 @@ static bool mac_header_pan_full_compressed(const mac_fcf_sequence_t *header)
 
 static uint16_t mac_header_read_src_pan(const mac_fcf_sequence_t *header, const uint8_t *ptr)
 {
-    ptr += mac_fcf_lenght(header);//Skip FCF + DSN
+    ptr += mac_fcf_length(header);//Skip FCF + DSN
 
     ptr += mac_dst_address_length_with_panid(header); //Skip Dst panID & Address
 
@@ -360,7 +360,7 @@ static uint16_t mac_header_read_src_pan(const mac_fcf_sequence_t *header, const
 
 static uint16_t mac_header_read_dst_pan(const mac_fcf_sequence_t *header, const uint8_t *ptr)
 {
-    ptr += mac_fcf_lenght(header);//Skip FCF + DSN
+    ptr += mac_fcf_length(header);//Skip FCF + DSN
 
     return common_read_16_bit_inverse(ptr);
 }
@@ -403,7 +403,7 @@ void mac_header_get_src_address(const mac_fcf_sequence_t *header, const uint8_t
         return;
     }
 
-    ptr += mac_fcf_lenght(header);//Skip FCF + DSN
+    ptr += mac_fcf_length(header);//Skip FCF + DSN
 
     ptr += mac_dst_address_length_with_panid(header);
 
@@ -430,7 +430,7 @@ void mac_header_get_dst_address(const mac_fcf_sequence_t *header, const uint8_t
     }
     uint8_t address_len, address_index, i;
 
-    ptr += mac_fcf_lenght(header);//Skip FCF + DSN
+    ptr += mac_fcf_length(header);//Skip FCF + DSN
 
     address_len = mac_address_length(header->DstAddrMode);
 

source/MAC/IEEE802_15_4/mac_security_mib.c

@@ -90,7 +90,7 @@ static int mac_sec_mib_frame_counter_key_buffer_allocate(protocol_interface_rf_m
     mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table;
     uint32_t *frame_counter_pointer = rf_mac_setup->key_device_frame_counter_list_buffer;
     for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) {
-        key_descriptor_list->KeyDeviceFrameCouterList = frame_counter_pointer;
+        key_descriptor_list->KeyDeviceFrameCounterList = frame_counter_pointer;
         key_descriptor_list->KeyFrameCounterPerKey = true;
         key_descriptor_list->KeyFrameCounter = 0;
         //Update Pointers
@@ -105,7 +105,7 @@ static void mac_sec_mib_frame_counter_key_buffer_free(protocol_interface_rf_mac_
 {
     mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table;
     for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) {
-        key_descriptor_list->KeyDeviceFrameCouterList = NULL;
+        key_descriptor_list->KeyDeviceFrameCounterList = NULL;
         key_descriptor_list->KeyFrameCounterPerKey = false;
         //Update Pointers
         key_descriptor_list++;
@@ -368,7 +368,7 @@ int8_t mac_sec_mib_key_description_set(uint8_t atribute_index, mlme_key_descript
         key_ptr->KeyFrameCounter = 0;
         if (key_ptr->KeyDeviceListEntries == 0) {
             //Clear all frame counters from old possible user's
-            uint32_t *counter_ptr = key_ptr->KeyDeviceFrameCouterList;
+            uint32_t *counter_ptr = key_ptr->KeyDeviceFrameCounterList;
             for (int i = 0; i < rf_mac_setup->device_description_table_size; i++) {
                 *counter_ptr++ = 0;
             }
@@ -613,7 +613,7 @@ void mac_sec_mib_key_outgoing_frame_counter_decrement(struct protocol_interface_
 void mac_sec_mib_key_device_frame_counter_set(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint32_t frame_counter, uint8_t attribute_index)
 {
     if (key_descpription_table->KeyFrameCounterPerKey) {
-        uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCouterList + attribute_index;
+        uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCounterList + attribute_index;
         *counter_ptr = frame_counter;
     } else {
         device_info->FrameCounter = frame_counter;
@@ -623,7 +623,7 @@ void mac_sec_mib_key_device_frame_counter_set(mlme_key_descriptor_t *key_descpri
 uint32_t mac_mib_key_device_frame_counter_get(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint8_t attribute_index)
 {
     if (key_descpription_table->KeyFrameCounterPerKey) {
-        uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCouterList + attribute_index;
+        uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCounterList + attribute_index;
         return *counter_ptr;
     }
     return device_info->FrameCounter;

source/MAC/IEEE802_15_4/mac_security_mib.h

@@ -27,7 +27,7 @@ typedef struct mlme_key_descriptor_s {
     mlme_key_id_lookup_descriptor_t *KeyIdLookupList;
     mlme_key_device_descriptor_t *KeyDeviceList;
     mlme_key_usage_descriptor_t *KeyUsageList;
-    uint32_t *KeyDeviceFrameCouterList;
+    uint32_t *KeyDeviceFrameCounterList;
     uint32_t KeyFrameCounter;
     uint8_t Key[16];
     uint8_t KeyDeviceListSize;