Skip to content

Commit 5828ebd

Browse files
bogdanmbogdanm
committed
Merge pull request #26 from c1728p9/mirror_changes
Mirror changes
2 parents 6656fbf + e161aad commit 5828ebd

20 files changed

+78
-15
lines changed

‎core/uvisor-mbed-lib.lib

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
https://github.com/ARMmbed/uvisor-mbed-lib/#9b296077
1+
https://github.com/ARMmbed/uvisor-mbed-lib/#32b6df4a39df
2+

‎frameworks/greentea-client.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/bridadan/greentea-client.git#398d96e25630ed62dfa7436bda8556d8d7e16969
1+
https://github.com/bridadan/greentea-client.git/#398d96e25630

‎hal/api/mbed-drivers/mbed.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* mbed Microcontroller Library
2+
* Copyright (c) 2006-2013 ARM Limited
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
#ifndef MBED_STUB_H
17+
#define MBED_STUB_H
18+
19+
#include "../mbed.h"
20+
21+
#endif

‎hal/common/retarget.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,7 @@ extern "C" void __iar_argc_argv() {
461461
// Linker defined symbol used by _sbrk to indicate where heap should start.
462462
extern "C" int __end__;
463463

464-
#if defined(TARGET_CORTEX_A)
465464
extern "C" uint32_t __HeapLimit;
466-
#endif
467465

468466
// Turn off the errno macro and use actual global variable instead.
469467
#undef errno
@@ -486,11 +484,7 @@ extern "C" caddr_t _sbrk(int incr) {
486484
unsigned char* prev_heap = heap;
487485
unsigned char* new_heap = heap + incr;
488486

489-
#if defined(TARGET_CORTEX_A)
490487
if (new_heap >= (unsigned char*)&__HeapLimit) { /* __HeapLimit is end of heap section */
491-
#else
492-
if (new_heap >= (unsigned char*)__current_sp()) {
493-
#endif
494488
errno = ENOMEM;
495489
return (caddr_t)-1;
496490
}

‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ __StackTop:
6464
#ifdef __HEAP_SIZE
6565
.equ Heap_Size, __HEAP_SIZE
6666
#else
67-
.equ Heap_Size, 0x400
67+
.equ Heap_Size, 0x20000
6868
#endif
6969
.globl __HeapBase
7070
.globl __HeapLimit

‎net/NetworkSocketAPI/MeshInterface.h

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/* Socket
2+
* Copyright (c) 2015 ARM Limited
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
#ifndef MESH_INTERFACE_H
18+
#define MESH_INTERFACE_H
19+
20+
#include "NetworkInterface.h"
21+
22+
/** MeshInterface class
23+
* Common interface that is shared between ethernet hardware
24+
*/
25+
class MeshInterface : public NetworkInterface
26+
{
27+
public:
28+
/** Start the interface
29+
* @return 0 on success, negative on failure
30+
*/
31+
virtual int connect() = 0;
32+
33+
/** Stop the interface
34+
* @return 0 on success, negative on failure
35+
*/
36+
virtual int disconnect() = 0;
37+
};
38+
39+
#endif

‎net/atmel-rf-driver.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/atmel-rf-driver-mirror.git/#f4c48e5e98f6

‎net/coap-service.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/coap-service-mirror.git/#0c7805098970

‎net/mbed-client-c.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
http://developer.mbed.org/teams/sandbox/code/mbed-client-c/#5d91b0f5038c
1+
https://github.com/ARMmbed/mbed-client-c-mirror.git/#753541105a6f

‎net/mbed-client-classic.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
http://developer.mbed.org/teams/sandbox/code/mbed-client-classic/#723bfe4dd180
1+
https://github.com/ARMmbed/mbed-client-classic.git/#0cf03c143a2a

‎net/mbed-client-mbedtls.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
http://developer.mbed.org/teams/sandbox/code/mbed-client-mbedtls/#840aa460b437
1+
https://github.com/ARMmbed/mbed-client-mbedtls-mirror.git/#582821c96be8

‎net/mbed-client-randlib.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/mbed-client-randlib-mirror.git/#237b3fa0255f

‎net/mbed-client.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
http://developer.mbed.org/teams/sandbox/code/mbed-client/#e36098b177a4
1+
https://github.com/ARMmbed/mbed-client-mirror.git/#2a839d6c5bef

‎net/mbed-mesh-api.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/mbed-mesh-api-mirror.git/#f7a198bb1e66

‎net/mbed-trace.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://developer.mbed.org/teams/sandbox/code/mbed-trace/#506ad37c6bd7
1+
https://github.com/ARMmbed/mbed-trace-mirror.git/#f9a11fcaa2b5

‎net/nanostack-hal-mbed-cmsis-rtos.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/nanostack-hal-mbed-cmsis-rtos.git/#ab64e255deb9

‎net/nanostack-libservice.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
http://developer.mbed.org/teams/sandbox/code/nanostack-libservice/#a87c5afee2a6
1+
https://github.com/ARMmbed/nanostack-libservice-mirror.git/#e3f7da74a143

‎net/sal-iface-6lowpan-morpheus-private.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/sal-iface-6lowpan-morpheus-private-mirror.git/#2b4852e22679

‎net/sal-stack-nanostack-eventloop.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/sal-stack-nanostack-eventloop-mirror.git/#627b9769e352

‎net/sal-stack-nanostack-private.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/sal-stack-nanostack-private-mirror.git/#1374c77b03fb

0 commit comments

Comments
 (0)