Merged in from default

diff --combined boards/board_common.mk
index fb44da31da3d0c4653f32379f978c0fe5bcf23a8,5d0ec7edfea9bcfe05dda9a8d1b63a2a1c820dbe..738837f7b44d4c2213a4a16f87eaa37b14285636
--- 1/boards/board_common.mk
--- 2/boards/board_common.mk
+++ b/boards/board_common.mk
@@@ -10,7 -10,7 +10,7 @@@ obj-$(CFG_ARM_CM3) += startup_stm32f10x
  #stm32 lib files needed by drivers\r
  obj-$(CFG_ARM_CM3) += stm32f10x_rcc.o\r
  obj-$(CFG_ARM_CM3)-$(USE_CAN) += stm32f10x_can.o\r
- obj-$(CFG_ARM_CM3)-$(USE_DIO) += stm32f10x_gpio.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_PORT) += stm32f10x_gpio.o\r
  obj-$(CFG_ARM_CM3)-$(USE_ADC) += stm32f10x_adc.o\r
  obj-$(CFG_ARM_CM3)-$(USE_ADC) += stm32f10x_dma.o\r
  obj-$(CFG_ARM_CM3)-$(USE_FLS) += stm32f10x_flash.o\r
@@@ -176,7 -176,9 +176,7 @@@ obj-$(USE_COM) += Com_PbCfg.
  obj-$(USE_COM) += Com_Com.o\r
  obj-$(USE_COM) += Com_Sched.o\r
  obj-$(USE_COM) += Com.o\r
 -obj-$(USE_COM) += Com_RunTest.o\r
  obj-$(USE_COM) += Com_misc.o\r
 -#obj-$(USE_COM) += Com_TestData.o\r
  inc-$(USE_PDUR) += $(ROOTDIR)/communication/Com\r
  inc-$(USE_COM) += $(ROOTDIR)/communication/Com\r
  vpath-$(USE_COM) += $(ROOTDIR)/communication/Com\r

diff --combined include/Compiler.h
index e8de0ebe9f7ef6987f6cb33742c3aa5a31c7d7ef,1195dde436c82fcbb4b81f9dda269cfc488b68ca..fd64a909abe65ceb4b95b67929d35102e8f4e983
--- 1/include/Compiler.h
--- 2/include/Compiler.h
+++ b/include/Compiler.h
@@@ -27,9 -27,11 +27,11 @@@
  \r
  /* REQ:COMPILER040,049,051 */\r
  #define AUTOMATIC\r
 -#define _STATIC_      static\r
 +#define STATIC        static\r
  #define NULL_PTR      ((void *)0)\r
  \r
+ #define CC_EXTENSION  __extension__\r
+ \r
  /* REQ:COMPILER005 */\r
  /* TODO: skip the memclass for now */\r
  #define FUNC(rettype,memclass) rettype\r

diff --combined include/Os.h
index a427beb4615dc518b7ef954ecd94b588542d487a,ef9c3e109f94d0aec6214a678d4953fb89520453..bc82f74e7128a177e572079df8882a92bf0f0c34
--- 1/include/Os.h
--- 2/include/Os.h
+++ b/include/Os.h
@@@ -28,33 -28,6 +28,32 @@@
  #include "MemMap.h"\r
  #include "Cpu.h"\r
  \r
- #define E_COM_ID 255\r
- #warning "var ska E_COM_ID vara?"\r
 +typedef uint8 StatusType;\r
 +\r
 +#define E_OS_ACCESS (StatusType)1               /**< STD OSEK */\r
 +#define       E_OS_CALLEVEL (StatusType)2             /**< STD OSEK */\r
 +#define       E_OS_ID (StatusType)3                   /**< STD OSEK */\r
 +#define       E_OS_LIMIT (StatusType)4                /**< STD OSEK */\r
 +#define       E_OS_NOFUNC (StatusType)5               /**< STD OSEK */\r
 +#define       E_OS_RESOURCE (StatusType)6             /**< STD OSEK */\r
 +#define       E_OS_STATE (StatusType)7                /**< STD OSEK */\r
 +#define       E_OS_VALUE (StatusType)8                /**< STD OSEK */\r
 +\r
 +#define       E_OS_SERVICEID (StatusType)9                /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_RATE (StatusType)10                    /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_ILLEGAL_ADDRESS (StatusType)11         /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_MISSINGEND (StatusType)12              /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_DISABLEDINT (StatusType)13             /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_STACKFAULT (StatusType)14              /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_PROTECTION_MEMORY (StatusType)15       /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_PROTECTION_TIME (StatusType)16         /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_PROTECTION_LOCKED (StatusType)17       /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_PROTECTION_EXCEPTION (StatusType)18    /**< AUTOSAR, see 7.10 */\r
 +#define       E_OS_PROTECTION_RATE (StatusType)19          /**< AUTOSAR, see 7.10 */\r
 +\r
