]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merge with prev. default
authortojo <devnull@localhost>
Fri, 20 Nov 2009 14:48:14 +0000 (15:48 +0100)
committertojo <devnull@localhost>
Fri, 20 Nov 2009 14:48:14 +0000 (15:48 +0100)
1  2 
examples/blinker_node/config/Os_Cfg.c
examples/pwm_node/config/Os_Cfg.c
examples/pwm_node2/config/Os_Cfg.c
examples/simple/config/Os_Cfg.c
examples/switch_node/config/Os_Cfg.c
examples/tiny/config/Os_Cfg.c
examples/tiny/config/Os_Cfg.h
include/Os.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index e63e7c18c8d615401588c0675c74d99b0376d310,8dcf1bc154e9bbc2afa49674fdd4736f31de25da..01fe2b37a42e0c82a9fc263748025baff6e910d6
@@@ -115,8 -112,8 +114,8 @@@ CounterType Os_Arc_OsTickCounter = COUN
  #define ALARM_USE\r
  \r
  GEN_ALARM_HEAD {\r
-       GEN_ALARM(      0,"Alarm1",COUNTER_ID_OsTick,\r
-                               1,100,10,0,             /*active,start,cycle,app_mask */\r
 -      GEN_ALARM(      0,"Alarm_4ms",OS_TICK_COUNTER,\r
++      GEN_ALARM(      0,"Alarm_4ms",COUNTER_ID_OsTick,\r
+                               1,100,2,0,              /*active,start,cycle,app_mask */\r
                                ALARM_ACTION_SETEVENT, TASK_ID_etask_1, 2, 0 ),\r
  };\r
  \r
index 899d959131a405f51637ee31233e7525cc9e7eb8,584b1982dc720708d32e90862456cae205f94674..5ef9b45e48b1ace23b7f01a1946622e0a24edf71
@@@ -46,12 -46,19 +46,18 @@@ void btask_3( void )
  \r
  //#define TASK_ID_os_tick                                     8\r
  \r
 -\r
 -// OS_TICK_COUNTER located in Os.h\r
 +#define COUNTER_ID_OsTick                             0
  \r
  // NOT GENERATED( for test system only )\r
- #define SYSTEM_COUNTER_PERIOD                         100\r
+ #define SYSTEM_COUNTER_PERIOD                         100
+ #define OS_TICK_DURATION_IN_US                                2000\r
+ #if defined(USE_SIMPLE_PRINTF)\r
+ #define PRIO_STACK_SIZE                                               600
+ #else
+ #define PRIO_STACK_SIZE                                               200
+ #endif
  \r
- #define PRIO_STACK_SIZE                                               200\r
  #define OS_INTERRUPT_STACK_SIZE                               200\r
  \r
  // Just define them if you want to use them.\r
diff --cc include/Os.h
Simple merge