Jan Wolfsberger / mbed-src-no-hal

mbed library sources that still uses the stm standard peripheral library

Fork of mbed-src by Reinhold Schaefer

Files at this revision

API Documentation at this revision

Revision 418:39e86d6263aa, committed 2014-11-26

Comitter:
mbed_official
Date:
Wed Nov 26 08:00:09 2014 +0000
Parent:
417:fc5dba704912
Child:
419:f79a1bf6b233
Commit message:
Synchronized with git revision c3208fe6f480055643b5911ca19a9028da3054a9

Full URL: https://github.com/mbedmicro/mbed/commit/c3208fe6f480055643b5911ca19a9028da3054a9/

RTOS: IAR Export for CORTEX M3

Changed in this revision

targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_IAR/LPC17xx.icf Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/PinNames.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/ethernet_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_IAR/LPC17xx.icf	Tue Nov 25 11:45:06 2014 +0000
+++ b/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_IAR/LPC17xx.icf	Wed Nov 26 08:00:09 2014 +0000
@@ -1,40 +1,44 @@
-/* [ROM] */
-define symbol __intvec_start__     = 0x00000000;
-define symbol __region_ROM_start__ = 0x00000000;
-define symbol __CRP_start__        = 0x000002FC;
-define symbol __CRP_end__          = 0x000002FF;
-define symbol __region_ROM_end__   = 0x0007FFFF;
+/*###ICF### Section handled by ICF editor, don't touch! ****/
+/*-Editor annotation file-*/
+/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
+/*-Specials-*/
+define symbol __ICFEDIT_intvec_start__ = 0x00000000;
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_ROM_start__   = 0x00000000;
+define symbol __ICFEDIT_region_ROM_end__     = 0x0007FFFF;
+define symbol __ICFEDIT_region_NVIC_start__   = 0x10000000;
+define symbol __ICFEDIT_region_NVIC_end__   = 0x100000C7;
+define symbol __ICFEDIT_region_RAM_start__   = 0x100000C8;
+define symbol __ICFEDIT_region_RAM_end__     = 0x10007FDF;
 
-/* [RAM] Vector table dynamic copy: 8_byte_aligned(49 vect * 4 bytes) =  8_byte_aligned(0xC4) = 0xC8*/
-define symbol __NVIC_start__       = 0x10000000;
-define symbol __NVIC_end__         = 0x100000C7;
-define symbol __region_RAM_start__ = 0x100000C8;
-define symbol __region_RAM_end__   = 0x10007FDF;
-define symbol _AHB_RAM_start__     = 0x2007C000;
-define symbol _AHB_RAM_end__       = 0x20083FFF;
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__   = 0x800;
+define symbol __ICFEDIT_size_heap__     = 0x1000;
+/**** End of ICF editor section. ###ICF###*/
 
-/* Memory regions */
-define memory mem with size = 4G;
+define symbol __CRP_start__   = 0x000002FC;
+define symbol __CRP_end__     = 0x000002FF;
 
-define region ROM_region     = mem:[from __region_ROM_start__   to __region_ROM_end__] - mem:[from  __CRP_start__ to __CRP_end__];
-define region CRP_region     = mem:[from  __CRP_start__ to __CRP_end__];
-
-define region RAM_region     = mem:[from __region_RAM_start__   to __region_RAM_end__];
-define region AHB_RAM_region = mem:[from _AHB_RAM_start__ to _AHB_RAM_end__];
+define symbol __RAM1_start__  = 0x2007C000;
+define symbol __RAM1_end__    = 0x20083FFF;
 
-/* Stack and Heap */
-define symbol __size_cstack__   = 0x800;
-define symbol __size_heap__     = 0x800;
-define block CSTACK    with alignment = 8, size = __size_cstack__   { };
-define block HEAP      with alignment = 8, size = __size_heap__     { };
-define block STACKHEAP with fixed order { block HEAP, block CSTACK };
+define memory mem with size = 4G;
+define region ROM_region   = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__] -  mem:[from  __CRP_start__ to __CRP_end__];
+define region RAM_region   = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__];
+define region CRP_region   = mem:[from __CRP_start__ to __CRP_end__];
+define region RAM1_region  = mem:[from __RAM1_start__ to __RAM1_end__];
 
-initialize by copy with packing = zeros { readwrite };
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+
+initialize by copy { readwrite };
 do not initialize  { section .noinit };
 
-place at address mem:__intvec_start__ { section .intvec };
-place at address mem:0x2FC { section CRPKEY };
-place in ROM_region     { readonly };
-place in RAM_region     { readwrite, block STACKHEAP };
-place in AHB_RAM_region { section USB_RAM };
-place in CRP_region     { section .crp };
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+place in ROM_region   { readonly };
+place in RAM_region   { readwrite,
+                        block HEAP, block CSTACK };
+                                          
+place in CRP_region  	{ section .crp };
+place in RAM1_region	{ section USB_RAM };

