Skip to content

Commit 1bb14b7

Browse files
PrzemekWirkusPrzemekWirkus
committed
Merge pull request #5 from mbedmicro/master
Synd with master (04 March 2015)
2 parents b746b28 + 83f6c17 commit 1bb14b7

File tree

129 files changed

+72501
-778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+72501
-778
lines changed

‎libraries/USBDevice/USBDevice/TARGET_RENESAS/TARGET_RZ_A1H/src/userdef/usb0_function_userdef.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Typedef definitions
5252
/*******************************************************************************
5353
Macro definitions
5454
*******************************************************************************/
55-
#define DUMMY_ACCESS (*(volatile unsigned long *)(OSTM0CNT))
55+
#define DUMMY_ACCESS OSTM0CNT
5656

5757
/* #define CACHE_WRITEBACK */
5858

‎libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,10 @@ extern "C" {
515515
if (RZA_IO_RegRead_16(
516516
&g_usb0_function_pipecfg[pipe], USB_PIPECFG_DIR_SHIFT, USB_PIPECFG_DIR) == 0) {
517517
/* read */
518-
__nop();
518+
__NOP();
519519
} else {
520520
/* write */
521-
__nop();
521+
__NOP();
522522
}
523523
}
524524
}
@@ -629,7 +629,7 @@ extern "C" {
629629
if (RZA_IO_RegRead_16(
630630
&g_usb0_function_pipecfg[pipe], USB_PIPECFG_DIR_SHIFT, USB_PIPECFG_DIR) == 0) {
631631
/* read */
632-
__nop();
632+
__NOP();
633633
} else {
634634
/* write */
635635
EPx_read_status = DEVDRV_USBF_PIPE_WAIT;

‎libraries/USBHost/USBHost/TARGET_RENESAS/TARGET_RZ_A1H/src/userdef/usb0_host_userdef.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Typedef definitions
5656
/*******************************************************************************
5757
Macro definitions
5858
*******************************************************************************/
59-
#define DUMMY_ACCESS (*(volatile unsigned long *)(OSTM0CNT))
59+
#define DUMMY_ACCESS OSTM0CNT
6060

6161
/* #define CACHE_WRITEBACK */
6262

‎libraries/USBHost/USBHost/USBHALHost_RZ_A1.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ void USBHALHost::_usbisr(void) {
237237

238238
void USBHALHost::UsbIrqhandler() {
239239
uint32_t int_status = ohciwrapp_reg_r(OHCI_REG_INTERRUPTSTATUS) & ohciwrapp_reg_r(OHCI_REG_INTERRUPTENABLE);
240+
uint32_t data;
240241

241242
if (int_status != 0) { //Is there something to actually process?
242243
// Root hub status change interrupt
@@ -254,7 +255,8 @@ void USBHALHost::UsbIrqhandler() {
254255
wait_ms(150);
255256

256257
//Hub 0 (root hub), Port 1 (count starts at 1), Low or High speed
257-
deviceConnected(0, 1, ohciwrapp_reg_r(OHCI_REG_RHPORTSTATUS1) & OR_RH_PORT_LSDA);
258+
data = ohciwrapp_reg_r(OHCI_REG_RHPORTSTATUS1) & OR_RH_PORT_LSDA;
259+
deviceConnected(0, 1, data);
258260
}
259261

260262
//Root device disconnected

‎libraries/mbed/api/mbed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef MBED_H
1717
#define MBED_H
1818

19-
#define MBED_LIBRARY_VERSION 94
19+
#define MBED_LIBRARY_VERSION 95
2020

2121
#include "platform.h"
2222

‎libraries/mbed/common/retarget.cpp

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

462+
#if defined(TARGET_CORTEX_A)
463+
extern "C" uint32_t __HeapLimit;
464+
#endif
465+
462466
// Turn off the errno macro and use actual global variable instead.
463467
#undef errno
464468
extern "C" int errno;
@@ -474,6 +478,8 @@ extern "C" caddr_t _sbrk(int incr) {
474478

475479
#if defined(TARGET_ARM7)
476480
if (new_heap >= stack_ptr) {
481+
#elif defined(TARGET_CORTEX_A)
482+
if (new_heap >= (unsigned char*)&__HeapLimit) { /* __HeapLimit is end of heap section */
477483
#else
478484
if (new_heap >= (unsigned char*)__get_MSP()) {
479485
#endif

‎libraries/mbed/common/us_ticker_api.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,17 @@ void us_ticker_remove_event(ticker_event_t *obj) {
116116

117117
__enable_irq();
118118
}
119+
120+
int us_ticker_get_next_timestamp(timestamp_t *timestamp) {
121+
int ret = 0;
122+
123+
/* if head is NULL, there are no pending events */
124+
__disable_irq();
125+
if (head != NULL) {
126+
*timestamp = head->timestamp;
127+
ret = 1;
128+
}
129+
__enable_irq();
130+
131+
return ret;
132+
}

‎libraries/mbed/hal/us_ticker_api.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ void us_ticker_irq_handler(void);
4343

4444
void us_ticker_insert_event(ticker_event_t *obj, timestamp_t timestamp, uint32_t id);
4545
void us_ticker_remove_event(ticker_event_t *obj);
46+
int us_ticker_get_next_timestamp(timestamp_t *timestamp);
4647

4748
#ifdef __cplusplus
4849
}

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20XX/TARGET_K20D50M/TOOLCHAIN_IAR/MK20D5.icf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x1fffe0f7;
1111
define symbol __ICFEDIT_region_RAM_start__ = 0x1fffe0f8;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x1fffffff;
1313
/*-Sizes-*/
14-
define symbol __ICFEDIT_size_cstack__ = 0x400;
15-
define symbol __ICFEDIT_size_heap__ = 0x800;
14+
/*Heap 1/4 of ram and stack 1/8*/
15+
define symbol __ICFEDIT_size_cstack__ = 0x600;
16+
define symbol __ICFEDIT_size_heap__ = 0xC00;
1617
/**** End of ICF editor section. ###ICF###*/
1718

1819
define symbol __region_RAM2_start__ = 0x20000000;

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K22F/TOOLCHAIN_IAR/MK22F51212.icf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ define symbol __ICFEDIT_intvec_start__ = 0x00000000;
77
define symbol __ICFEDIT_region_ROM_start__ = 0x00000000;
88
define symbol __ICFEDIT_region_ROM_end__ = 0x0007ffff;
99
define symbol __ICFEDIT_region_NVIC_start__ = 0x1fff0000;
10-
define symbol __ICFEDIT_region_NVIC_end__ = 0x1fff0197;
11-
define symbol __ICFEDIT_region_RAM_start__ = 0x1fff0198;
10+
define symbol __ICFEDIT_region_NVIC_end__ = 0x1fff03ff;
11+
define symbol __ICFEDIT_region_RAM_start__ = 0x1fff0400;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x1fffffff;
1313
/*-Sizes-*/
14-
define symbol __ICFEDIT_size_cstack__ = 0x2000;
15-
define symbol __ICFEDIT_size_heap__ = 0x4000;
14+
/*Heap 1/4 of ram and stack 1/8*/
15+
define symbol __ICFEDIT_size_cstack__ = 0x4000;
16+
define symbol __ICFEDIT_size_heap__ = 0x8000;
1617
/**** End of ICF editor section. ###ICF###*/
1718

1819
define symbol __region_RAM2_start__ = 0x20000000;

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/TOOLCHAIN_IAR/MKL05Z4.icf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x1ffffcbf;
1111
define symbol __ICFEDIT_region_RAM_start__ = 0x1ffffcc0;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x1fffffff;
1313
/*-Sizes-*/
14+
/*Heap 1/4 of ram and stack 1/8*/
1415
define symbol __ICFEDIT_size_cstack__ = 0x200;
15-
define symbol __ICFEDIT_size_heap__ = 0x200;
16+
define symbol __ICFEDIT_size_heap__ = 0x400;
1617
/**** End of ICF editor section. ###ICF###*/
1718

1819
define symbol __region_RAM2_start__ = 0x20000000;

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/TOOLCHAIN_IAR/MKL25Z4.icf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x1ffff0bf;
1111
define symbol __ICFEDIT_region_RAM_start__ = 0x1ffff0c0;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x1fffffff;
1313
/*-Sizes-*/
14-
define symbol __ICFEDIT_size_cstack__ = 0x400;
15-
define symbol __ICFEDIT_size_heap__ = 0xA00;
14+
/*Heap 1/4 of ram and stack 1/8*/
15+
define symbol __ICFEDIT_size_cstack__ = 0x800;
16+
define symbol __ICFEDIT_size_heap__ = 0x1000;
1617
/**** End of ICF editor section. ###ICF###*/
1718

1819
define symbol __region_RAM2_start__ = 0x20000000;

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/TOOLCHAIN_IAR/MKL46Z4.icf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x1fffe0bf;
1111
define symbol __ICFEDIT_region_RAM_start__ = 0x1fffe0c0;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x1fffffff;
1313
/*-Sizes-*/
14-
define symbol __ICFEDIT_size_cstack__ = 0x800;
15-
define symbol __ICFEDIT_size_heap__ = 0x1000;
14+
/*Heap 1/4 of ram and stack 1/8*/
15+
define symbol __ICFEDIT_size_cstack__ = 0x1000;
16+
define symbol __ICFEDIT_size_heap__ = 0x2000;
1617
/**** End of ICF editor section. ###ICF###*/
1718

1819
define symbol __region_RAM2_start__ = 0x20000000;

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_IAR/MK64F.icf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x1fff0197;
1111
define symbol __ICFEDIT_region_RAM_start__ = 0x1fff0198;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x1fffffff;
1313
/*-Sizes-*/
14-
define symbol __ICFEDIT_size_cstack__ = 0x2000;
15-
define symbol __ICFEDIT_size_heap__ = 0x4000;
14+
/*Heap 1/4 of ram and stack 1/8*/
15+
define symbol __ICFEDIT_size_cstack__ = 0x8000;
16+
define symbol __ICFEDIT_size_heap__ = 0x10000;
1617
/**** End of ICF editor section. ###ICF###*/
1718

1819
define symbol __region_RAM2_start__ = 0x20000000;

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_IAR/startup_MK64F12.s

Lines changed: 1 addition & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -138,160 +138,7 @@ __vector_table
138138
DCD ENET_Transmit_IRQHandler ; Ethernet MAC Transmit Interrupt
139139
DCD ENET_Receive_IRQHandler ; Ethernet MAC Receive Interrupt
140140
DCD ENET_Error_IRQHandler ; Ethernet MAC Error and miscelaneous Interrupt
141-
DCD Default_Handler ; 102
142-
DCD Default_Handler ; 103
143-
DCD Default_Handler ; 104
144-
DCD Default_Handler ; 105
145-
DCD Default_Handler ; 106
146-
DCD Default_Handler ; 107
147-
DCD Default_Handler ; 108
148-
DCD Default_Handler ; 109
149-
DCD Default_Handler ; 110
150-
DCD Default_Handler ; 111
151-
DCD Default_Handler ; 112
152-
DCD Default_Handler ; 113
153-
DCD Default_Handler ; 114
154-
DCD Default_Handler ; 115
155-
DCD Default_Handler ; 116
156-
DCD Default_Handler ; 117
157-
DCD Default_Handler ; 118
158-
DCD Default_Handler ; 119
159-
DCD Default_Handler ; 120
160-
DCD Default_Handler ; 121
161-
DCD Default_Handler ; 122
162-
DCD Default_Handler ; 123
163-
DCD Default_Handler ; 124
164-
DCD Default_Handler ; 125
165-
DCD Default_Handler ; 126
166-
DCD Default_Handler ; 127
167-
DCD Default_Handler ; 128
168-
DCD Default_Handler ; 129
169-
DCD Default_Handler ; 130
170-
DCD Default_Handler ; 131
171-
DCD Default_Handler ; 132
172-
DCD Default_Handler ; 133
173-
DCD Default_Handler ; 134
174-
DCD Default_Handler ; 135
175-
DCD Default_Handler ; 136
176-
DCD Default_Handler ; 137
177-
DCD Default_Handler ; 138
178-
DCD Default_Handler ; 139
179-
DCD Default_Handler ; 140
180-
DCD Default_Handler ; 141
181-
DCD Default_Handler ; 142
182-
DCD Default_Handler ; 143
183-
DCD Default_Handler ; 144
184-
DCD Default_Handler ; 145
185-
DCD Default_Handler ; 146
186-
DCD Default_Handler ; 147
187-
DCD Default_Handler ; 148
188-
DCD Default_Handler ; 149
189-
DCD Default_Handler ; 150
190-
DCD Default_Handler ; 151
191-
DCD Default_Handler ; 152
192-
DCD Default_Handler ; 153
193-
DCD Default_Handler ; 154
194-
DCD Default_Handler ; 155
195-
DCD Default_Handler ; 156
196-
DCD Default_Handler ; 157
197-
DCD Default_Handler ; 158
198-
DCD Default_Handler ; 159
199-
DCD Default_Handler ; 160
200-
DCD Default_Handler ; 161
201-
DCD Default_Handler ; 162
202-
DCD Default_Handler ; 163
203-
DCD Default_Handler ; 164
204-
DCD Default_Handler ; 165
205-
DCD Default_Handler ; 166
206-
DCD Default_Handler ; 167
207-
DCD Default_Handler ; 168
208-
DCD Default_Handler ; 169
209-
DCD Default_Handler ; 170
210-
DCD Default_Handler ; 171
211-
DCD Default_Handler ; 172
212-
DCD Default_Handler ; 173
213-
DCD Default_Handler ; 174
214-
DCD Default_Handler ; 175
215-
DCD Default_Handler ; 176
216-
DCD Default_Handler ; 177
217-
DCD Default_Handler ; 178
218-
DCD Default_Handler ; 179
219-
DCD Default_Handler ; 180
220-
DCD Default_Handler ; 181
221-
DCD Default_Handler ; 182
222-
DCD Default_Handler ; 183
223-
DCD Default_Handler ; 184
224-
DCD Default_Handler ; 185
225-
DCD Default_Handler ; 186
226-
DCD Default_Handler ; 187
227-
DCD Default_Handler ; 188
228-
DCD Default_Handler ; 189
229-
DCD Default_Handler ; 190
230-
DCD Default_Handler ; 191
231-
DCD Default_Handler ; 192
232-
DCD Default_Handler ; 193
233-
DCD Default_Handler ; 194
234-
DCD Default_Handler ; 195
235-
DCD Default_Handler ; 196
236-
DCD Default_Handler ; 197
237-
DCD Default_Handler ; 198
238-
DCD Default_Handler ; 199
239-
DCD Default_Handler ; 200
240-
DCD Default_Handler ; 201
241-
DCD Default_Handler ; 202
242-
DCD Default_Handler ; 203
243-
DCD Default_Handler ; 204
244-
DCD Default_Handler ; 205
245-
DCD Default_Handler ; 206
246-
DCD Default_Handler ; 207
247-
DCD Default_Handler ; 208
248-
DCD Default_Handler ; 209
249-
DCD Default_Handler ; 210
250-
DCD Default_Handler ; 211
251-
DCD Default_Handler ; 212
252-
DCD Default_Handler ; 213
253-
DCD Default_Handler ; 214
254-
DCD Default_Handler ; 215
255-
DCD Default_Handler ; 216
256-
DCD Default_Handler ; 217
257-
DCD Default_Handler ; 218
258-
DCD Default_Handler ; 219
259-
DCD Default_Handler ; 220
260-
DCD Default_Handler ; 221
261-
DCD Default_Handler ; 222
262-
DCD Default_Handler ; 223
263-
DCD Default_Handler ; 224
264-
DCD Default_Handler ; 225
265-
DCD Default_Handler ; 226
266-
DCD Default_Handler ; 227
267-
DCD Default_Handler ; 228
268-
DCD Default_Handler ; 229
269-
DCD Default_Handler ; 230
270-
DCD Default_Handler ; 231
271-
DCD Default_Handler ; 232
272-
DCD Default_Handler ; 233
273-
DCD Default_Handler ; 234
274-
DCD Default_Handler ; 235
275-
DCD Default_Handler ; 236
276-
DCD Default_Handler ; 237
277-
DCD Default_Handler ; 238
278-
DCD Default_Handler ; 239
279-
DCD Default_Handler ; 240
280-
DCD Default_Handler ; 241
281-
DCD Default_Handler ; 242
282-
DCD Default_Handler ; 243
283-
DCD Default_Handler ; 244
284-
DCD Default_Handler ; 245
285-
DCD Default_Handler ; 246
286-
DCD Default_Handler ; 247
287-
DCD Default_Handler ; 248
288-
DCD Default_Handler ; 249
289-
DCD Default_Handler ; 250
290-
DCD Default_Handler ; 251
291-
DCD Default_Handler ; 252
292-
DCD Default_Handler ; 253
293-
DCD Default_Handler ; 254
294-
DCD Default_Handler ; 255
141+
295142
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
296143
;;Flash Configuration
297144
;;16-byte flash configuration field that stores default protection settings (loaded on reset)

‎libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
; *(InRoot$$Sections)
66
; .ANY (+RO)
77
; }
8-
; RW_IRAM1 0x20000000 0x00004000 {
8+
; RW_IRAM1 0x20000000 0x00008000 {
99
; .ANY (+RW +ZI)
1010
; }
1111
;}

‎libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ define symbol __ICFEDIT_region_ROM_end__ = 0x0003FFFF;
99
define symbol __ICFEDIT_region_RAM_start__ = 0x20002000;
1010
define symbol __ICFEDIT_region_RAM_end__ = 0x20007FFF;
1111
/*-Sizes-*/
12-
define symbol __ICFEDIT_size_cstack__ = 0x1000;
13-
define symbol __ICFEDIT_size_heap__ = 0x1000;
12+
/*Heap 1/4 of ram and stack 1/8*/
13+
define symbol __ICFEDIT_size_cstack__ = 0xc00;
14+
define symbol __ICFEDIT_size_heap__ = 0x1800;
1415
/**** End of ICF editor section. ###ICF###*/
1516

1617
define symbol __code_start_soft_device__ = 0x0;

‎libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11U6X/TOOLCHAIN_IAR/TARGET_LPC11U68/LPC11U68.icf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x100000FF;
1111
define symbol __ICFEDIT_region_RAM_start__ = 0x10000100;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x10007FDF;
1313
/*-Sizes-*/
14-
define symbol __ICFEDIT_size_cstack__ = 0x400;
15-
define symbol __ICFEDIT_size_heap__ = 0x800;
14+
/*Heap 1/4 of ram and stack 1/8*/
15+
define symbol __ICFEDIT_size_cstack__ = 0x1000;
16+
define symbol __ICFEDIT_size_heap__ = 0x2000;
1617
/**** End of ICF editor section. ###ICF###*/
1718

1819
define symbol __CRP_start__ = 0x000002FC;

‎libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/TOOLCHAIN_IAR/LPC1347.icf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x100000BF;
1111
define symbol __ICFEDIT_region_RAM_start__ = 0x100000C0;
1212
define symbol __ICFEDIT_region_RAM_end__ = 0x10001FDF;
1313
/*-Sizes-*/
14-
define symbol __ICFEDIT_size_cstack__ = 0x800;
14+
define symbol __ICFEDIT_size_cstack__ = 0x400;
1515
define symbol __ICFEDIT_size_heap__ = 0x800;
1616
/**** End of ICF editor section. ###ICF###*/
1717

0 commit comments

Comments
 (0)