git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@108 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 45 insertions, 59 deletions

diff --git a/demos/ARM7-LPC214x-GCC-minimal/chcore2.s b/demos/ARM7-LPC214x-GCC-minimal/chcore2.s
index f8906d022..4df7c70ed 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/chcore2.s
+++ b/demos/ARM7-LPC214x-GCC-minimal/chcore2.s
@@ -166,7 +166,7 @@ T0IrqHandler:
         b       IrqCommon

 #endif

 

-/*

+#if 0

 .globl UART0IrqHandler

 UART0IrqHandler:

         sub     lr, lr, #4

@@ -182,7 +182,9 @@ UART0IrqHandler:
         bl      UART0Irq

         b       IrqCommon

 #endif

+#endif

 

+#if 0

 .globl UART1IrqHandler

 UART1IrqHandler:

         sub     lr, lr, #4

@@ -198,7 +200,7 @@ UART1IrqHandler:
         bl      UART1Irq

         b       IrqCommon

 #endif

-*/

+#endif

 

 /*

  * Common exit point for all IRQ routines, it performs the rescheduling if

diff --git a/docs/Doxyfile b/docs/Doxyfile
index 7afe11834..2c9999f94 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = ChibiOS/RT
-PROJECT_NUMBER         = "0.4.1 beta"
+PROJECT_NUMBER         = "0.4.2 beta"
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -26,7 +26,7 @@ ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = NO
 STRIP_FROM_PATH        = "C:/Documents and Settings/Administrator/"
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
@@ -34,7 +34,7 @@ DETAILS_AT_TOP         = YES
 INHERIT_DOCS           = NO
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
-ALIASES                = 
+ALIASES                =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 BUILTIN_STL_SUPPORT    = NO
@@ -64,11 +64,11 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = NO
 SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -78,7 +78,7 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
@@ -115,15 +115,15 @@ FILE_PATTERNS          = *.c \
                          *.py \
                          *.ddf
 RECURSIVE              = YES
-EXCLUDE                = 
+EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
+EXCLUDE_PATTERNS       =
+EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = ./img
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
@@ -141,20 +141,20 @@ VERBATIM_HEADERS       = NO
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
@@ -171,8 +171,8 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
@@ -184,8 +184,8 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -198,8 +198,8 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
+XML_SCHEMA             =
+XML_DTD                =
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
@@ -211,16 +211,16 @@ GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
 PREDEFINED             = __JUST_STUBS__ \
                          __DOXIGEN__ \
                          CH_USE_VIRTUAL_TIMERS \
@@ -245,18 +245,18 @@ PREDEFINED             = __JUST_STUBS__ \
                          CH_USE_MESSAGES_EVENT \
                          CH_USE_SEMSW \
                          CH_USE_DEBUG
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
+TAGFILES               =
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = NO
 HIDE_UNDOC_RELATIONS   = YES
@@ -273,8 +273,8 @@ CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
+DOT_PATH               =
+DOTFILE_DIRS           =
 MAX_DOT_GRAPH_WIDTH    = 1024
 MAX_DOT_GRAPH_HEIGHT   = 1024
 MAX_DOT_GRAPH_DEPTH    = 1000
@@ -283,6 +283,6 @@ DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
+# Configuration::additions related to the search engine
 #---------------------------------------------------------------------------
 SEARCHENGINE           = NO
diff --git a/src/chschd.c b/src/chschd.c
index 65a1fd360..c93b6aab7 100644
--- a/src/chschd.c
+++ b/src/chschd.c
@@ -183,9 +183,7 @@ BOOL chSchRescRequiredI(void) {
  */

 void chSchTimerHandlerI(void) {

 

-  if (rlist.r_preempt)

-    rlist.r_preempt--;

-

+  rlist.r_preempt--;

 #ifdef CH_USE_SYSTEMTIME

   rlist.r_stime++;

 #endif

diff --git a/src/include/scheduler.h b/src/include/scheduler.h
index bb70a83af..4aed76e28 100644
--- a/src/include/scheduler.h
+++ b/src/include/scheduler.h
@@ -38,14 +38,14 @@
  * Ready list header.

  */

 typedef struct {

-  ThreadsQueue  r_queue;

-  t_prio        r_prio;

-  t_cnt         r_preempt;

+  ThreadsQueue          r_queue;

+  t_prio                r_prio;

+  t_cnt                 r_preempt;

 #ifndef CH_CURRP_REGISTER_CACHE

-  Thread        *r_current;

+  Thread                *r_current;

 #endif

 #ifdef CH_USE_SYSTEMTIME

-  volatile t_time r_stime;

+  volatile t_time       r_stime;

 #endif

 } ReadyList;

 

@@ -69,26 +69,12 @@ extern "C" {
 }

 #endif

 

-/**

- * Current thread pointer.

- * @note Dont use this directly but use the \p chThdSelf()

- *       instead. Direct use of system global variables is discouraged because

- *       portability reasons.

- */

 #ifdef CH_CURRP_REGISTER_CACHE

 register Thread *currp asm(CH_CURRP_REGISTER_CACHE);

 #else

 #define currp rlist.r_current

 #endif

 

-/**

- * System ticks counter.

- * @note Dont use this directly but use the \p chSysGetTime()

- *       instead. Direct use of system global variables is discouraged because

- *       portability reasons.

- */

-extern volatile t_time stime;

-

 #endif /* _SCHEDULER_H_ */

 

 /** @} */