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 #10231 from artokin/nanostack_armc6_update 

Nanostack ARMC6 update
pull/10267/head
Cruz Monrreal 2019-03-28 17:07:32 -05:00 committed by GitHub
parent 6fccfeb98e adedd05139
commit cd8d362899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features/nanostack/coap-service/source/coap_connection_handler.c
View File

@ -408,8 +408,9 @@ static int send_to_real_socket(int8_t socket_id, const ns_address_t *address, co
.msg_iovlen = 1 .msg_iovlen = 1
}; };
uint8_t ancillary_databuffer[NS_CMSG_SPACE(sizeof(ns_in6_pktinfo_t))];
if (memcmp(source_address, ns_in6addr_any, 16)) { if (memcmp(source_address, ns_in6addr_any, 16)) {
uint8_t ancillary_databuffer[NS_CMSG_SPACE(sizeof(ns_in6_pktinfo_t))];
ns_cmsghdr_t *cmsg; ns_cmsghdr_t *cmsg;
ns_in6_pktinfo_t *pktinfo; ns_in6_pktinfo_t *pktinfo;

4
features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp
View File

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include "ns_types.h" #include "ns_types.h"
#include "fhss_api.h" #include "fhss_api.h"
#include "fhss_config.h" #include "fhss_config.h"
@ -70,7 +71,7 @@ static fhss_timeout_s *allocate_timeout(void)
{ {
for (int i = 0; i < NUMBER_OF_SIMULTANEOUS_TIMEOUTS; i++) { for (int i = 0; i < NUMBER_OF_SIMULTANEOUS_TIMEOUTS; i++) {
if (fhss_timeout[i].fhss_timer_callback == NULL) { if (fhss_timeout[i].fhss_timer_callback == NULL) {
memset(&fhss_timeout[i], sizeof(fhss_timeout_s), 0); memset(&fhss_timeout[i], 0, sizeof(fhss_timeout_s));
return &fhss_timeout[i]; return &fhss_timeout[i];
} }
} }
@ -170,3 +171,4 @@ fhss_timer_t fhss_functions = {
.fhss_get_timestamp = platform_fhss_timestamp_read, .fhss_get_timestamp = platform_fhss_timestamp_read,
.fhss_resolution_divider = 1 .fhss_resolution_divider = 1
}; };

6
features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c
View File

@ -19,6 +19,12 @@
#include "mbedtls/entropy_poll.h" #include "mbedtls/entropy_poll.h"
#ifdef MBEDTLS_ENTROPY_HARDWARE_ALT
#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#endif
#endif
void arm_random_module_init(void) void arm_random_module_init(void)
{ {
} }