From: eija <devnull@localhost>
Date: Mon, 10 Jan 2011 13:27:28 +0000 (+0100)
Subject: Merged in from default
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/62fd82aacca1265b6975f84362426f4fe4deb5f2

Merged in from default
---

62fd82aacca1265b6975f84362426f4fe4deb5f2
diff --cc include/Compiler.h
index e8de0ebe,1195dde4..fd64a909
--- a/include/Compiler.h
+++ b/include/Compiler.h
@@@ -27,9 -27,11 +27,11 @@@
  
  /* REQ:COMPILER040,049,051 */
  #define AUTOMATIC
 -#define _STATIC_ 	static
 +#define STATIC 	static
  #define NULL_PTR	((void *)0)
  
+ #define CC_EXTENSION 	__extension__
+ 
  /* REQ:COMPILER005 */
  /* TODO: skip the memclass for now */
  #define FUNC(rettype,memclass) rettype
diff --cc include/Os.h
index a427beb4,ef9c3e10..bc82f74e
--- a/include/Os.h
+++ b/include/Os.h
@@@ -28,33 -28,6 +28,32 @@@
  #include "MemMap.h"
  #include "Cpu.h"
  
 +typedef uint8 StatusType;
 +
 +#define E_OS_ACCESS (StatusType)1               /**< STD OSEK */
 +#define	E_OS_CALLEVEL (StatusType)2             /**< STD OSEK */
 +#define	E_OS_ID	(StatusType)3                   /**< STD OSEK */
 +#define	E_OS_LIMIT (StatusType)4                /**< STD OSEK */
 +#define	E_OS_NOFUNC (StatusType)5               /**< STD OSEK */
 +#define	E_OS_RESOURCE (StatusType)6             /**< STD OSEK */
 +#define	E_OS_STATE (StatusType)7                /**< STD OSEK */
 +#define	E_OS_VALUE (StatusType)8                /**< STD OSEK */
 +
 +#define	E_OS_SERVICEID (StatusType)9                /**< AUTOSAR, see 7.10 */
 +#define	E_OS_RATE (StatusType)10                    /**< AUTOSAR, see 7.10 */
 +#define	E_OS_ILLEGAL_ADDRESS (StatusType)11         /**< AUTOSAR, see 7.10 */
 +#define	E_OS_MISSINGEND (StatusType)12              /**< AUTOSAR, see 7.10 */
 +#define	E_OS_DISABLEDINT (StatusType)13             /**< AUTOSAR, see 7.10 */
 +#define	E_OS_STACKFAULT (StatusType)14              /**< AUTOSAR, see 7.10 */
 +#define	E_OS_PROTECTION_MEMORY (StatusType)15       /**< AUTOSAR, see 7.10 */
 +#define	E_OS_PROTECTION_TIME (StatusType)16         /**< AUTOSAR, see 7.10 */
 +#define	E_OS_PROTECTION_LOCKED (StatusType)17       /**< AUTOSAR, see 7.10 */
 +#define	E_OS_PROTECTION_EXCEPTION (StatusType)18    /**< AUTOSAR, see 7.10 */
 +#define	E_OS_PROTECTION_RATE (StatusType)19          /**< AUTOSAR, see 7.10 */
 +
- #define E_COM_ID 255
- #warning "var ska E_COM_ID vara?"
++#define E_COM_ID 255 // TODO: var ska E_COM_ID vara?"
 +
 +
  typedef uint32_t 		EventMaskType;
  typedef EventMaskType *	EventMaskRefType;
  typedef uint16_t 		TaskType;
diff --cc scripts/rules.mk
index 60e038f1,66287053..d4126d76
--- a/scripts/rules.mk
+++ b/scripts/rules.mk
@@@ -158,10 -144,7 +159,10 @@@ endi
  
  ifneq ($(SPLINT),)
  define run_splint
 -$(Q)$(SPLINT) $(splint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<)
 +$(if 
 +$(filter $(dir $(abspath $<)),$(LINT_NICE_EXCLUDE_PATHS)),
 +$(info $(abspath $<):0:0: Info: Not running lint check on $(abspath $<)),
- $(Q)$(SPLINT) $(lint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<))
++$(Q)$(SPLINT) $(splint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<))
  endef
  endif