git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9920 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 5 insertions, 9 deletions

diff --git a/demos/XMC/RT-XMC1100-XMC_2GO/debug/RT-XMC1100-XMC_2GO (Segger JLink, Flash and Run).launch b/demos/XMC/RT-XMC1100-XMC_2GO/debug/RT-XMC1100-XMC_2GO (Segger JLink, Flash and Run).launch
index bfb591209..f5777583b 100644
--- a/demos/XMC/RT-XMC1100-XMC_2GO/debug/RT-XMC1100-XMC_2GO (Segger JLink, Flash and Run).launch
+++ b/demos/XMC/RT-XMC1100-XMC_2GO/debug/RT-XMC1100-XMC_2GO (Segger JLink, Flash and Run).launch
@@ -17,7 +17,7 @@
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>

 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>

 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>

-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>

+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="SysTick_Handler"/>

 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value=""/>

 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value=""/>

 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>

@@ -33,7 +33,7 @@
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>

 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>

 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>

-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;null-_thread_memfill-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;null-Reset_Handler-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;MSP-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;PSP-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r0-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;xpsr-(format)&quot; val=&quot;2&quot;/&gt;&lt;content id=&quot;msp-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;psp-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>

+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;PSP-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;MSP-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;null-Reset_Handler-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;null-_thread_memfill-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r0-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;xpsr-(format)&quot; val=&quot;2&quot;/&gt;&lt;content id=&quot;msp-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;psp-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>

 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>

 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList&gt;&#13;&#10;&lt;memoryBlockExpressionItem&gt;&#13;&#10;&lt;expression text=&quot;0x20000000&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionItem&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>

 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>

diff --git a/demos/XMC/RT-XMC1100-XMC_2GO/main.c b/demos/XMC/RT-XMC1100-XMC_2GO/main.c
index 71d44bca6..b16797d18 100644
--- a/demos/XMC/RT-XMC1100-XMC_2GO/main.c
+++ b/demos/XMC/RT-XMC1100-XMC_2GO/main.c
@@ -20,10 +20,6 @@
 #define SYSTEM_CLOCK 8000000U

 #endif

 

-void __early_init(void) {

-

-  ;

-}

 /*

  * @brief   System Timer handler.

  */

@@ -68,7 +64,7 @@ int main(void) {
    */

   SysTick->LOAD = SYSTEM_CLOCK / CH_CFG_ST_FREQUENCY - (systime_t)1;

   SysTick->VAL = (uint32_t)0;

-  SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk | SysTick_CTRL_ENABLE_Msk |

+  SysTick->CTRL = SysTick_CTRL_ENABLE_Msk | SysTick_CTRL_CLKSOURCE_Msk |

                   SysTick_CTRL_TICKINT_Msk;

 

   /*

@@ -81,14 +77,14 @@ int main(void) {
   /*

    * Creates the example thread.

    */

-  (void) chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

+   chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

 

   /*

    * Normal main() thread activity, in this demo it does nothing except

    * increasing the minutes counter.

    */

   while (true) {

-    chThdSleepSeconds(60);

+    chThdSleepSeconds(2);

     minutes_counter++;

   }

 }