From da977d7e0675e3f99a709fb3458dcdda41c2ea14 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Wed, 3 Jun 2009 18:22:58 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@768 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd | 4 ++-- .../settings/RTOSDemo.dbgdt | 6 +++--- .../settings/RTOSDemo.dni | 16 ++++++++-------- .../settings/RTOSDemo.wsdt | 8 ++++---- .../system/board_lowlevel.c | 18 ++++++++++++------ Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf | 4 ++-- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd b/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd index 9cf6a6107..0d4ead083 100644 --- a/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd +++ b/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd @@ -117,7 +117,7 @@ @@ -767,7 +767,7 @@ diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt index 357584ca3..f9952f935 100644 --- a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt +++ b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt @@ -48,20 +48,20 @@ - 0TabID-27988-1208Debug LogDebug-Log0 + 0TabID-27988-1208Debug LogDebug-Log0TabID-24197-10743DisassemblyDisassembly0 - TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\CORTEX_AT91SAM3U256_IAR\main.c014866476647TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\ARM_CM3\port.c01556219621910100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\CORTEX_AT91SAM3U256_IAR\main.c01486734673400100000010000001 - iaridepm.enu1debuggergui.enu1-2-2742337-2-2167200119286203252242143756098-2-21981402-2-214042001002857203252142857203252 + iaridepm.enu1debuggergui.enu1-2-2742337-2-2167200119286203252242143756098-2-2742198-2-2200200142857203252142857756098-2-21981402-2-214042001002857203252142857203252 diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni index 959ff6ced..d37b7c517 100644 --- a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni +++ b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni @@ -1,5 +1,5 @@ [DebugChecksum] -Checksum=1342314454 +Checksum=-2026095219 [DisAssemblyWindow] NumStates=_ 1 State 1=_ 1 @@ -55,6 +55,13 @@ SWOInfo_ITMPortsEnabled=0x00000001 SWOInfo_ITMPortsTermIO=0x00000001 SWOInfo_ITMPortsLogFile=0x00000000 SWOInfo_ITMLogFile=$PROJ_DIR$\ITM.log +[Log file] +LoggingEnabled=_ 0 +LogFile=_ "" +Category=_ 0 +[TermIOLog] +LoggingEnabled=_ 0 +LogFile=_ "" [DataLog] LogEnabled=0 SumEnabled=0 @@ -78,10 +85,3 @@ Graph=0 mode=0 [Breakpoints] Count=0 -[Log file] -LoggingEnabled=_ 0 -LogFile=_ "" -Category=_ 0 -[TermIOLog] -LoggingEnabled=_ 0 -LogFile=_ "" diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt index 9e4e0b253..2955a77ac 100644 --- a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt +++ b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt @@ -17,7 +17,7 @@ 2012163248120162258082994 - + TabID-16570-17725 @@ -29,20 +29,20 @@ - 0TabID-13247-26794BuildBuildTabID-4179-11901Debug LogDebug-LogTabID-30005-19605Find in FilesFind-in-FilesTabID-6552-24144BreakpointsBreakpoints1 + 0TabID-13247-26794BuildBuildTabID-4179-11901Debug LogDebug-LogTabID-30005-19605Find in FilesFind-in-FilesTabID-6552-24144BreakpointsBreakpoints0 - TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\CORTEX_AT91SAM3U256_IAR\main.c0466647664700100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\CORTEX_AT91SAM3U256_IAR\main.c01486734673400100000010000001 - iaridepm.enu1-2-2671276-2-2200200142857203252198571683943-2-22691402-2-214042711002857275407142857203252 + iaridepm.enu1-2-2671276-2-2200200142857203252198571683943-2-22691402-2-214042711002857275407142857203252 diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c b/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c index fd4adf732..c2d644e97 100644 --- a/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c +++ b/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c @@ -113,17 +113,23 @@ void LowLevelInit(void) /* Initialize main oscillator ****************************/ - if(!(AT91C_BASE_PMC->PMC_MOR & AT91C_CKGR_MOSCSEL)) + + if(!(AT91C_BASE_PMC->PMC_MOR & AT91C_CKGR_MOSCSEL)) + { + AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN; + timeout = 0; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT)); + } + else { + AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN | AT91C_CKGR_MOSCSEL; + timeout = 0; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCRCS) && (timeout++ < CLOCK_TIMEOUT)); AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN; timeout = 0; - while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT)); + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT)); } -// AT91C_BASE_PIOB->PIO_CODR = 1 << 1; -// AT91C_BASE_PIOB->PIO_OER = 1 << 1; -// AT91C_BASE_PIOB->PIO_PER = 1 << 1; - /* Switch to moscsel */ AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN | AT91C_CKGR_MOSCSEL; timeout = 0; diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf b/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf index a7b3a9301..78c758eaa 100644 --- a/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf +++ b/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf @@ -13,8 +13,8 @@ define symbol __ICFEDIT_region_ROM0_end__ = 0x0009FFFF; define symbol __ICFEDIT_region_ROM1_start__ = 0x00100000; define symbol __ICFEDIT_region_ROM1_end__ = 0x0011FFFF; /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x800; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_cstack__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x4; /*-Specials-*/ /*define symbol __ICFEDIT_region_RAM_VECT_start__ = __ICFEDIT_region_RAM0_start__;*/ /*Referenced for CMSIS*/ /*define symbol __ICFEDIT_size_vectors__ = 0x100;*/ /*Referenced for CMSIS*/ -- 2.39.5