From: bernie Date: Sat, 29 Sep 2007 16:19:47 +0000 (+0000) Subject: Changes to compile with sparse. X-Git-Tag: 1.0.0~427 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=8c4f04bc9071d6d5c9fa55fe097cbff72325f5e9;p=bertos.git Changes to compile with sparse. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@814 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/cfg/cpu.h b/cfg/cpu.h index 66ae5d73..23d0ddf1 100755 --- a/cfg/cpu.h +++ b/cfg/cpu.h @@ -8,78 +8,10 @@ * * \brief CPU-specific definitions * - * \version $Id$ - * * \author Giovanni Bajo * \author Bernardo Innocenti * \author Stefano Fedrigo */ - -/*#* - *#* $Log$ - *#* Revision 1.15 2006/07/19 12:56:25 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.14 2006/07/19 12:54:12 bernie - *#* Documentation fixes. - *#* - *#* Revision 1.13 2006/03/27 04:49:23 bernie - *#* CPU_IDLE(): Fix for new emulator. - *#* - *#* Revision 1.12 2006/03/21 10:52:39 bernie - *#* Update ARM support. - *#* - *#* Revision 1.11 2006/03/20 17:49:00 bernie - *#* Spacing fix. - *#* - *#* Revision 1.10 2006/02/24 01:17:30 bernie - *#* CPU_SAVED_REGS_CNT: Declare for x86/x86_64. - *#* - *#* Revision 1.9 2006/02/23 09:08:43 bernie - *#* Add note for a frequently reported non-bug. - *#* - *#* Revision 1.8 2006/02/10 12:37:45 bernie - *#* Add support for ARM on IAR. - *#* - *#* Revision 1.7 2005/11/27 03:04:38 bernie - *#* Add POSIX emulation for IRQ_* macros; Add Qt support. - *#* - *#* Revision 1.6 2005/07/19 07:26:49 bernie - *#* Add missing #endif. - *#* - *#* Revision 1.5 2005/06/27 21:24:17 bernie - *#* CPU_CSOURCE(): New macro. - *#* - *#* Revision 1.4 2005/06/14 06:15:10 bernie - *#* Add X86_64 support. - *#* - *#* Revision 1.3 2005/04/12 04:06:17 bernie - *#* Catch missing CPU earlier. - *#* - *#* Revision 1.2 2005/04/11 19:10:27 bernie - *#* Include top-level headers from cfg/ subdir. - *#* - *#* Revision 1.1 2005/04/11 19:04:13 bernie - *#* Move top-level headers to cfg/ subdir. - *#* - *#* Revision 1.30 2005/03/15 00:20:09 bernie - *#* BREAKPOINT, IRQ_RUNNING(), IRQ_GETSTATE(): New DSP56K macros. - *#* - *#* Revision 1.29 2005/02/16 20:33:24 bernie - *#* Preliminary PPC support. - *#* - *#* Revision 1.28 2004/12/31 17:39:41 bernie - *#* Fix documentation. - *#* - *#* Revision 1.27 2004/12/31 17:02:47 bernie - *#* IRQ_SAVE_DISABLE(), IRQ_RESTORE(): Add null stubs for x86. - *#* - *#* Revision 1.26 2004/12/13 12:08:12 bernie - *#* DISABLE_IRQSAVE, ENABLE_IRQRESTORE, DISABLE_INTS, ENABLE_INTS: Remove obsolete macros. - *#* - *#* Revision 1.25 2004/12/08 08:31:02 bernie - *#* CPU_HARVARD: Define to 1 for AVR and DSP56K. - *#*/ #ifndef DEVLIB_CPU_H #define DEVLIB_CPU_H @@ -256,8 +188,8 @@ asm volatile ( \ "mrs r0, cpsr\n\t" \ "mov %0, r0" \ - : "=r" (sreg) - : /* no inputs */ + : "=r" (sreg) \ + : /* no inputs */ \ : "r0" \ ); \ (bool)(sreg & 0xb0); \ diff --git a/cfg/cpu_detect.h b/cfg/cpu_detect.h index 3af28a1e..a2248cf7 100755 --- a/cfg/cpu_detect.h +++ b/cfg/cpu_detect.h @@ -7,48 +7,16 @@ * --> * * \brief CPU detection through special preprocessor macros - * */ - -/*#* - *#* $Log$ - *#* Revision 1.6 2007/06/07 14:42:54 batt - *#* Merge from project_ks. - *#* - *#* Revision 1.5 2007/01/27 20:48:36 batt - *#* Add support for ATMEGA1281. - *#* - *#* Revision 1.4 2006/07/19 12:56:25 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.3 2006/02/10 12:37:37 bernie - *#* Add support for ARM on IAR. - *#* - *#* Revision 1.2 2005/06/14 06:15:10 bernie - *#* Add X86_64 support. - *#* - *#* Revision 1.1 2005/04/11 19:04:13 bernie - *#* Move top-level headers to cfg/ subdir. - *#* - *#* Revision 1.4 2005/02/16 20:33:24 bernie - *#* Preliminary PPC support. - *#* - *#* Revision 1.3 2004/12/31 17:39:26 bernie - *#* Use C89 comments only. - *#* - *#* Revision 1.2 2004/08/25 14:12:08 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* Revision 1.1 2004/07/30 17:14:49 rasky - *#* File sfuggito al commit precedente (nuova gestione unificata del detect della CPU - *#* - *#* Revision 1.2 2004/07/30 10:31:07 rasky - *#* Aggiunto detect per ATmega128 - *#*/ - #ifndef CPU_DETECT_H #define CPU_DETECT_H +/* sparse? */ +#ifdef __CHECKER__ + /* Any random CPU will do */ + #define __arm__ +#endif + #if defined(__arm__) /* GCC */ \ || defined(__ARM4TM__) /* IAR: defined for all cores >= 4tm */ #define CPU_ARM 1 diff --git a/cfg/os.h b/cfg/os.h index 249a947a..41ce8a53 100755 --- a/cfg/os.h +++ b/cfg/os.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.11 2007/09/29 16:19:47 bernie + *#* Changes to compile with sparse. + *#* *#* Revision 1.10 2006/07/19 12:56:25 bernie *#* Convert to new Doxygen style. *#* @@ -150,7 +153,7 @@ * Summarize hosted environments as OS_HOSTED and embedded * environment with OS_EMBEDDED. */ -#if OS_WIN32 || OS_UNIX || OS_DARWIN +#if OS_WIN32 || OS_UNIX || OS_DARWIN || OS_QT #define OS_HOSTED 1 #define OS_EMBEDDED 0 #else diff --git a/os/hptime.h b/os/hptime.h index 99b66339..9d9336ed 100755 --- a/os/hptime.h +++ b/os/hptime.h @@ -7,12 +7,17 @@ * * \brief Portable abstraction for high-resolution time handling (interface) * - * \version $Id$ * \author Bernardo Innocenti */ #ifndef HPTIME_H #define HPTIME_H +/* sparse? */ +#ifdef __CHECKER__ + /* Any random OS would do */ + #define __unix__ +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */