Moving fosa_error.h to FRSH-FOSA and correcting thread_get_prio accodring to

Erik Thorin's remarks.

git-svn-id: http://www.frescor.org/private/svn/frescor/fosa/trunk@323 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/include/fosa.h b/include/fosa.h
index 27c03ab9925e1e2aed920b01df48a9d294aad6c2..5b98959e5d12c5d656eaedaabf9580a0a9e85447 100644 (file)
--- a/include/fosa.h
+++ b/include/fosa.h
@@ -66,7 +66,6 @@
 
 #include "fosa_configuration_parameters.h"
 #include "fosa_types.h"
-#include "fosa_errors.h"
 
 #include "fosa_threads_and_signals.h"
 #include "fosa_clocks_and_timers.h"

diff --git a/include/fosa_errors.h b/include/fosa_errors.h
deleted file mode 100644 (file)
index e020fad..0000000
--- a/include/fosa_errors.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -----------------------------------------------------------------------
-//  Copyright (C) 2006 - 2007 FRESCOR consortium partners:
-//
-//    Universidad de Cantabria,              SPAIN
-//    University of York,                    UK
-//    Scuola Superiore Sant'Anna,            ITALY
-//    Kaiserslautern University,             GERMANY
-//    Univ. Politecnica  Valencia,           SPAIN
-//    Czech Technical University in Prague,  CZECH REPUBLIC
-//    ENEA                                   SWEDEN
-//    Thales Communication S.A.              FRANCE
-//    Visual Tools S.A.                      SPAIN
-//    Rapita Systems Ltd                     UK
-//    Evidence                               ITALY
-//    
-//    See http://www.frescor.org for a link to partners' websites
-//
-//           FRESCOR project (FP6/2005/IST/5-034026) is funded
-//        in part by the European Union Sixth Framework Programme
-//        The European Union is not liable of any use that may be
-//        made of this code.
-//
-//  This file is part of the FRSH implementation
-//
-//  FRSH is free software; you can  redistribute it and/or  modify
-//  it under the terms of  the GNU General Public License as published by
-//  the Free Software Foundation;  either  version 2, or (at  your option)
-//  any later version.
-//
-//  FRSH  is distributed  in  the hope  that  it  will  be useful,  but
-//  WITHOUT  ANY  WARRANTY;     without  even the   implied   warranty  of
-//  MERCHANTABILITY  or  FITNESS FOR  A  PARTICULAR PURPOSE. See  the  GNU
-//  General Public License for more details.
-//
-//  You should have  received a  copy of  the  GNU  General Public License
-//  distributed  with  FRSH;  see file COPYING.   If not,  write to the
-//  Free Software  Foundation,  59 Temple Place  -  Suite 330,  Boston, MA
-//  02111-1307, USA.
-//
-//  As a special exception, if you include this header file into source
-//  files to be compiled, this header file does not by itself cause
-//  the resulting executable to be covered by the GNU General Public
-//  License.  This exception does not however invalidate any other
-//  reasons why the executable file might be covered by the GNU General
-//  Public License.
-// -----------------------------------------------------------------------
-//fosa_error.h
-//==============================================
-//  ********  ******    ********  **********
-//  **///// /**    **  **//////  /**     /**
-//  **      /**    ** /**        /**     /**
-//  ******* /**    ** /********* /**********
-//  **////  /**    ** ////////** /**//////**
-//  **      /**    **        /** /**     /**
-//  **      /**    **  ********  /**     /**
-//  //       /******/  ////////   //      // 
-//
-// FOSA(Frescor Operating System Adaptation layer)
-//================================================
-
-#ifndef        _FOSA_ERROR_H_
-#define        _FOSA_ERROR_H_
-
-/**
- * @defgroup fosaerror FOSA Errors
- * @ingroup fosa
- *
- * We define return error values.
- *
- * @{
- **/
-
-/* FOSA Error codes */
-
-#if defined(RT_LINUX) || defined(MARTE_OS)
-
-#include <error.h>
-
-/** Not enough memory available **/
-#define FOSA_ENOMEM   ENOMEM
-
-/** Invalid parameter **/
-#define FOSA_EINVAL   EINVAL
-
-/** Still pending information **/
-#define FOSA_EAGAIN   EAGAIN
-
-/* FOSA ADS errors */
-
-#define FOSA_EREJECT   EREJECT
-#define FOSA_EMASKED   EMASKED
-
-#endif
-
-/*}*/
-
-#endif             /* _FOSA_ERROR_H_ */

diff --git a/include/fosa_threads_and_signals.h b/include/fosa_threads_and_signals.h
index 7dde51f1d4fedeb564e9f0760fd035a970a23820..b65912fd61c546f38f655c6a27fc637bcc561f8c 100644 (file)
--- a/include/fosa_threads_and_signals.h
+++ b/include/fosa_threads_and_signals.h
@@ -237,7 +237,7 @@ int fosa_get_priority_min();
 int fosa_thread_attr_set_prio(frsh_thread_attr_t *attr, int prio);
 
 /**
- * frsh_thread_attr_get_prio()
+ * fosa_thread_attr_get_prio()
  *
  * Get the priority from a thread attributes object
  *
@@ -246,7 +246,7 @@ int fosa_thread_attr_set_prio(frsh_thread_attr_t *attr, int prio);
  * 
  * Returns 0
  **/
- int frsh_thread_attr_get_prio
+ int fosa_thread_attr_get_prio
           (const frsh_thread_attr_t *attr, size_t *prio);
 
 /**
@@ -312,7 +312,7 @@ int fosa_thread_get_prio (frsh_thread_id_t tid, int *prio);
  * notify it to the system console and then terminate the FRSH
  * implementation and dependant applications
  **/
-int frsh_set_accepted_signals(frsh_signal_t set[], int size);
+int fosa_set_accepted_signals(frsh_signal_t set[], int size);
 
 /**
  * fosa_signal_queue()