diff --git a/core/uvisor-mbed-lib.lib b/core/uvisor-mbed-lib.lib index c3ed5a7cd6..b1e5c7e145 100644 --- a/core/uvisor-mbed-lib.lib +++ b/core/uvisor-mbed-lib.lib @@ -1 +1,2 @@ -https://github.com/ARMmbed/uvisor-mbed-lib/#9b296077 +https://github.com/ARMmbed/uvisor-mbed-lib/#32b6df4a39df + diff --git a/frameworks/greentea-client.lib b/frameworks/greentea-client.lib index 77511ea2bc..ddc45200b0 100644 --- a/frameworks/greentea-client.lib +++ b/frameworks/greentea-client.lib @@ -1 +1 @@ -https://github.com/bridadan/greentea-client.git#398d96e25630ed62dfa7436bda8556d8d7e16969 +https://github.com/bridadan/greentea-client.git/#398d96e25630 diff --git a/hal/api/mbed-drivers/mbed.h b/hal/api/mbed-drivers/mbed.h new file mode 100644 index 0000000000..9465559da6 --- /dev/null +++ b/hal/api/mbed-drivers/mbed.h @@ -0,0 +1,21 @@ +/* mbed Microcontroller Library + * Copyright (c) 2006-2013 ARM Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MBED_STUB_H +#define MBED_STUB_H + +#include "../mbed.h" + +#endif diff --git a/hal/common/retarget.cpp b/hal/common/retarget.cpp index 29f5d05f4c..79cb598b6d 100644 --- a/hal/common/retarget.cpp +++ b/hal/common/retarget.cpp @@ -461,9 +461,7 @@ extern "C" void __iar_argc_argv() { // Linker defined symbol used by _sbrk to indicate where heap should start. extern "C" int __end__; -#if defined(TARGET_CORTEX_A) extern "C" uint32_t __HeapLimit; -#endif // Turn off the errno macro and use actual global variable instead. #undef errno @@ -486,11 +484,7 @@ extern "C" caddr_t _sbrk(int incr) { unsigned char* prev_heap = heap; unsigned char* new_heap = heap + incr; -#if defined(TARGET_CORTEX_A) if (new_heap >= (unsigned char*)&__HeapLimit) { /* __HeapLimit is end of heap section */ -#else - if (new_heap >= (unsigned char*)__current_sp()) { -#endif errno = ENOMEM; return (caddr_t)-1; } diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S index 300dc050a4..cb7c8f8e83 100644 --- a/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S +++ b/hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S @@ -64,7 +64,7 @@ __StackTop: #ifdef __HEAP_SIZE .equ Heap_Size, __HEAP_SIZE #else - .equ Heap_Size, 0x400 + .equ Heap_Size, 0x20000 #endif .globl __HeapBase .globl __HeapLimit diff --git a/net/NetworkSocketAPI/MeshInterface.h b/net/NetworkSocketAPI/MeshInterface.h new file mode 100644 index 0000000000..884708a623 --- /dev/null +++ b/net/NetworkSocketAPI/MeshInterface.h @@ -0,0 +1,39 @@ +/* Socket + * Copyright (c) 2015 ARM Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MESH_INTERFACE_H +#define MESH_INTERFACE_H + +#include "NetworkInterface.h" + +/** MeshInterface class + * Common interface that is shared between ethernet hardware + */ +class MeshInterface : public NetworkInterface +{ +public: + /** Start the interface + * @return 0 on success, negative on failure + */ + virtual int connect() = 0; + + /** Stop the interface + * @return 0 on success, negative on failure + */ + virtual int disconnect() = 0; +}; + +#endif diff --git a/net/atmel-rf-driver.lib b/net/atmel-rf-driver.lib new file mode 100644 index 0000000000..368d967a37 --- /dev/null +++ b/net/atmel-rf-driver.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/atmel-rf-driver-mirror.git/#f4c48e5e98f6 diff --git a/net/coap-service.lib b/net/coap-service.lib new file mode 100644 index 0000000000..379efec094 --- /dev/null +++ b/net/coap-service.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/coap-service-mirror.git/#0c7805098970 diff --git a/net/mbed-client-c.lib b/net/mbed-client-c.lib index e9d7d0337b..4c2e9239d6 100644 --- a/net/mbed-client-c.lib +++ b/net/mbed-client-c.lib @@ -1 +1 @@ -http://developer.mbed.org/teams/sandbox/code/mbed-client-c/#5d91b0f5038c +https://github.com/ARMmbed/mbed-client-c-mirror.git/#753541105a6f diff --git a/net/mbed-client-classic.lib b/net/mbed-client-classic.lib index 7790f484d8..d016f7d813 100644 --- a/net/mbed-client-classic.lib +++ b/net/mbed-client-classic.lib @@ -1 +1 @@ -http://developer.mbed.org/teams/sandbox/code/mbed-client-classic/#723bfe4dd180 +https://github.com/ARMmbed/mbed-client-classic.git/#0cf03c143a2a diff --git a/net/mbed-client-mbedtls.lib b/net/mbed-client-mbedtls.lib index 171111fdaf..2ee14b2ac4 100644 --- a/net/mbed-client-mbedtls.lib +++ b/net/mbed-client-mbedtls.lib @@ -1 +1 @@ -http://developer.mbed.org/teams/sandbox/code/mbed-client-mbedtls/#840aa460b437 +https://github.com/ARMmbed/mbed-client-mbedtls-mirror.git/#582821c96be8 diff --git a/net/mbed-client-randlib.lib b/net/mbed-client-randlib.lib new file mode 100644 index 0000000000..3d3b819a94 --- /dev/null +++ b/net/mbed-client-randlib.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/mbed-client-randlib-mirror.git/#237b3fa0255f diff --git a/net/mbed-client.lib b/net/mbed-client.lib index 3c29c7d82e..5611c0f709 100644 --- a/net/mbed-client.lib +++ b/net/mbed-client.lib @@ -1 +1 @@ -http://developer.mbed.org/teams/sandbox/code/mbed-client/#e36098b177a4 +https://github.com/ARMmbed/mbed-client-mirror.git/#2a839d6c5bef diff --git a/net/mbed-mesh-api.lib b/net/mbed-mesh-api.lib new file mode 100644 index 0000000000..f45138d229 --- /dev/null +++ b/net/mbed-mesh-api.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/mbed-mesh-api-mirror.git/#f7a198bb1e66 diff --git a/net/mbed-trace.lib b/net/mbed-trace.lib index bb82c57aff..fcf973c4b5 100644 --- a/net/mbed-trace.lib +++ b/net/mbed-trace.lib @@ -1 +1 @@ -https://developer.mbed.org/teams/sandbox/code/mbed-trace/#506ad37c6bd7 +https://github.com/ARMmbed/mbed-trace-mirror.git/#f9a11fcaa2b5 diff --git a/net/nanostack-hal-mbed-cmsis-rtos.lib b/net/nanostack-hal-mbed-cmsis-rtos.lib new file mode 100644 index 0000000000..e8134cd07c --- /dev/null +++ b/net/nanostack-hal-mbed-cmsis-rtos.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/nanostack-hal-mbed-cmsis-rtos.git/#ab64e255deb9 diff --git a/net/nanostack-libservice.lib b/net/nanostack-libservice.lib index 86c47f4cd9..98b4a94a0a 100644 --- a/net/nanostack-libservice.lib +++ b/net/nanostack-libservice.lib @@ -1 +1 @@ -http://developer.mbed.org/teams/sandbox/code/nanostack-libservice/#a87c5afee2a6 +https://github.com/ARMmbed/nanostack-libservice-mirror.git/#e3f7da74a143 diff --git a/net/sal-iface-6lowpan-morpheus-private.lib b/net/sal-iface-6lowpan-morpheus-private.lib new file mode 100644 index 0000000000..36e7ef81d8 --- /dev/null +++ b/net/sal-iface-6lowpan-morpheus-private.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/sal-iface-6lowpan-morpheus-private-mirror.git/#2b4852e22679 diff --git a/net/sal-stack-nanostack-eventloop.lib b/net/sal-stack-nanostack-eventloop.lib new file mode 100644 index 0000000000..b6736e0045 --- /dev/null +++ b/net/sal-stack-nanostack-eventloop.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/sal-stack-nanostack-eventloop-mirror.git/#627b9769e352 diff --git a/net/sal-stack-nanostack-private.lib b/net/sal-stack-nanostack-private.lib new file mode 100644 index 0000000000..0e000b3b3c --- /dev/null +++ b/net/sal-stack-nanostack-private.lib @@ -0,0 +1 @@ +https://github.com/ARMmbed/sal-stack-nanostack-private-mirror.git/#1374c77b03fb