// -----------------------------------------------------------------------
-// Copyright (C) 2006 - 2007 FRESCOR consortium partners:
+// Copyright (C) 2006 - 2009 FRESCOR consortium partners:
//
// Universidad de Cantabria, SPAIN
// University of York, UK
// Scuola Superiore Sant'Anna, ITALY
// Kaiserslautern University, GERMANY
-// Univ. Politecnica Valencia, SPAIN
+// Univ. Politécnica 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
// 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.
+// based on previous work (FSF) done in the FIRST project
+//
+// Copyright (C) 2005 Mälardalen University, SWEDEN
+// Scuola Superiore S.Anna, ITALY
+// Universidad de Cantabria, SPAIN
+// University of York, UK
+//
+// FSF API web pages: http://marte.unican.es/fsf/docs
+// http://shark.sssup.it/contrib/first/docs/
//
-// 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.
+// This file is part of FOSA (Frsh Operating System Adaption)
//
-// 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.
+// FOSA is free software; you can redistribute it and/or modify it
+// under terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option) any
+// later version. FOSA 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 along with FOSA; see file
+// COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,
+// Cambridge, MA 02139, 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.
+// As a special exception, including FOSA header files in a file,
+// instantiating FOSA generics or templates, or linking other files
+// with FOSA objects to produce an executable application, does not
+// by itself cause the resulting executable application 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 Public License.
// -----------------------------------------------------------------------
//==============================================
// ******** ****** ******** **********
//================================================
#include <fosa_clocks_and_timers.h>
+#include <fosa_time.h>
+#include <stdlib.h>
/*************************
* Timing: Clocks
*************************/
-int fosa_clock_get_time(fosa_clock_id_t clockid, struct timespec *current_time)
-{
- if (clock_gettime (clockid, current_time))
- return FOSA_EINVAL;
+int fosa_clock_get_time(fosa_clock_id_t clockid, fosa_abs_time_t *current_time)
+{
+ int err;
+ struct timespec now;
+
+ err = clock_gettime (clockid, &now);
+ *current_time = fosa_timespec_to_abs_time(now);
return 0;
}
/*************************
* Timing: Timers
*************************/
-void void_handler (int signo) {};
int fosa_timer_create
(fosa_clock_id_t clockid, fosa_signal_t signal, fosa_signal_info_t info,
fosa_timer_id_t *timerid)
{
struct sigevent se;
- struct sigaction act;
+ struct sigaction act, oact;
- // Assumption: the signal should accept queued values
- act.sa_handler = void_handler;
- sigfillset (&act.sa_mask);
+ sigaction (signal, NULL, &oact);
+ act = oact;
act.sa_flags = SA_SIGINFO; // accept signal queuing
sigaction (signal, &act, NULL);
}
-int fosa_timer_arm
- (fosa_timer_id_t timerid, bool abstime,
- const struct timespec *value)
+int fosa_rel_timer_arm (fosa_timer_id_t timerid, const fosa_rel_time_t *value)
{
- struct timespec now;
+ struct itimerspec tvalue;
- clock_gettime (CLOCK_REALTIME, &now);
+ tvalue.it_value = fosa_rel_time_to_timespec(*value);
+ tvalue.it_interval = (struct timespec) {0,0};
- struct itimerspec tvalue =
- {
- .it_value = (struct timespec) *value,
- .it_interval = {0,0},
- };
+ if (timer_settime (timerid, 0, &tvalue, NULL))
+ return FOSA_EINVAL;
- if (timer_settime (timerid, abstime, &tvalue, NULL))
- return EINVAL;
+ return 0;
+}
+
+int fosa_abs_timer_arm (fosa_timer_id_t timerid, const fosa_abs_time_t *value)
+{
+ struct itimerspec tvalue;
+
+ tvalue.it_value = fosa_abs_time_to_timespec(*value);
+ tvalue.it_interval = (struct timespec) {0,0};
+
+ if (timer_settime (timerid, TIMER_ABSTIME, &tvalue, NULL))
+ return FOSA_EINVAL;
return 0;
}
int fosa_timer_get_remaining_time
- (fosa_timer_id_t timerid, struct timespec *remaining_time)
+ (fosa_timer_id_t timerid, fosa_rel_time_t *remaining_time)
{
struct itimerspec value;
if (timer_gettime (timerid, &value))
- return EINVAL;
+ return FOSA_EINVAL;
- *remaining_time = value.it_value;
+ *remaining_time = fosa_timespec_to_rel_time (value.it_value);
return 0;
}
-int fosa_timer_disarm(fosa_timer_id_t timerid, struct timespec
- *remaining_time)
+int fosa_timer_disarm (fosa_timer_id_t timerid, fosa_rel_time_t *remaining_time)
{
struct itimerspec null_timer, old;
};
if (timer_settime (timerid, 0, &null_timer, &old))
- return EINVAL;
+ return FOSA_EINVAL;
if (remaining_time)
- *remaining_time = old.it_value;
+ *remaining_time = fosa_timespec_to_rel_time (old.it_value);
return 0;
}
projects / frescor / fosa.git / blobdiff