Merged in from default

diff --cc boards/board_common.mk
Simple merge

diff --cc 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 --cc 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

diff --cc include/debug.h
Simple merge

diff --cc scripts/rules.mk
index 60e038f12ca7ed449ae6b9bc0d834798c27d9d14,66287053bd655d7696e6638492fb108b78f369c1..d4126d763233676ed264e2ffbad95d8700b5fc12
--- 1/scripts/rules.mk
--- 2/scripts/rules.mk
+++ b/scripts/rules.mk
@@@ -158,10 -144,7 +159,10 @@@ endi
  \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

diff --cc system/kernel/include/alarm_i.h
Simple merge