++#define E_COM_ID 255 // TODO: var ska E_COM_ID vara?"\r
 +\r
 +\r
  typedef uint32_t              EventMaskType;\r
  typedef EventMaskType *       EventMaskRefType;\r
  typedef uint16_t              TaskType;\r
@@@ -64,7 -37,7 +63,7 @@@ typedef enum 
        TASK_STATE_WAITING,\r
        TASK_STATE_READY,\r
        TASK_STATE_SUSPENDED,\r
 -      TASK_STATE_RUNNING,\r
 +      TASK_STATE_RUNNING\r
  } TaskStateType;\r
  \r
  #define INVALID_TASK  0xdeadU\r
@@@ -377,7 -350,7 +376,7 @@@ typedef enum 
      OSServiceId_PostTaskHook,\r
      OSServiceId_StartupHook,\r
      OSServiceId_ShutdownHook,\r
 -    OSServiceId_GetTaskState,\r
 +    OSServiceId_GetTaskState\r
  } OsServiceIdType;\r
  \r
  typedef struct OsError {\r

diff --combined include/debug.h
index 5f6e6a70bc9ede8bda55e5a549a9d405eeec7329,d775035dd91aeaf94abf19f468207f7f973ea221..0542bf815bcd30a1937488633c1b23e651fd5d09
--- 1/include/debug.h
--- 2/include/debug.h
+++ b/include/debug.h
@@@ -14,13 -14,11 +14,13 @@@
   * -------------------------------- Arctic Core ------------------------------*/\r
  \r
  \r
 +// PC-Lint Exception to MISRA rule 19.12: stdio ok in debug.h.\r
 +//lint -e(829)\r
 +\r
  \r
  #ifndef DEBUG_H_\r
  #define DEBUG_H_\r
  \r
 -\r
  /**\r
   *\r
   * NOTE!!!!\r
@@@ -47,7 -45,7 +47,7 @@@
   *   TODO:\r
   *\r
   */\r
- // PC\r
+ \r
  #include <stdio.h>\r
  \r
  #define DEBUG_LOW             1\r
@@@ -75,9 -73,11 +75,11 @@@
  #endif\r
  \r
  #if defined(USE_LDEBUG_PRINTF)\r
- #define LDEBUG_PRINTF(format,...) printf(format,## __VA_ARGS__ )\r
+ #define LDEBUG_PRINTF(format,...)     printf(format,## __VA_ARGS__ )\r
+ #define LDEBUG_FPUTS(_str)                    fputs((_str),stdout)\r
  #else\r
  #define LDEBUG_PRINTF(format,...)\r
+ #define LDEBUG_FPUTS(_str)\r
  #endif\r
  \r
  \r

diff --combined scripts/rules.mk
index 60e038f12ca7ed449ae6b9bc0d834798c27d9d14,66287053bd655d7696e6638492fb108b78f369c1..d4126d763233676ed264e2ffbad95d8700b5fc12
--- 1/scripts/rules.mk
--- 2/scripts/rules.mk
+++ b/scripts/rules.mk
@@@ -99,6 -99,7 +99,7 @@@ endi
  \r
  inc-y += $(ROOTDIR)/include\r
  inc-y += $(ROOTDIR)/include/$(ARCH_FAM)\r
+ inc-y += $(ROOTDIR)/include/$(ARCH_FAM)/$(ARCH)\r
  \r
  \r
  .PHONY clean: \r
@@@ -135,33 -136,15 +136,33 @@@ inc-y += ../includ
  # Some dependency for xxx_offset.c/h also\r
  -include $(subst .h,.d,$(dep-y))\r
  \r
 +#LINT:\r
 +LINT_EXCLUDE_PATHS := $(abspath $(LINT_EXCLUDE_PATHS))\r
 +$(info $(LINT_EXCLUDE_PATHS))\r
 +\r
 +LINT_BAD_EXCLUDE_PATHS := $(filter %/,$(LINT_EXCLUDE_PATHS))\r
 +ifneq ($(LINT_BAD_EXCLUDE_PATHS),)\r
 +$(warning LINT_EXCLUDE_PATHS entries must not end in '/'. Ignoring $(LINT_BAD_EXCLUDE_PATHS))\r
 +endif\r
 +\r
 +LINT_NICE_EXCLUDE_PATHS := $(filter-out %/,$(LINT_EXCLUDE_PATHS))\r
 +LINT_NICE_EXCLUDE_PATHS := $(foreach path,$(LINT_NICE_EXCLUDE_PATHS),$(path)/)\r
 +\r
  ifneq ($(PCLINT),)\r
  define run_pclint\r
 -$(Q)$(PCLINT) $(lint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<)\r
 +$(if \r
 +$(filter $(dir $(abspath $<)),$(LINT_NICE_EXCLUDE_PATHS)),\r
 +$(info $(abspath $<):0:0: Info: Not running lint check on $(abspath $<)),\r
 +$(Q)$(PCLINT) $(lint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<))\r
  endef\r
  endif\r
  \r
  ifneq ($(SPLINT),)\r
  define run_splint\r
 -$(Q)$(SPLINT) $(splint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<)\r
 +$(if \r
 +$(filter $(dir $(abspath $<)),$(LINT_NICE_EXCLUDE_PATHS)),\r
 +$(info $(abspath $<):0:0: Info: Not running lint check on $(abspath $<)),\r
- $(Q)$(SPLINT) $(lint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<))\r
++$(Q)$(SPLINT) $(splint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<))\r
  endef\r
  endif\r
  \r
