// -----------------------------------------------------------------------
-// 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.
// -----------------------------------------------------------------------
//
//==============================================
// FOSA(Frescor Operating System Adaptation layer)
//================================================
+#include <fosa.h>
/*************************
* Timing: Clocks
*************************/
int fosa_clock_get_time(fosa_clock_id_t clockid,
- struct timespec current_time){
+ struct timespec *current_time){
return clock_gettime(clockid, current_time);
}
frsh_signal_t signal,
frsh_signal_info_t info,
fosa_timer_id_t *timerid){
- struct sigevent event;
-
- event.sigev_notify = SIGEV_SIGNAL;
- event.sigev_signo = signal;
- event.sigval.sival_ptr = info;
-
- return timer_create(clockid, &event, timerid);
+ struct sigevent event;
+
+ event.sigev_notify = SIGEV_SIGNAL;
+ event.sigev_signo = signal;
+ // event.sigev_value = info;
+
+ return timer_create(clockid, &event, timerid);
}
int fosa_timer_delete(fosa_timer_id_t timerid){
timer_delete(timerid);
+ return 0;
}
struct itimerspec when;
when.it_value = *value; // Just one shot.
- when.it_interval.tv_sec = 0; // No periodic behaviour.
+ when.it_interval.tv_sec = 0; // Not periodic behaviour.
when.it_interval.tv_nsec = 0;
return timer_settime(timerid, abstime , &when, NULL);
}
-int fosa_timer_disarm(fosa_timer_id_t timerid){
+int fosa_timer_get_remaining_time(fosa_timer_id_t timerid, struct timespec *remaining_time) {
+
+ if (TIMER_ARMED(timerid)) {
+ (*remaining_time)=timespec_from_ns((long long)(timerid->expires.it_value - clock_gethrtime(timerid->clock_id)));
+ } else
+ return -1;
+
+ return 0;
+}
+
+int fosa_timer_disarm(fosa_timer_id_t timerid, struct timespec *remaining_time){
struct itimerspec when;
+
+ if (remaining_time && TIMER_ARMED(timerid)) {
+ (*remaining_time)=
+ timespec_from_ns((long long)(timerid->expires.it_value - clock_gethrtime(timerid->clock_id)));
+ }
when.it_value.tv_sec = 0;
when.it_value.tv_nsec = 0;