Merge pull request #5 from mbedmicro/master

Synd with master (04 March 2015)

Author: PrzemekWirkus

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

@@ -52,7 +52,7 @@ Typedef definitions
 /*******************************************************************************
 Macro definitions
 *******************************************************************************/
-#define DUMMY_ACCESS (*(volatile unsigned long *)(OSTM0CNT))
+#define DUMMY_ACCESS OSTM0CNT
 
 /* #define CACHE_WRITEBACK */
 

libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.cpp

@@ -515,10 +515,10 @@ extern "C" {
                 if (RZA_IO_RegRead_16(
                         &g_usb0_function_pipecfg[pipe], USB_PIPECFG_DIR_SHIFT, USB_PIPECFG_DIR) == 0) {
                     /* read */
-                    __nop();
+                    __NOP();
                 } else {
                     /* write */
-                    __nop();
+                    __NOP();
                 }
             }
         }
@@ -629,7 +629,7 @@ extern "C" {
                             if (RZA_IO_RegRead_16(
                                     &g_usb0_function_pipecfg[pipe], USB_PIPECFG_DIR_SHIFT, USB_PIPECFG_DIR) == 0) {
                                 /* read */
-                                __nop();
+                                __NOP();
                             } else {
                                 /* write */
                                 EPx_read_status = DEVDRV_USBF_PIPE_WAIT;

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

@@ -56,7 +56,7 @@ Typedef definitions
 /*******************************************************************************
 Macro definitions
 *******************************************************************************/
-#define DUMMY_ACCESS (*(volatile unsigned long *)(OSTM0CNT))
+#define DUMMY_ACCESS OSTM0CNT
 
 /* #define CACHE_WRITEBACK */
 

libraries/USBHost/USBHost/USBHALHost_RZ_A1.cpp

@@ -237,6 +237,7 @@ void USBHALHost::_usbisr(void) {
 
 void USBHALHost::UsbIrqhandler() {
     uint32_t int_status = ohciwrapp_reg_r(OHCI_REG_INTERRUPTSTATUS) & ohciwrapp_reg_r(OHCI_REG_INTERRUPTENABLE);
+    uint32_t data;
 
     if (int_status != 0) { //Is there something to actually process?
         // Root hub status change interrupt
@@ -254,7 +255,8 @@ void USBHALHost::UsbIrqhandler() {
                         wait_ms(150);
 
                         //Hub 0 (root hub), Port 1 (count starts at 1), Low or High speed
-                        deviceConnected(0, 1, ohciwrapp_reg_r(OHCI_REG_RHPORTSTATUS1) & OR_RH_PORT_LSDA);
+                        data = ohciwrapp_reg_r(OHCI_REG_RHPORTSTATUS1) & OR_RH_PORT_LSDA;
+                        deviceConnected(0, 1, data);
                     }
 
                     //Root device disconnected

libraries/mbed/api/mbed.h

@@ -16,7 +16,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 94
+#define MBED_LIBRARY_VERSION 95
 
 #include "platform.h"
 

libraries/mbed/common/retarget.cpp

@@ -459,6 +459,10 @@ 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
 extern "C" int errno;
@@ -474,6 +478,8 @@ extern "C" caddr_t _sbrk(int incr) {
 
 #if defined(TARGET_ARM7)
     if (new_heap >= stack_ptr) {
+#elif defined(TARGET_CORTEX_A)
+    if (new_heap >= (unsigned char*)&__HeapLimit) {     /* __HeapLimit is end of heap section */
 #else
     if (new_heap >= (unsigned char*)__get_MSP()) {
 #endif

libraries/mbed/common/us_ticker_api.c

@@ -116,3 +116,17 @@ void us_ticker_remove_event(ticker_event_t *obj) {
 
     __enable_irq();
 }
+
+int us_ticker_get_next_timestamp(timestamp_t *timestamp) {
+    int ret = 0;
+
+    /* if head is NULL, there are no pending events */
+    __disable_irq();
+    if (head != NULL) {
+        *timestamp = head->timestamp;
+        ret = 1;
+    }
+    __enable_irq();
+
+    return ret;
+}

libraries/mbed/hal/us_ticker_api.h

@@ -43,6 +43,7 @@ void us_ticker_irq_handler(void);
 
 void us_ticker_insert_event(ticker_event_t *obj, timestamp_t timestamp, uint32_t id);
 void us_ticker_remove_event(ticker_event_t *obj);
+int us_ticker_get_next_timestamp(timestamp_t *timestamp);
 
 #ifdef __cplusplus
 }

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

@@ -11,8 +11,9 @@ define symbol __ICFEDIT_region_NVIC_end__   = 0x1fffe0f7;
 define symbol __ICFEDIT_region_RAM_start__ = 0x1fffe0f8;
 define symbol __ICFEDIT_region_RAM_end__   = 0x1fffffff;
 /*-Sizes-*/
-define symbol __ICFEDIT_size_cstack__ = 0x400;
-define symbol __ICFEDIT_size_heap__   = 0x800;
+/*Heap 1/4 of ram and stack 1/8*/
+define symbol __ICFEDIT_size_cstack__ = 0x600;
+define symbol __ICFEDIT_size_heap__   = 0xC00;
 /**** End of ICF editor section. ###ICF###*/
 
 define symbol __region_RAM2_start__ 		= 0x20000000;

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

@@ -7,12 +7,13 @@ define symbol __ICFEDIT_intvec_start__ = 0x00000000;
 define symbol __ICFEDIT_region_ROM_start__ = 0x00000000;
 define symbol __ICFEDIT_region_ROM_end__   = 0x0007ffff;
 define symbol __ICFEDIT_region_NVIC_start__   = 0x1fff0000;
-define symbol __ICFEDIT_region_NVIC_end__   = 0x1fff0197;
-define symbol __ICFEDIT_region_RAM_start__ = 0x1fff0198;
+define symbol __ICFEDIT_region_NVIC_end__   = 0x1fff03ff;
+define symbol __ICFEDIT_region_RAM_start__ = 0x1fff0400;
 define symbol __ICFEDIT_region_RAM_end__   = 0x1fffffff;
 /*-Sizes-*/
-define symbol __ICFEDIT_size_cstack__ = 0x2000;
-define symbol __ICFEDIT_size_heap__   = 0x4000;
+/*Heap 1/4 of ram and stack 1/8*/
+define symbol __ICFEDIT_size_cstack__ = 0x4000;
+define symbol __ICFEDIT_size_heap__   = 0x8000;
 /**** End of ICF editor section. ###ICF###*/
 
 define symbol __region_RAM2_start__ = 0x20000000;