riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1097 from Kijewski/gettimeofday-warning

Browse Source 
arm_common: no needless `_gettimeofday()` warning
This commit is contained in:
René Kijewski 2014-05-05 14:44:31 +02:00
commit 35492617c8
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
cpu/arm_common/gettimeofday.c Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (C) 2013 Oliver Hahm <oliver.hahm@inria.fr>
*
* This source code is licensed under the GNU Lesser General Public License,
* Version 2. See the file LICENSE for more details.
*
* This file is part of RIOT.
*
*/
/**
* @file
* @ingroup arm_common
* @brief LPC2387 Newlib gettimeofday() system call glue
*
* @author Freie Universität Berlin, Computer Systems & Telematics
* @author Michael Baar <michael.baar@fu-berlin.de>
* @author René Kijewski <rene.kijewski@fu-berlin.de>
*/
#include <sys/time.h>
#if defined MODULE_RTC
# include "rtc.h"
#elif defined MODULE_VTIMER
# include "vtimer.h"
#endif
/* Declared as external, without a definition. */
/* This will cause a linktime error, if _gettimeofday() is referenced, */
/* and neither rtc nor vtimer were linked in. */
extern void __gettimeofday_syscall_is_not_implemented_without_vtimer_or_rtc_module(void);
int _gettimeofday(struct timeval *tp, void *restrict tzp)
{
(void) tzp;
#if defined MODULE_RTC
rtc_time(tp);
#elif defined MODULE_VTIMER
vtimer_gettimeofday(tp);
#else
__gettimeofday_syscall_is_not_implemented_without_vtimer_or_rtc_module();
#endif
return 0;
}

12
cpu/arm_common/syscalls.c
View File

@ -276,18 +276,6 @@ int _kill_r(struct _reent *r, int pid, int sig)
r->_errno = ESRCH; // no such process
return -1;
}
/*---------------------------------------------------------------------------*/
int _gettimeofday(struct timeval *tp, void *restrict tzp) {
(void) tzp;
#if defined MODULE_RTC
rtc_time(tp);
#elif defined MODULE_VTIMER
vtimer_gettimeofday(tp);
#else
#warning gettimeofday syscall is not implemented without vtimer or rtc module
#endif
return 0;
}
void _init(void) {}
void _fini(void) {}