--- a/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/PinNames.h	Tue Nov 25 11:45:06 2014 +0000
+++ b/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/PinNames.h	Wed Nov 26 08:00:09 2014 +0000
@@ -57,7 +57,7 @@
 
     // Other mbed Pin Names
     LED1 = P4_4,
-    LED2 = P4_5,
+    LED2 = P3_2,
     LED3 = P4_6,
     LED4 = P4_7,
 

--- a/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/ethernet_api.c	Tue Nov 25 11:45:06 2014 +0000
+++ b/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/ethernet_api.c	Wed Nov 26 08:00:09 2014 +0000
@@ -160,12 +160,12 @@
     GPIOPFCE1   |=  0x4000;
     GPIOPFC1    |=  0x4000;
 
-    /* P3_3(ET_MDIO), P3_4(ET_RXCLK), P3_5(ET_RXER), P3_6(ET_RXDV) */
-    GPIOPMC3    |=  0x0078;
-    GPIOPFCAE3  &= ~0x0078;
-    GPIOPFCE3   &= ~0x0078;
-    GPIOPFC3    |=  0x0078;
-    GPIOPIPC3   |=  0x0078;
+    /* P3_0(ET_TXCLK), P3_3(ET_MDIO), P3_4(ET_RXCLK), P3_5(ET_RXER), P3_6(ET_RXDV) */
+    GPIOPMC3    |=  0x0079;
+    GPIOPFCAE3  &= ~0x0079;
+    GPIOPFCE3   &= ~0x0079;
+    GPIOPFC3    |=  0x0079;
+    GPIOPIPC3   |=  0x0079;
 
     /* P5_9(ET_MDC) */
     GPIOPMC5    |=  0x0200;
@@ -174,13 +174,13 @@
     GPIOPFC5    |=  0x0200;
     GPIOPIPC5   |=  0x0200;
 
-    /* P10_0(ET_TXCLK), P10_1(ET_TXER), P10_2(ET_TXEN), P10_3(ET_CRS), P10_4(ET_TXD0), P10_5(ET_TXD1) */
+    /* P10_1(ET_TXER), P10_2(ET_TXEN), P10_3(ET_CRS), P10_4(ET_TXD0), P10_5(ET_TXD1) */
     /* P10_6(ET_TXD2), P10_7(ET_TXD3), P10_8(ET_RXD0), P10_9(ET_RXD1), P10_10(ET_RXD2), P10_11(ET_RXD3) */
-    GPIOPMC10   |=  0x0FFF;
-    GPIOPFCAE10 &= ~0x0FFF;
-    GPIOPFCE10  |=  0x0FFF;
-    GPIOPFC10   |=  0x0FFF;
-    GPIOPIPC10  |=  0x0FFF;
+    GPIOPMC10   |=  0x0FFE;
+    GPIOPFCAE10 &= ~0x0FFE;
+    GPIOPFCE10  |=  0x0FFE;
+    GPIOPFC10   |=  0x0FFE;
+    GPIOPIPC10  |=  0x0FFE;
 
     /* Resets the E-MAC,E-DMAC */
     lan_reg_reset();
@@ -446,8 +446,7 @@
     ethernetext_set_link_mode(link);
 }
 
-void INT_Ether(void)
-{
+void INT_Ether(void) {
     uint32_t stat_edmac;
     uint32_t stat_etherc;
 

--- a/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/pwmout_api.c	Tue Nov 25 11:45:06 2014 +0000
+++ b/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/pwmout_api.c	Wed Nov 26 08:00:09 2014 +0000
@@ -27,7 +27,7 @@
 //  PORT ID, PWM ID, Pin function
 static const PinMap PinMap_PWM[] = {
     {LED_RED  , 0, 4},
-    {LED_GREEN, 1, 4},
+    {LED_GREEN, 1, 7},
     {LED_BLUE , 2, 4},
     {P4_7     , 3, 4},
     {P8_14    , 4, 6},
@@ -39,7 +39,7 @@
 
 static __IO uint16_t PORT[] = {
      PWM2E,
-     PWM2F,
+     PWM2C,
      PWM2G,
      PWM2H,
      PWM1G,
@@ -49,7 +49,7 @@
 };
 static __IO uint16_t *PWM_MATCH[] = {
     &PWMPWBFR_2E,
-    &PWMPWBFR_2E,
+    &PWMPWBFR_2C,
     &PWMPWBFR_2G,
     &PWMPWBFR_2G,
     &PWMPWBFR_1G,