From c82aa9b2244ccf594b9af26c36065a9fd4a54888 Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Wed, 7 Jan 2009 10:58:10 +0000
Subject: [PATCH] Update to IAR V5.3.
---
Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h | 6 +-
.../ewp/at91sam9xe-ek-flash.mac | 131 +++++++++
.../ewp/at91sam9xe-ek-sdram.mac | 249 +++++++++++++++++
.../ewp/at91sam9xe-ek-sram.mac | 154 +++++++++++
.../ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd | 135 ++++++++-
.../ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp | 256 ++++++++++++++----
Demo/ARM9_AT91SAM9XE_IAR/ewp/sdram.icf | 46 ++++
.../ewp/settings/at91sam9xe-ek.cspy.bat | 10 +-
.../ewp/settings/at91sam9xe-ek.dbgdt | 199 ++------------
.../ewp/settings/at91sam9xe-ek.dni | 11 +-
.../settings/rtosdemo.wsdt | 12 +-
11 files changed, 970 insertions(+), 239 deletions(-)
create mode 100644 Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-flash.mac
create mode 100644 Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sdram.mac
create mode 100644 Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sram.mac
create mode 100644 Demo/ARM9_AT91SAM9XE_IAR/ewp/sdram.icf
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h b/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
index d6a191e58..77712ffdd 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
@@ -65,12 +65,12 @@
#define configUSE_PREEMPTION 1
#define configUSE_IDLE_HOOK 0
#define configUSE_TICK_HOOK 0
-#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 64000000 )
-#define configTICK_RATE_HZ ( ( portTickType ) 100 )
+#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) BOARD_MCK )
+#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 190 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 40000 ) )
#define configMAX_TASK_NAME_LEN ( 12 )
-#define configUSE_TRACE_FACILITY 1
+#define configUSE_TRACE_FACILITY 0
#define configUSE_16_BIT_TICKS 0
#define configIDLE_SHOULD_YIELD 0
#define configUSE_CO_ROUTINES 0
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-flash.mac b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-flash.mac
new file mode 100644
index 000000000..54a6f1e76
--- /dev/null
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-flash.mac
@@ -0,0 +1,131 @@
+// ---------------------------------------------------------
+// ATMEL Microcontroller Software Support - ROUSSET -
+// ---------------------------------------------------------
+// The software is delivered "AS IS" without warranty or
+// condition of any kind, either express, implied or
+// statutory. This includes without limitation any warranty
+// or condition with respect to merchantability or fitness
+// for any particular purpose, or against the infringements of
+// intellectual property rights of others.
+// ---------------------------------------------------------
+// File: SAM9XE_FLASH.mac
+// User setup file for CSPY debugger.
+// 1.1 08/Aug/06 jpp : Creation
+//
+// $Revision: 23594 $
+//
+// ---------------------------------------------------------
+__var __mac_i;
+__var __mac_pt;
+
+/*********************************************************************
+*
+* execUserReset() : JTAG set initially to Full Speed
+*/
+execUserReset()
+{
+ __message "------------------------------ execUserReset ---------------------------------";
+ __writeMemory32(0x00000500, 0xFFFFFA00, "Memory"); // Set flash wait states
+ __PllSetting(); //* Init PLL
+ __PllSetting100MHz();
+ __message "-------------------------------Set PC Reset ----------------------------------";
+}
+
+/*********************************************************************
+*
+* execUserPreload() : JTAG set initially to 32kHz
+*/
+execUserPreload()
+{
+ __message "------------------------------ execUserPreload ---------------------------------";
+ __hwReset(0); //* Hardware Reset: CPU is automatically halted after the reset (JTAG is already configured to 32kHz)
+ __writeMemory32(0xD3,0x98,"Register"); //* Set CPSR
+ __writeMemory32(0x00000500, 0xFFFFFA00, "Memory"); // Set flash wait states
+ __PllSetting(); //* Init PLL
+ __PllSetting100MHz();
+ _InitRSTC(); //* Enable User Reset to allow execUserReset() execution
+}
+
+
+
+/*********************************************************************
+*
+* _InitRSTC()
+*
+* Function description
+* Initializes the RSTC (Reset controller).
+* This makes sense since the default is to not allow user resets, which makes it impossible to
+* apply a second RESET via J-Link
+*/
+_InitRSTC() {
+ __writeMemory32(0xA5000001, 0xFFFFFD08,"Memory"); // Allow user reset
+}
+
+
+
+/*********************************************************************
+*
+* __PllSetting()
+* Function description
+* Initializes the PMC.
+* 1. Enable the Main Oscillator
+* 2. Configure PLL
+* 3. Switch Master
+*/
+__PllSetting()
+{
+ if ((__readMemory32(0xFFFFFC30,"Memory")&0x3) != 0 ) {
+//* Disable all PMC interrupt ( $$ JPP)
+//* AT91C_PMC_IDR ((AT91_REG *) 0xFFFFFC64) //(PMC) Interrupt Disable Register
+//* pPmc->PMC_IDR = 0xFFFFFFFF;
+ __writeMemory32(0xFFFFFFFF,0xFFFFFC64,"Memory");
+//* AT91C_PMC_PCDR ((AT91_REG *) 0xFFFFFC14) //(PMC) Peripheral Clock Disable Register
+ __writeMemory32(0xFFFFFFFF,0xFFFFFC14,"Memory");
+// Disable all clock only Processor clock is enabled.
+ __writeMemory32(0xFFFFFFFE,0xFFFFFC04,"Memory");
+
+// AT91C_PMC_MCKR ((AT91_REG *) 0xFFFFFC30) // (PMC) Master Clock Register
+ __writeMemory32(0x00000001,0xFFFFFC30,"Memory");
+ __sleep(10000);
+
+// write reset value to PLLA and PLLB
+// AT91C_PMC_PLLAR ((AT91_REG *) 0xFFFFFC28) // (PMC) PLL A Register
+ __writeMemory32(0x00003F00,0xFFFFFC28,"Memory");
+
+// AT91C_PMC_PLLBR ((AT91_REG *) 0xFFFFFC2C) // (PMC) PLL B Register
+ __writeMemory32(0x00003F00,0xFFFFFC2C,"Memory");
+ __sleep(10000);
+
+ __message "------------------------------- PLL Enable -----------------------------------------";
+ } else {
+ __message " ********* Core in SLOW CLOCK mode ********* "; }
+}
+
+
+/*********************************************************************
+*
+* __PllSetting100MHz()
+* Function description
+* Set core at 200 MHz and MCK at 100 MHz
+*/
+__PllSetting100MHz()
+{
+
+ __message "------------------------------- PLL Set at 100 MHz ----------------------------------";
+
+//* pPmc->PMC_MOR = (( AT91C_CKGR_OSCOUNT & (0x40 <<8) | AT91C_CKGR_MOSCEN ));
+ __writeMemory32(0x00004001,0xFFFFFC20,"Memory");
+ __sleep(10000);
+// AT91C_PMC_MCKR ((AT91_REG *) 0xFFFFFC30) // (PMC) Master Clock Register
+ __writeMemory32(0x00000001,0xFFFFFC30,"Memory");
+ __sleep(10000);
+//* AT91C_BASE_CKGR->CKGR_PLLAR = (AT91C_CKGR_SRCA | ((96 << 16) & AT91C_CKGR_MULA) |
+// (AT91C_CKGR_PLLACOUNT | (AT91C_CKGR_OUTA_0 | (9);
+ __writeMemory32(0x2060BF09,0xFFFFFC28,"Memory");
+ __sleep(10000);
+//* AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_CSS_PLLA_CLK | AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2;;
+ __writeMemory32(0x00000102,0xFFFFFC30,"Memory");
+ __sleep(10000);
+
+}
+
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sdram.mac b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sdram.mac
new file mode 100644
index 000000000..b493dea6b
--- /dev/null
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sdram.mac
@@ -0,0 +1,249 @@
+// ---------------------------------------------------------
+// ATMEL Microcontroller Software Support - ROUSSET -
+// ---------------------------------------------------------
+// The software is delivered "AS IS" without warranty or
+// condition of any kind, either express, implied or
+// statutory. This includes without limitation any warranty
+// or condition with respect to merchantability or fitness
+// for any particular purpose, or against the infringements of
+// intellectual property rights of others.
+// ---------------------------------------------------------
+// File: SAM9XE_SDRAM.mac
+// User setup file for CSPY debugger.
+// 1.1 08/Aug/06 jpp : Creation
+//
+// $Revision: 23594 $
+//
+// ---------------------------------------------------------
+__var __mac_i;
+__var __mac_pt;
+
+/*********************************************************************
+*
+* execUserReset() : JTAG set initially to Full Speed
+*/
+execUserReset()
+{
+ __message "------------------------------ execUserReset ---------------------------------";
+ _MapRAMAt0(); //* Set the RAM memory at 0x00200000 & 0x00000000
+ __PllSetting(); //* Init PLL
+ __PllSetting100MHz();
+ __message "-------------------------------Set PC Reset ----------------------------------";
+}
+
+/*********************************************************************
+*
+* execUserPreload() : JTAG set initially to 32kHz
+*/
+execUserPreload()
+{
+ __message "------------------------------ execUserPreload ---------------------------------";
+ __hwReset(0); //* Hardware Reset: CPU is automatically halted after the reset (JTAG is already configured to 32kHz)
+ __writeMemory32(0xD3,0x98,"Register"); //* Set CPSR
+ __PllSetting(); //* Init PLL
+ __PllSetting100MHz();
+ __initSDRAM(); //* Init SDRAM before load
+ _MapRAMAt0(); //* Set the RAM memory at 0x0020 0000 & 0x0000 0000
+ _InitRSTC(); //* Enable User Reset to allow execUserReset() execution
+}
+
+
+
+/*********************************************************************
+*
+* _InitRSTC()
+*
+* Function description
+* Initializes the RSTC (Reset controller).
+* This makes sense since the default is to not allow user resets, which makes it impossible to
+* apply a second RESET via J-Link
+*/
+_InitRSTC() {
+ __writeMemory32(0xA5000001, 0xFFFFFD08,"Memory"); // Allow user reset
+}
+
+
+/*********************************************************************
+*
+* __initSDRAM()
+* Function description
+* Set SDRAM for works at 100 MHz
+*/
+__initSDRAM()
+{
+//* Configure EBI Chip select
+// pCCFG->CCFG_EBICSA |= AT91C_EBI_CS1A_SDRAMC;
+// AT91C_CCFG_EBICSA ((AT91_REG *) 0xFFFFEF1C) // (CCFG) EBI Chip Select Assignement Register
+ __writeMemory32(0x0001003A,0xFFFFEF1C,"Memory");
+
+
+//* Configure PIOs
+//* AT91F_PIO_CfgPeriph( AT91C_BASE_PIOC, AT91C_PC16_D16 to AT91C_PC16_D31
+// pPio->PIO_ASR = periphAEnable; AT91C_PIOC_ASR ((AT91_REG *) 0xFFFFF870) // (PIOC) Select A Register
+// pPio->PIO_BSR = periphBEnable;AT91C_PIOC_BSR ((AT91_REG *) 0xFFFFF874) // (PIOC) Select B Register
+// pPio->PIO_PDR = (periphAEnable | periphBEnable); // Set in Periph mode
+ __writeMemory32(0xFFFF0000,0xFFFFF870,"Memory");
+ __writeMemory32(0x00000000,0xFFFFF874,"Memory");
+ __writeMemory32(0xFFFF0000,0xFFFFF804,"Memory");
+
+//* psdrc->SDRAMC_CR = AT91C_SDRAMC_NC_9 | AT91C_SDRAMC_NR_13 | AT91C_SDRAMC_CAS_3 |
+// AT91C_SDRAMC_NB_4_BANKS | AT91C_SDRAMC_DBW_32_BITS | AT91C_SDRAMC_TWR_2 | AT91C_SDRAMC_TRC_7 |
+// AT91C_SDRAMC_TRP_2 | AT91C_SDRAMC_TRCD_2 | AT91C_SDRAMC_TRAS_5 | AT91C_SDRAMC_TXSR_8 ;
+ __writeMemory32(0x85227279,0xFFFFEA08,"Memory");
+ __sleep(100);
+//* psdrc->SDRAMC_MR = 0x00000002; // Set PRCHG AL
+ __writeMemory32(0x00000002,0xFFFFEA00,"Memory");
+//* *AT91C_SDRAM = 0x00000000; // Perform PRCHG
+ __writeMemory32(0x00000000,0x20000000,"Memory");
+ __sleep(100);
+
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_RFSH_CMD; // Set 1st CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+
+//* *(AT91C_SDRAM+4) = 0x00000001; // Perform CBR
+ __writeMemory32(0x00000001,0x20000010,"Memory");
+
+//* psdrc->SDRAMC_MR = 0x00000004; // Set 2 CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+8) = 0x00000002; // Perform CBR
+ __writeMemory32(0x00000002,0x20000020,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_RFSH_CMD; // Set 3 CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+0xc) = 0x00000003; // Perform CBR
+ __writeMemory32(0x00000003,0x20000030,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_RFSH_CMD; // Set 4 CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+0x10) = 0x00000004; // Perform CBR
+ __writeMemory32(0x00000004,0x20000040,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_RFSH_CMD; // Set 5 CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+0x14) = 0x00000005; // Perform CBR
+ __writeMemory32(0x00000005,0x20000050,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_RFSH_CMD; // Set 6 CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+0x18) = 0x00000006; // Perform CBR
+ __writeMemory32(0x00000006,0x20000060,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_RFSH_CMD; // Set 7 CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+0x1c) = 0x00000007; // Perform CBR
+ __writeMemory32(0x00000007,0x20000070,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_RFSH_CMD; // Set 8 CBR
+ __writeMemory32(0x00000004,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+0x20) = 0x00000008; // Perform CBR
+ __writeMemory32(0x00000008,0x20000080,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_LMR_CMD; // Set LMR operation
+ __writeMemory32(0x00000003,0xFFFFEA00,"Memory");
+//* *(AT91C_SDRAM+0x24) = 0xcafedede; // Perform LMR burst=1, lat=2
+ __writeMemory32(0xCAFEDEDE,0x20000090,"Memory");
+
+//* psdrc->SDRAMC_TR = (AT91C_MASTER_CLOCK * 7)/1000000; // Set Refresh Timer 390 for 25MHz (TR= 15.6 * F )
+// // (F : system clock freq. MHz
+
+ __writeMemory32(0x000002B9,0xFFFFEA04,"Memory");
+
+//* psdrc->SDRAMC_MR = AT91C_SDRAMC_MODE_NORMAL_CMD; // Set Normal mode
+ __writeMemory32(0x00000000,0xFFFFEA00,"Memory");
+
+//* *AT91C_SDRAM = 0x00000000; // Perform Normal mode
+ __writeMemory32(0x00000000,0x20000000,"Memory");
+ __message "------------------------------- SDRAM Done at 100 MHz -------------------------------";
+
+}
+
+/*********************************************************************
+*
+* _MapRAMAt0()
+* Function description
+* Remap RAM at 0
+*/
+_MapRAMAt0()
+{
+// AT91C_MATRIX_MRCR ((AT91_REG *) 0xFFFFEF00) // (MATRIX) Master Remp Control Register
+ __mac_i=__readMemory32(0xFFFFEF00,"Memory");
+ __message "----- AT91C_MATRIX_MRCR : 0x",__mac_i:%X;
+
+ if ( ((__mac_i & 0x01) == 0) || ((__mac_i & 0x02) == 0)){
+ __message "------------------------------- The Remap is NOT & REMAP ----------------------------";
+ __writeMemory32(0x00000003,0xFFFFEF00,"Memory");
+ __mac_i=__readMemory32(0xFFFFEF00,"Memory");
+ __message "----- AT91C_MATRIX_MRCR : 0x",__mac_i:%X;
+ } else {
+ __message "------------------------------- The Remap is done -----------------------------------";
+ }
+}
+
+
+/*********************************************************************
+*
+* __PllSetting()
+* Function description
+* Initializes the PMC.
+* 1. Enable the Main Oscillator
+* 2. Configure PLL
+* 3. Switch Master
+*/
+__PllSetting()
+{
+ if ((__readMemory32(0xFFFFFC30,"Memory")&0x3) != 0 ) {
+//* Disable all PMC interrupt ( $$ JPP)
+//* AT91C_PMC_IDR ((AT91_REG *) 0xFFFFFC64) //(PMC) Interrupt Disable Register
+//* pPmc->PMC_IDR = 0xFFFFFFFF;
+ __writeMemory32(0xFFFFFFFF,0xFFFFFC64,"Memory");
+//* AT91C_PMC_PCDR ((AT91_REG *) 0xFFFFFC14) //(PMC) Peripheral Clock Disable Register
+ __writeMemory32(0xFFFFFFFF,0xFFFFFC14,"Memory");
+// Disable all clock only Processor clock is enabled.
+ __writeMemory32(0xFFFFFFFE,0xFFFFFC04,"Memory");
+
+// AT91C_PMC_MCKR ((AT91_REG *) 0xFFFFFC30) // (PMC) Master Clock Register
+ __writeMemory32(0x00000001,0xFFFFFC30,"Memory");
+ __sleep(10000);
+
+// write reset value to PLLA and PLLB
+// AT91C_PMC_PLLAR ((AT91_REG *) 0xFFFFFC28) // (PMC) PLL A Register
+ __writeMemory32(0x00003F00,0xFFFFFC28,"Memory");
+
+// AT91C_PMC_PLLBR ((AT91_REG *) 0xFFFFFC2C) // (PMC) PLL B Register
+ __writeMemory32(0x00003F00,0xFFFFFC2C,"Memory");
+ __sleep(10000);
+
+ __message "------------------------------- PLL Enable -----------------------------------------";
+ } else {
+ __message " ********* Core in SLOW CLOCK mode ********* "; }
+}
+
+
+/*********************************************************************
+*
+* __PllSetting100MHz()
+* Function description
+* Set core at 200 MHz and MCK at 100 MHz
+*/
+__PllSetting100MHz()
+{
+
+ __message "------------------------------- PLL Set at 100 MHz ----------------------------------";
+
+//* pPmc->PMC_MOR = (( AT91C_CKGR_OSCOUNT & (0x40 <<8) | AT91C_CKGR_MOSCEN ));
+ __writeMemory32(0x00004001,0xFFFFFC20,"Memory");
+ __sleep(10000);
+// AT91C_PMC_MCKR ((AT91_REG *) 0xFFFFFC30) // (PMC) Master Clock Register
+ __writeMemory32(0x00000001,0xFFFFFC30,"Memory");
+ __sleep(10000);
+//* AT91C_BASE_CKGR->CKGR_PLLAR = (AT91C_CKGR_SRCA | ((96 << 16) & AT91C_CKGR_MULA) |
+// (AT91C_CKGR_PLLACOUNT | (AT91C_CKGR_OUTA_0 | (9);
+ __writeMemory32(0x2060BF09,0xFFFFFC28,"Memory");
+ __sleep(10000);
+//* AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_CSS_PLLA_CLK | AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2;;
+ __writeMemory32(0x00000102,0xFFFFFC30,"Memory");
+ __sleep(10000);
+
+}
+
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sram.mac b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sram.mac
new file mode 100644
index 000000000..c23e7f936
--- /dev/null
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek-sram.mac
@@ -0,0 +1,154 @@
+// ---------------------------------------------------------
+// ATMEL Microcontroller Software Support - ROUSSET -
+// ---------------------------------------------------------
+// The software is delivered "AS IS" without warranty or
+// condition of any kind, either express, implied or
+// statutory. This includes without limitation any warranty
+// or condition with respect to merchantability or fitness
+// for any particular purpose, or against the infringements of
+// intellectual property rights of others.
+// ---------------------------------------------------------
+// File: SAM9XE_SRAM.mac
+// User setup file for CSPY debugger.
+// 1.1 08/Aug/06 jpp : Creation
+//
+// $Revision: 23594 $
+//
+// ---------------------------------------------------------
+__var __mac_i;
+__var __mac_pt;
+
+/*********************************************************************
+*
+* execUserReset() : JTAG set initially to Full Speed
+*/
+execUserReset()
+{
+ __message "------------------------------ execUserReset ---------------------------------";
+ _MapRAMAt0(); //* Set the RAM memory at 0x00200000 & 0x00000000
+ __PllSetting(); //* Init PLL
+ __PllSetting100MHz();
+ __message "-------------------------------Set PC Reset ----------------------------------";
+}
+
+/*********************************************************************
+*
+* execUserPreload() : JTAG set initially to 32kHz
+*/
+execUserPreload()
+{
+ __message "------------------------------ execUserPreload ---------------------------------";
+ __hwReset(0); //* Hardware Reset: CPU is automatically halted after the reset (JTAG is already configured to 32kHz)
+ __writeMemory32(0xD3,0x98,"Register"); //* Set CPSR
+ __PllSetting(); //* Init PLL
+ __PllSetting100MHz();
+ _MapRAMAt0(); //* Set the RAM memory at 0x0020 0000 & 0x0000 0000
+ _InitRSTC(); //* Enable User Reset to allow execUserReset() execution
+}
+
+
+
+/*********************************************************************
+*
+* _InitRSTC()
+*
+* Function description
+* Initializes the RSTC (Reset controller).
+* This makes sense since the default is to not allow user resets, which makes it impossible to
+* apply a second RESET via J-Link
+*/
+_InitRSTC() {
+ __writeMemory32(0xA5000001, 0xFFFFFD08,"Memory"); // Allow user reset
+}
+
+
+
+/*********************************************************************
+*
+* _MapRAMAt0()
+* Function description
+* Remap RAM at 0
+*/
+_MapRAMAt0()
+{
+// AT91C_MATRIX_MRCR ((AT91_REG *) 0xFFFFEF00) // (MATRIX) Master Remp Control Register
+ __mac_i=__readMemory32(0xFFFFEF00,"Memory");
+ __message "----- AT91C_MATRIX_MRCR : 0x",__mac_i:%X;
+
+ if ( ((__mac_i & 0x01) == 0) || ((__mac_i & 0x02) == 0)){
+ __message "------------------------------- The Remap is NOT & REMAP ----------------------------";
+ __writeMemory32(0x00000003,0xFFFFEF00,"Memory");
+ __mac_i=__readMemory32(0xFFFFEF00,"Memory");
+ __message "----- AT91C_MATRIX_MRCR : 0x",__mac_i:%X;
+ } else {
+ __message "------------------------------- The Remap is done -----------------------------------";
+ }
+}
+
+
+/*********************************************************************
+*
+* __PllSetting()
+* Function description
+* Initializes the PMC.
+* 1. Enable the Main Oscillator
+* 2. Configure PLL
+* 3. Switch Master
+*/
+__PllSetting()
+{
+ if ((__readMemory32(0xFFFFFC30,"Memory")&0x3) != 0 ) {
+//* Disable all PMC interrupt ( $$ JPP)
+//* AT91C_PMC_IDR ((AT91_REG *) 0xFFFFFC64) //(PMC) Interrupt Disable Register
+//* pPmc->PMC_IDR = 0xFFFFFFFF;
+ __writeMemory32(0xFFFFFFFF,0xFFFFFC64,"Memory");
+//* AT91C_PMC_PCDR ((AT91_REG *) 0xFFFFFC14) //(PMC) Peripheral Clock Disable Register
+ __writeMemory32(0xFFFFFFFF,0xFFFFFC14,"Memory");
+// Disable all clock only Processor clock is enabled.
+ __writeMemory32(0xFFFFFFFE,0xFFFFFC04,"Memory");
+
+// AT91C_PMC_MCKR ((AT91_REG *) 0xFFFFFC30) // (PMC) Master Clock Register
+ __writeMemory32(0x00000001,0xFFFFFC30,"Memory");
+ __sleep(10000);
+
+// write reset value to PLLA and PLLB
+// AT91C_PMC_PLLAR ((AT91_REG *) 0xFFFFFC28) // (PMC) PLL A Register
+ __writeMemory32(0x00003F00,0xFFFFFC28,"Memory");
+
+// AT91C_PMC_PLLBR ((AT91_REG *) 0xFFFFFC2C) // (PMC) PLL B Register
+ __writeMemory32(0x00003F00,0xFFFFFC2C,"Memory");
+ __sleep(10000);
+
+ __message "------------------------------- PLL Enable -----------------------------------------";
+ } else {
+ __message " ********* Core in SLOW CLOCK mode ********* "; }
+}
+
+
+/*********************************************************************
+*
+* __PllSetting100MHz()
+* Function description
+* Set core at 200 MHz and MCK at 100 MHz
+*/
+__PllSetting100MHz()
+{
+
+ __message "------------------------------- PLL Set at 100 MHz ----------------------------------";
+
+//* pPmc->PMC_MOR = (( AT91C_CKGR_OSCOUNT & (0x40 <<8) | AT91C_CKGR_MOSCEN ));
+ __writeMemory32(0x00004001,0xFFFFFC20,"Memory");
+ __sleep(10000);
+// AT91C_PMC_MCKR ((AT91_REG *) 0xFFFFFC30) // (PMC) Master Clock Register
+ __writeMemory32(0x00000001,0xFFFFFC30,"Memory");
+ __sleep(10000);
+//* AT91C_BASE_CKGR->CKGR_PLLAR = (AT91C_CKGR_SRCA | ((96 << 16) & AT91C_CKGR_MULA) |
+// (AT91C_CKGR_PLLACOUNT | (AT91C_CKGR_OUTA_0 | (9);
+ __writeMemory32(0x2060BF09,0xFFFFFC28,"Memory");
+ __sleep(10000);
+//* AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_CSS_PLLA_CLK | AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2;;
+ __writeMemory32(0x00000102,0xFFFFFC30,"Memory");
+ __sleep(10000);
+
+}
+
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
index 1f004b52a..0472a5f73 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
@@ -559,6 +559,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -1192,6 +1205,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -1825,6 +1851,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -2458,6 +2497,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -3091,6 +3143,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -3724,6 +3789,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -3835,7 +3913,7 @@
</option>
<option>
<name>MacFile</name>
- <state>$PROJ_DIR$\..\..\..\resources\at91sam9xe-ek-flash.mac</state>
+ <state>$PROJ_DIR$\at91sam9xe-ek-flash.mac</state>
</option>
<option>
<name>MemOverride</name>
@@ -3887,7 +3965,7 @@
</option>
<option>
<name>OCLastSavedByProductVersion</name>
- <state>5.20.0.50986</state>
+ <state>5.30.0.51160</state>
</option>
<option>
<name>OCDownloadAttachToProgram</name>
@@ -4357,6 +4435,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -4468,7 +4559,7 @@
</option>
<option>
<name>MacFile</name>
- <state>$PROJ_DIR$\..\..\..\resources\at91sam9xe-ek-sdram.mac</state>
+ <state>$PROJ_DIR$\at91sam9xe-ek-sdram.mac</state>
</option>
<option>
<name>MemOverride</name>
@@ -4476,11 +4567,11 @@
</option>
<option>
<name>MemFile</name>
- <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioat91sam9xe512.ddf</state>
+ <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf</state>
</option>
<option>
<name>RunToEnable</name>
- <state>0</state>
+ <state>1</state>
</option>
<option>
<name>RunToName</name>
@@ -4520,7 +4611,7 @@
</option>
<option>
<name>OCLastSavedByProductVersion</name>
- <state>5.10.5.376</state>
+ <state>5.30.0.51160</state>
</option>
<option>
<name>OCDownloadAttachToProgram</name>
@@ -4990,6 +5081,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
@@ -5101,7 +5205,7 @@
</option>
<option>
<name>MacFile</name>
- <state>$PROJ_DIR$\..\..\..\resources\at91sam9xe-ek-sram.mac</state>
+ <state>$PROJ_DIR$\at91sam9xe-ek-sram.mac</state>
</option>
<option>
<name>MemOverride</name>
@@ -5109,7 +5213,7 @@
</option>
<option>
<name>MemFile</name>
- <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioat91sam9xe512.ddf</state>
+ <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf</state>
</option>
<option>
<name>RunToEnable</name>
@@ -5153,7 +5257,7 @@
</option>
<option>
<name>OCLastSavedByProductVersion</name>
- <state>5.10.5.376</state>
+ <state>5.30.0.51160</state>
</option>
<option>
<name>OCDownloadAttachToProgram</name>
@@ -5623,6 +5727,19 @@
</option>
</data>
</settings>
+ <settings>
+ <name>STLINK_ID</name>
+ <archiveVersion>2</archiveVersion>
+ <data>
+ <version>0</version>
+ <wantNonLocal>1</wantNonLocal>
+ <debug>1</debug>
+ <option>
+ <name>OCDriverInfo</name>
+ <state>1</state>
+ </option>
+ </data>
+ </settings>
<settings>
<name>THIRDPARTY_ID</name>
<archiveVersion>2</archiveVersion>
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
index 439c35532..32b24f372 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
@@ -12,7 +12,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -29,8 +29,8 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
- <state>11</state>
+ <version>9</version>
+ <state>12</state>
</option>
<option>
<name>GEndianMode</name>
@@ -126,13 +126,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -319,6 +328,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -546,7 +560,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -756,6 +770,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -795,7 +813,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -812,7 +830,7 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
+ <version>9</version>
<state>0</state>
</option>
<option>
@@ -909,13 +927,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -1102,6 +1129,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -1329,7 +1361,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -1539,6 +1571,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -1578,7 +1614,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -1595,7 +1631,7 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
+ <version>9</version>
<state>0</state>
</option>
<option>
@@ -1692,13 +1728,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -1885,6 +1930,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -2112,7 +2162,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -2322,6 +2372,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -2361,7 +2415,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -2378,7 +2432,7 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
+ <version>9</version>
<state>0</state>
</option>
<option>
@@ -2475,13 +2529,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -2668,6 +2731,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -2895,7 +2963,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -3105,6 +3173,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -3144,7 +3216,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -3161,7 +3233,7 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
+ <version>9</version>
<state>0</state>
</option>
<option>
@@ -3258,13 +3330,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -3451,6 +3532,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -3678,7 +3764,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -3888,6 +3974,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -3927,7 +4017,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -3944,7 +4034,7 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
+ <version>9</version>
<state>0</state>
</option>
<option>
@@ -4041,13 +4131,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -4234,6 +4333,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -4461,7 +4565,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -4671,6 +4775,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -4710,7 +4818,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -4727,8 +4835,8 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
- <state>11</state>
+ <version>9</version>
+ <state>12</state>
</option>
<option>
<name>GEndianMode</name>
@@ -4824,13 +4932,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -5018,6 +5135,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -5245,7 +5367,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -5455,6 +5577,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -5494,7 +5620,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -5511,8 +5637,8 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
- <state>0</state>
+ <version>9</version>
+ <state>12</state>
</option>
<option>
<name>GEndianMode</name>
@@ -5534,7 +5660,7 @@
</option>
<option>
<name>Output description</name>
- <state>No specifier a, A, no specifier n, no float nor long long, no flags.</state>
+ <state>No specifier a, A, no specifier n, no float nor long long.</state>
</option>
<option>
<name>GOutputBinary</name>
@@ -5573,7 +5699,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>5.10.0.213</state>
+ <state>5.30.0.51160</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -5589,7 +5715,7 @@
</option>
<option>
<name>GenLowLevelInterface</name>
- <state>1</state>
+ <state>0</state>
</option>
<option>
<name>GEndianModeBE</name>
@@ -5608,13 +5734,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -5661,7 +5796,7 @@
</option>
<option>
<name>CCDiagSuppress</name>
- <state>Pe826,Pe1375</state>
+ <state>Pe826,Pe1375,Pa082</state>
</option>
<option>
<name>CCDiagRemark</name>
@@ -5758,6 +5893,7 @@
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\peripherals</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\components</state>
+ <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\utility</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\usb</state>
<state>$PROJ_DIR$\..\..\..\Source\include</state>
<state>$PROJ_DIR$\..</state>
@@ -5777,7 +5913,7 @@
</option>
<option>
<name>IInterwork2</name>
- <state>1</state>
+ <state>0</state>
</option>
<option>
<name>IProcessorMode2</name>
@@ -5801,6 +5937,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -6028,7 +6169,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -6109,7 +6250,7 @@
</option>
<option>
<name>IlinkIcfFile</name>
- <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\at91sam9xe512\sdram.icf</state>
+ <state>$PROJ_DIR$\sdram.icf</state>
</option>
<option>
<name>IlinkIcfFileSlave</name>
@@ -6238,6 +6379,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -6277,7 +6422,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>16</version>
+ <version>17</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -6294,8 +6439,8 @@
</option>
<option>
<name>Variant</name>
- <version>8</version>
- <state>0</state>
+ <version>9</version>
+ <state>12</state>
</option>
<option>
<name>GEndianMode</name>
@@ -6391,13 +6536,22 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>GeneralMisraVer</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GeneralMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>20</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -6541,6 +6695,7 @@
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\peripherals</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\components</state>
+ <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\utility</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\usb</state>
<state>$PROJ_DIR$\..\..\..\Source\include</state>
<state>$PROJ_DIR$\..</state>
@@ -6584,6 +6739,11 @@
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
+ <option>
+ <name>CompilerMisraRules04</name>
+ <version>0</version>
+ <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+ </option>
</data>
</settings>
<settings>
@@ -6811,7 +6971,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>6</version>
+ <version>7</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -7021,6 +7181,10 @@
<name>IlinkStdoutInterfaceSlave</name>
<state>1</state>
</option>
+ <option>
+ <name>CrcFullSize</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/sdram.icf b/Demo/ARM9_AT91SAM9XE_IAR/ewp/sdram.icf
new file mode 100644
index 000000000..4fdb25819
--- /dev/null
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/sdram.icf
@@ -0,0 +1,46 @@
+/*###ICF### Section handled by ICF editor, don't touch! ****/
+/*-Editor annotation file-*/
+/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\a_v1_0.xml" */
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_SDRAM_start__ = 0x20000000;
+define symbol __ICFEDIT_region_SDRAM_end__ = 0x21FFFFFF;
+define symbol __ICFEDIT_region_RAM_start__ = 0x300000;
+define symbol __ICFEDIT_region_RAM_end__ = 0x307FFF;
+/*-Sizes-*/
+define symbol __ICFEDIT_size_startup__ = 0x100;
+define symbol __ICFEDIT_size_vectors__ = 0x100;
+define symbol __ICFEDIT_size_cstack__ = 0x1000;
+define symbol __ICFEDIT_size_svcstack__ = 0x60;
+define symbol __ICFEDIT_size_irqstack__ = 0x60;
+define symbol __ICFEDIT_size_heap__ = 0x10000;
+/*-Exports-*/
+export symbol __ICFEDIT_region_SDRAM_start__;
+export symbol __ICFEDIT_region_SDRAM_end__;
+export symbol __ICFEDIT_region_RAM_start__;
+export symbol __ICFEDIT_region_RAM_end__;
+export symbol __ICFEDIT_size_startup__;
+export symbol __ICFEDIT_size_vectors__;
+export symbol __ICFEDIT_size_cstack__;
+export symbol __ICFEDIT_size_svcstack__;
+export symbol __ICFEDIT_size_irqstack__;
+export symbol __ICFEDIT_size_heap__;
+/**** End of ICF editor section. ###ICF###*/
+
+define memory mem with size = 4G;
+define region STA_region = mem:[from __ICFEDIT_region_SDRAM_start__ size __ICFEDIT_size_startup__];
+define region SDRAM_region = mem:[from __ICFEDIT_region_SDRAM_start__+__ICFEDIT_size_startup__ to __ICFEDIT_region_SDRAM_end__];
+define region VEC_region = mem:[from __ICFEDIT_region_RAM_start__ size __ICFEDIT_size_vectors__];
+define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__+__ICFEDIT_size_vectors__ to __ICFEDIT_region_RAM_end__];
+
+define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { };
+define block SVC_STACK with alignment = 8, size = __ICFEDIT_size_svcstack__ { };
+define block IRQ_STACK with alignment = 8, size = __ICFEDIT_size_irqstack__ { };
+define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { };
+
+initialize by copy { section .vectors };
+do not initialize { section .noinit };
+
+place in STA_region { section .cstartup };
+place in VEC_region { section .vectors };
+place in SDRAM_region { readonly, readwrite, block IRQ_STACK, block SVC_STACK, block CSTACK, block HEAP };
+
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
index 4784cbeee..4c0321479 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
@@ -22,11 +22,11 @@
@REM but they are listed at the end of this file for reference.
-"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armjlink.dll" %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\..\..\..\resources\at91sam9xe-ek-flash.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf" "--drv_verify_download" "--semihosting" "--device=AT91SAM9XE512" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=auto" "--jlink_initial_speed=32" "--drv_catch_exceptions=0x000" "--jlink_reset_strategy=50,0"
+"C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\arm\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\arm\bin\armjlink.dll" %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\arm\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\at91sam9xe-ek-sdram.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\arm\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf" "--drv_verify_download" "--semihosting=none" "--device=AT91SAM9XE512" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=adaptive" "--drv_catch_exceptions=0x000"
@REM Loaded plugins:
-@REM C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armlibsupport.dll
-@REM C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\plugins\CodeCoverage\CodeCoverage.dll
-@REM C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\plugins\stack\stack.dll
-@REM C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\plugins\SymList\SymList.dll
+@REM C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\arm\bin\armlibsupport.dll
+@REM C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\common\plugins\CodeCoverage\CodeCoverage.dll
+@REM C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\common\plugins\stack\stack.dll
+@REM C:\Devtools\IAR Systems\Embedded Workbench 5.3-EWARM-5.30.0.1162-BETA\common\plugins\SymList\SymList.dll
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
index 22d6b995e..4bddf5882 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
@@ -3,7 +3,7 @@
<Project>
<Desktop>
<Static>
- <Debug-Log/>
+ <Debug-Log><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1342</ColumnWidth1></Debug-Log>
<Build>
<ColumnWidth0>20</ColumnWidth0>
<ColumnWidth1>1216</ColumnWidth1>
@@ -12,19 +12,22 @@
</Build>
<Workspace>
<ColumnWidths>
- <Column0>124</Column0>
- <Column1>27</Column1>
- <Column2>27</Column2>
- <Column3>27</Column3>
- </ColumnWidths>
+
+
+
+
+ <Column0>290</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Disassembly>
- <MixedMode>1</MixedMode>
- <CodeCovShow>0</CodeCovShow>
- </Disassembly>
+
+
+ <PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><MixedMode>1</MixedMode><CodeCovShow>0</CodeCovShow><InstrProfShow>0</InstrProfShow></Disassembly>
</Static>
<Windows>
- <Wnd3>
+
+
+
+ <Wnd0>
<Tabs>
<Tab>
<Identity>TabID-27883-8575</Identity>
@@ -39,175 +42,33 @@
<Session/>
</Tab>
</Tabs>
- <SelectedTab>0</SelectedTab>
- </Wnd3>
- <Wnd4>
+
+ <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<Tabs>
<Tab>
<Identity>TabID-5864-8578</Identity>
<TabName>Workspace</TabName>
<Factory>Workspace</Factory>
<Session>
- <NodeDict>
- <ExpandedNode>at91sam9xe-ek</ExpandedNode>
- </NodeDict>
- </Session>
+
+ <NodeDict><ExpandedNode>at91sam9xe-ek</ExpandedNode></NodeDict></Session>
</Tab>
</Tabs>
- <SelectedTab>0</SelectedTab>
- </Wnd4>
- <Wnd5>
- <Tabs>
- <Tab>
- <Identity>TabID-16612-8582</Identity>
- <TabName>Disassembly</TabName>
- <Factory>Disassembly</Factory>
- <Session/>
- </Tab>
- </Tabs>
- <SelectedTab>0</SelectedTab>
- </Wnd5>
- </Windows>
+
+ <SelectedTab>0</SelectedTab></Wnd1></Windows>
<Editor>
- <Pane>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename>
- <XPos>0</XPos>
- <YPos>125</YPos>
- <SelStart>4609</SelStart>
- <SelEnd>4609</SelEnd>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename>
- <XPos>0</XPos>
- <YPos>178</YPos>
- <SelStart>7138</SelStart>
- <SelEnd>7138</SelEnd>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename>
- <XPos>0</XPos>
- <YPos>17</YPos>
- <SelStart>1072</SelStart>
- <SelEnd>1072</SelEnd>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c</Filename>
- <XPos>0</XPos>
- <YPos>58</YPos>
- <SelStart>2678</SelStart>
- <SelEnd>2701</SelEnd>
- </Tab>
- <ActiveTab>3</ActiveTab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c</Filename>
- <XPos>0</XPos>
- <YPos>92</YPos>
- <SelStart>2663</SelStart>
- <SelEnd>2663</SelEnd>
- </Tab>
- </Pane>
- <ActivePane>0</ActivePane>
- <Sizes>
- <Pane>
- <X>1000000</X>
- <Y>1000000</Y>
- </Pane>
- </Sizes>
- <SplitMode>1</SplitMode>
- </Editor>
+
+
+
+
+ <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c</Filename><XPos>0</XPos><YPos>74</YPos><SelStart>3772</SelStart><SelEnd>3772</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c</Filename><XPos>0</XPos><YPos>45</YPos><SelStart>2969</SelStart><SelEnd>2976</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1734</YPos><SelStart>54344</SelStart><SelEnd>54344</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>63</YPos><SelStart>3004</SelStart><SelEnd>3004</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename><XPos>0</XPos><YPos>98</YPos><SelStart>4027</SelStart><SelEnd>4027</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_lowlevel.c</Filename><XPos>0</XPos><YPos>75</YPos><SelStart>3913</SelStart><SelEnd>3913</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_3.c</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>2980</SelStart><SelEnd>2980</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename><XPos>0</XPos><YPos>204</YPos><SelStart>7829</SelStart><SelEnd>7829</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename><XPos>0</XPos><YPos>5</YPos><SelStart>435</SelStart><SelEnd>435</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c</Filename><XPos>0</XPos><YPos>90</YPos><SelStart>4791</SelStart><SelEnd>4791</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\peripherals\pit\pit.c</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>3157</SelStart><SelEnd>3157</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board.h</Filename><XPos>0</XPos><YPos>186</YPos><SelStart>7460</SelStart><SelEnd>7467</SelEnd></Tab><ActiveTab>11</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c</Filename><XPos>0</XPos><YPos>79</YPos><SelStart>3123</SelStart><SelEnd>3132</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
- <Top>
- <Row0>
- <Sizes>
- <Toolbar-00aa9b70>
- <key>iaridepm.enu1</key>
- </Toolbar-00aa9b70>
- </Sizes>
- </Row0>
- <Row1>
- <Sizes>
- <Toolbar-044a32e0>
- <key>debuggergui.enu1</key>
- </Toolbar-044a32e0>
- </Sizes>
- </Row1>
- </Top>
- <Left>
- <Row0>
- <Sizes>
- <Wnd4>
- <Rect>
- <Top>-2</Top>
- <Left>-2</Left>
- <Bottom>716</Bottom>
- <Right>198</Right>
- <x>-2</x>
- <y>-2</y>
- <xscreen>200</xscreen>
- <yscreen>200</yscreen>
- <sizeHorzCX>119048</sizeHorzCX>
- <sizeHorzCY>203666</sizeHorzCY>
- <sizeVertCX>119048</sizeVertCX>
- <sizeVertCY>731161</sizeVertCY>
- </Rect>
- </Wnd4>
- </Sizes>
- </Row0>
- </Left>
- <Right>
- <Row0>
- <Sizes>
- <Wnd5>
- <Rect>
- <Top>-2</Top>
- <Left>-2</Left>
- <Bottom>716</Bottom>
- <Right>198</Right>
- <x>-2</x>
- <y>-2</y>
- <xscreen>200</xscreen>
- <yscreen>200</yscreen>
- <sizeHorzCX>119048</sizeHorzCX>
- <sizeHorzCY>203666</sizeHorzCY>
- <sizeVertCX>119048</sizeVertCX>
- <sizeVertCY>731161</sizeVertCY>
- </Rect>
- </Wnd5>
- </Sizes>
- </Row0>
- </Right>
- <Bottom>
- <Row0>
- <Sizes>
- <Wnd3>
- <Rect>
- <Top>-2</Top>
- <Left>-2</Left>
- <Bottom>198</Bottom>
- <Right>1682</Right>
- <x>-2</x>
- <y>-2</y>
- <xscreen>1684</xscreen>
- <yscreen>200</yscreen>
- <sizeHorzCX>1002381</sizeHorzCX>
- <sizeHorzCY>203666</sizeHorzCY>
- <sizeVertCX>119048</sizeVertCX>
- <sizeVertCY>203666</sizeVertCY>
- </Rect>
- </Wnd3>
- </Sizes>
- </Row0>
- </Bottom>
- <Float>
- <Sizes/>
- </Float>
- </Positions>
+
+
+
+
+
+ <Top><Row0><Sizes><Toolbar-00abb418><key>iaridepm.enu1</key></Toolbar-00abb418><Toolbar-026475b0><key>debuggergui.enu1</key></Toolbar-026475b0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>364</Right><x>-2</x><y>-2</y><xscreen>167</xscreen><yscreen>200</yscreen><sizeHorzCX>119286</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>261429</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>200</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119286</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Project>
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
index fadd9a787..903e2f92a 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
@@ -17,6 +17,10 @@ UseTrigger=1
TriggerName=main
LimitSize=0
ByteLimit=50
+[DebugChecksum]
+Checksum=-542088010
+[InstructionProfiling]
+Enabled=_ 0
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""
@@ -24,10 +28,15 @@ Category=_ 0
[TermIOLog]
LoggingEnabled=_ 0
LogFile=_ ""
+[DriverProfiling]
+Enabled=0
+Source=2
+Graph=0
[Disassemble mode]
mode=0
[Breakpoints]
-Count=0
+Bp0=_ "STD_CODE" "{C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c}.96.2@1" 1 0 0 0 "" 0 "" 0
+Count=1
[TraceHelper]
Enabled=0
ShowSource=1
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
index c4c832647..2b39a9685 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
+++ b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
@@ -3,7 +3,7 @@
<Workspace>
<ConfigDictionary>
- <CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe512_flash</Project></CurrentConfigs></ConfigDictionary>
+ <CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe512_sdram</Project></CurrentConfigs></ConfigDictionary>
<Desktop>
<Static>
<Workspace>
@@ -12,7 +12,7 @@
- <Column0>258</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
+ <Column0>242</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Build>
@@ -20,7 +20,7 @@
<ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build>
- <Debug-Log/><TerminalIO/></Static>
+ <Debug-Log><ColumnWidth0>18</ColumnWidth0><ColumnWidth1>1344</ColumnWidth1></Debug-Log><TerminalIO/></Static>
<Windows>
@@ -32,7 +32,7 @@
<Factory>Workspace</Factory>
<Session>
- <NodeDict><ExpandedNode>at91sam9xe-ek</ExpandedNode></NodeDict></Session>
+ <NodeDict><ExpandedNode>at91sam9xe-ek</ExpandedNode><ExpandedNode>at91sam9xe-ek/main.c</ExpandedNode><ExpandedNode>at91sam9xe-ek/scheduler_source</ExpandedNode></NodeDict></Session>
</Tab>
</Tabs>
@@ -52,14 +52,14 @@
- <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+ <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c</Filename><XPos>0</XPos><YPos>74</YPos><SelStart>3772</SelStart><SelEnd>3772</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c</Filename><XPos>0</XPos><YPos>45</YPos><SelStart>2969</SelStart><SelEnd>2976</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1734</YPos><SelStart>54344</SelStart><SelEnd>54344</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>63</YPos><SelStart>3004</SelStart><SelEnd>3004</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename><XPos>0</XPos><YPos>98</YPos><SelStart>4027</SelStart><SelEnd>4027</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_lowlevel.c</Filename><XPos>0</XPos><YPos>75</YPos><SelStart>3913</SelStart><SelEnd>3913</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_3.c</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>2980</SelStart><SelEnd>2980</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename><XPos>0</XPos><YPos>204</YPos><SelStart>7829</SelStart><SelEnd>7829</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename><XPos>0</XPos><YPos>5</YPos><SelStart>435</SelStart><SelEnd>435</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c</Filename><XPos>0</XPos><YPos>90</YPos><SelStart>4791</SelStart><SelEnd>4791</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\peripherals\pit\pit.c</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>3157</SelStart><SelEnd>3157</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board.h</Filename><XPos>0</XPos><YPos>186</YPos><SelStart>7460</SelStart><SelEnd>7467</SelEnd></Tab><ActiveTab>11</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c</Filename><XPos>0</XPos><YPos>79</YPos><SelStart>3123</SelStart><SelEnd>3132</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
- <Top><Row0><Sizes><Toolbar-00aa9b88><key>iaridepm.enu1</key></Toolbar-00aa9b88></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>332</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>238571</sizeVertCX><sizeVertCY>604888</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>346</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>348</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>354379</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+ <Top><Row0><Sizes><Toolbar-00abb418><key>iaridepm.enu1</key></Toolbar-00abb418></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>332</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>238571</sizeVertCX><sizeVertCY>604888</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>346</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>348</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>354379</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>