@@@ -169,9 -152,7 +170,9 @@@
  # Compile\r
  %.o: %.c\r
        @echo "  >> CC $(notdir $<)"\r
 +# compile\r
        $(Q)$(CC) -c $(CFLAGS) -o $(goal) $(addprefix -I ,$(inc-y)) $(addprefix -D,$(def-y)) $(abspath $<)\r
 +# run lint if enabled\r
        $(run_pclint)\r
        $(run_splint)\r
  \r
@@@ -195,7 -176,7 +196,7 @@@ inc-y += $(ROOTDIR)/boards/$(BOARDDIR
  # Preprocess linker files..\r
  %.ldp: %.ldf\r
        @echo "  >> CPP $<"\r
-       $(Q)$(CPP) -E -P -x assembler-with-cpp -o $@ $(addprefix -I ,$(inc-y)) $<\r
+       $(Q)$(CPP) -E -P -x assembler-with-cpp -o $@ $(addprefix -I ,$(inc-y)) $(addprefix -D,$(def-y)) $<\r
  \r
  #     @cat $@ \r
        \r
@@@ -226,7 -207,7 +227,7 @@@ ifeq ($(CROSS_COMPILE),
        $(Q)$(CC) $(LDFLAGS) -o $@ $(libpath-y) $(obj-y) $(lib-y) $(libitem-y)  \r
  else  \r
        $(Q)$(LD) $(LDFLAGS) -T $(ldcmdfile-y) -o $@ $(libpath-y) --start-group $(obj-y) $(lib-y) $(libitem-y) --end-group $(LDMAPFILE)\r
 -ifdef CFG_HC1X\r
 +ifdef CFG_MC912DG128A\r
        @$(CROSS_COMPILE)objdump -h $@ | gawk -f $(ROOTDIR)/scripts/hc1x_memory.awk\r
  else\r
        @echo "Image size: (decimal)"\r

diff --combined system/kernel/include/alarm_i.h
index aa64c1dd6a0efe641f2624a75df407b366c12d8c,6d91ad6accccb9f27d738380a16a838a8e405ed2..87a8f91f1a0b665facf13d8114d87d0a4e30df53
--- 1/system/kernel/include/alarm_i.h
--- 2/system/kernel/include/alarm_i.h
+++ b/system/kernel/include/alarm_i.h
@@@ -42,7 -42,7 +42,7 @@@ typedef enum alarm_action_type_e 
        ALARM_ACTION_ACTIVATETASK=0,\r
        ALARM_ACTION_SETEVENT,\r
        ALARM_ACTION_ALARMCALLBACK,             /* Only class 1 */\r
 -      ALARM_ACTION_INCREMENTCOUNTER, /* SWS OS302 */\r
 +      ALARM_ACTION_INCREMENTCOUNTER/* SWS OS302 */\r
  } alarm_action_type_t;\r
  \r
  \r
@@@ -64,7 -64,7 +64,7 @@@ enum OsAlarmAutostartTypeType 
        // Start with SetAbsAlarm()\r
        ALARM_AUTOSTART_ABSOLUTE,\r
        // Start with SetRelAlarm()\r
 -      ALARM_AUTOSTART_RELATIVE,\r
 +      ALARM_AUTOSTART_RELATIVE\r
  };\r
  \r
  \r
@@@ -122,5 -122,6 +122,6 @@@ typedef struct OsAlarm 
  \r
  \r
  void Os_AlarmCheck(OsCounterType *c_p);\r
+ void Os_AlarmAutostart(void);\r
  \r
  #endif /*ALARM_I_H_*/\r