From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 18 Apr 2011 22:32:01 +0000 (+0200)
Subject: Merge branch 'master' into benesp16
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/frsh-forb.git/commitdiff_plain/b2cbb5b8ebb8d8b5a17bfc4af6e9d1c438e33f6c

Merge branch 'master' into benesp16

Conflicts:
	build/rtems/config.target
---

b2cbb5b8ebb8d8b5a17bfc4af6e9d1c438e33f6c
diff --cc build/rtems/config.target
index b07411b9,83628af4..3fdade32
--- a/build/rtems/config.target
+++ b/build/rtems/config.target
@@@ -9,9 -9,9 +9,9 @@@ test: wvtes
  .PHONY: test
  
  # Platform name as preprocessor symbol
 -export PLATFORM=rtems
 +export PLATFORM=RTEMS
  # Platform name as used in file names
- export PLATFORM_FN=RTEMS
+ export PLATFORM_FN=rtems
  
  # Create symbolic links to headers instead of copying them. Useful
  # during development.
diff --cc src/forb/src/forb.h
index 2e4a2c46,e44d49cd..595ed1ff
--- a/src/forb/src/forb.h
+++ b/src/forb/src/forb.h
@@@ -237,6 -237,23 +237,23 @@@ forb_daemon_ready()
  int
  forb_signal_server_ready();	
  
+ /** 
+  * \def FORB_MAIN(id, orb, argc, argv)
+  *
+  * Introduce the definition of the main forb function i.e. the
+  * function which is called upon loading the FORB "component".
+  * 
+  * @param id "C" identifier of the function. On some platforms, it is
+  * used to distinguish multiple FORB_MAIN functions from each other. *
+  *
+  * Example usage: FORB_MAIN(frm_dummy, forb_orb orb, int argc, char *argv[])
+  */
 -#ifdef rtems
++#ifdef RTEMS
+ #define FORB_MAIN(id, orb, argc, argv) int forb_main_ ## id(orb, argc, argv)
+ #else	
+ #define FORB_MAIN(id, orb, argc, argv) int forb_main(orb, argc, argv)
+ #endif
+ 
  #ifdef __cplusplus
  } /* extern "C"*/
  #endif