diff --git a/cpu/atmega_common/Makefile.include b/cpu/atmega_common/Makefile.include
index 23fc0413a19c7fb498263d589a060bc4d4dd80de..06e06f876b3a7cf349f686a1cb8c4ba6a4325b94 100644
--- a/cpu/atmega_common/Makefile.include
+++ b/cpu/atmega_common/Makefile.include
@@ -18,7 +18,7 @@ export USEMODULE += periph_common
export USEMODULE += uart_stdio
# include module specific includes
-export INCLUDES += -I$(RIOTCPU)/atmega_common/include -isystem$(RIOTCPU)/atmega_common/avr-libc-extra
+export INCLUDES += -I$(RIOTCPU)/atmega_common/include -isystem$(RIOTCPU)/atmega_common/include/vendor
ifeq ($(LTO),1)
# avr-gcc <4.8.3 has a bug when using LTO which causes a warning to be printed always:
diff --git a/cpu/atmega_common/include/sys/stat.h b/cpu/atmega_common/include/sys/stat.h
index 1099df2470a387601a3c3ec762c3d469ea04589f..eb97c92d978a2553026f82646efc1c07346a040c 100644
--- a/cpu/atmega_common/include/sys/stat.h
+++ b/cpu/atmega_common/include/sys/stat.h
@@ -15,7 +15,7 @@
#ifndef SYS_STAT_H
#define SYS_STAT_H
-#include <time.h> /* for struct timespec */
+#include <time.h> /* for struct timespec */
#include <sys/types.h> /* for fsblkcnt_t, fsfilcnt_t */
#ifdef __cplusplus
diff --git a/cpu/atmega_common/include/sys/types.h b/cpu/atmega_common/include/sys/types.h
index 1ae38413a425a17fb98124153e38d17f03e12721..81709d536a5927bf99ea98230cccc162f0e20fc2 100644
--- a/cpu/atmega_common/include/sys/types.h
+++ b/cpu/atmega_common/include/sys/types.h
@@ -35,7 +35,7 @@ typedef int pid_t; /**< Used for process IDs and process group ID
typedef unsigned int size_t; /**< Used for sizes of objects */
typedef signed int ssize_t; /**< Used for a count of bytes or an error indication */
typedef int32_t suseconds_t; /**< Used for time in microseconds */
-typedef int32_t time_t; /**< Used for time in seconds */
+typedef uint32_t time_t; /**< Used for time in seconds */
typedef uint32_t timer_t; /**< Used for timer ID returned by timer_create() */
typedef uint16_t uid_t; /**< Used for user IDs */
typedef uint32_t useconds_t; /**< Used for time in microseconds */
diff --git a/cpu/atmega_common/avr-libc-extra/errno.h b/cpu/atmega_common/include/vendor/errno.h
similarity index 100%
rename from cpu/atmega_common/avr-libc-extra/errno.h
rename to cpu/atmega_common/include/vendor/errno.h
diff --git a/cpu/atmega_common/avr-libc-extra/inttypes.h b/cpu/atmega_common/include/vendor/inttypes.h
similarity index 100%
rename from cpu/atmega_common/avr-libc-extra/inttypes.h
rename to cpu/atmega_common/include/vendor/inttypes.h
diff --git a/cpu/atmega_common/avr-libc-extra/time.h b/cpu/atmega_common/include/vendor/time.h
similarity index 91%
rename from cpu/atmega_common/avr-libc-extra/time.h
rename to cpu/atmega_common/include/vendor/time.h
index c287fac2e0b536d87218199481ff9b1bae5e72eb..cd1ed88c03328f5339fde17c1157f1ee305ee0b5 100644
--- a/cpu/atmega_common/avr-libc-extra/time.h
+++ b/cpu/atmega_common/include/vendor/time.h
@@ -26,9 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/* \cond DOXYGEN_BLACKLIST */
-
-/* $Id$ */
+/* $Id: time.h 2503 2016-02-07 22:59:47Z joerg_wunsch $ */
/** \file */
@@ -101,16 +99,22 @@
#ifndef TIME_H
#define TIME_H
-#include <stdint.h>
-#include <sys/types.h>
-
#ifdef __cplusplus
-extern "C" {
+extern "C" {
#endif
+#include <inttypes.h>
+#include <stdlib.h>
+
/** \ingroup avr_time */
/* @{ */
+ /**
+ time_t represents seconds elapsed from Midnight, Jan 1 2000 UTC (the Y2K 'epoch').
+ Its range allows this implementation to represent time up to Tue Feb 7 06:28:15 2136 UTC.
+ */
+ typedef uint32_t time_t;
+
/**
The time function returns the systems current time stamp.
If timer is not a null pointer, the return value is also assigned to the object it points to.
@@ -128,22 +132,7 @@ extern "C" {
The tm structure contains a representation of time 'broken down' into components of the
Gregorian calendar.
- The normal ranges of the elements are..
-
- \code
- tm_sec seconds after the minute - [ 0 to 59 ]
- tm_min minutes after the hour - [ 0 to 59 ]
- tm_hour hours since midnight - [ 0 to 23 ]
- tm_mday day of the month - [ 1 to 31 ]
- tm_wday days since Sunday - [ 0 to 6 ]
- tm_mon months since January - [ 0 to 11 ]
- tm_year years since 1900
- tm_yday days since January 1 - [ 0 to 365 ]
- tm_isdst Daylight Saving Time flag *
-
- \endcode
-
- *The value of tm_isdst is zero if Daylight Saving Time is not in effect, and is negative if
+ The value of tm_isdst is zero if Daylight Saving Time is not in effect, and is negative if
the information is not available.
When Daylight Saving Time is in effect, the value represents the number of
@@ -153,18 +142,24 @@ extern "C" {
*/
struct tm {
- int tm_sec;
- int tm_min;
- int tm_hour;
- int tm_mday;
- int tm_wday;
- int tm_mon;
- int tm_year;
- int tm_yday;
- int tm_isdst;
+ int8_t tm_sec; /**< seconds after the minute - [ 0 to 59 ] */
+ int8_t tm_min; /**< minutes after the hour - [ 0 to 59 ] */
+ int8_t tm_hour; /**< hours since midnight - [ 0 to 23 ] */
+ int8_t tm_mday; /**< day of the month - [ 1 to 31 ] */
+ int8_t tm_wday; /**< days since Sunday - [ 0 to 6 ] */
+ int8_t tm_mon; /**< months since January - [ 0 to 11 ] */
+ int16_t tm_year; /**< years since 1900 */
+ int16_t tm_yday; /**< days since January 1 - [ 0 to 365 ] */
+ int16_t tm_isdst; /**< Daylight Saving Time flag */
};
+ /**
+ ATmega compatibility problem define
+ NOTE: Added for RIOT compatibility
+ */
+#define ATMEGA_INCOMPATIBLE_TIME_H
+#ifndef __DOXYGEN__
/* We have to provide clock_t / CLOCKS_PER_SEC so that libstdc++-v3 can
be built. We define CLOCKS_PER_SEC via a symbol _CLOCKS_PER_SEC_
so that the user can provide the value on the link line, which should
@@ -173,6 +168,7 @@ extern "C" {
extern char *_CLOCKS_PER_SEC_;
#define CLOCKS_PER_SEC ((clock_t) _CLOCKS_PER_SEC_)
extern clock_t clock(void);
+#endif /* !__DOXYGEN__ */
/**
This function 'compiles' the elements of a broken-down time structure, returning a binary time stamp.
@@ -387,10 +383,10 @@ extern "C" {
Structure which represents a date as a year, week number of that year, and day of week.
See http://en.wikipedia.org/wiki/ISO_week_date for more information.
*/
- struct week_date{
- int year;
- int week;
- int day;
+ struct week_date {
+ int year; /**< year number (Gregorian calendar) */
+ int week; /**< week number (#1 is where first Thursday is in) */
+ int day; /**< day within week */
};
/**
@@ -511,21 +507,18 @@ extern "C" {
*/
unsigned long lm_sidereal(const time_t * timer);
+ /**
+ Definition of struct timespec for the atmega
+ NOTE: Added for RIOT compatibility and standard compliance
+ */
struct timespec {
- time_t tv_sec;
- long tv_nsec;
+ time_t tv_sec;
+ long tv_nsec;
};
/* @} */
-
-/* /endcond */
-
#ifdef __cplusplus
}
#endif
-#endif /* TIME_H */
-
-/**
-\endcond
-*/
+#endif /* TIME_H */
diff --git a/cpu/atmega_common/avr-libc-extra/unistd.h b/cpu/atmega_common/include/vendor/unistd.h
similarity index 100%
rename from cpu/atmega_common/avr-libc-extra/unistd.h
rename to cpu/atmega_common/include/vendor/unistd.h
diff --git a/sys/include/tm.h b/sys/include/tm.h
index d2a195de281f2f7402a4c9be21410f3fdb5a0910..ab954d529c49d41b6803f774a770315284d286d5 100644
--- a/sys/include/tm.h
+++ b/sys/include/tm.h
@@ -84,7 +84,11 @@ int tm_doomsday(int year) CONST;
* @param[out] wday Returns the day of the week.
* @param[out] yday Returns the day of the year (Jan 1st is 0).
*/
+#ifndef ATMEGA_INCOMPATIBLE_TIME_H
void tm_get_wyday(int year, int mon, int mday, int *wday, int *yday);
+#else
+void tm_get_wyday(int year, int mon, int mday, int8_t *wday, int16_t *yday);
+#endif
/**
* @brief Fills in `struct tm::tm_wday` and `struct tm::tm_yday` given a date.
diff --git a/sys/timex/tm.c b/sys/timex/tm.c
index 1b9fe742ab1ff0533fba2b62561fe13ed9b616b1..4efa58b153a902a7bbf7abad5f5ccac0310d7b73 100644
--- a/sys/timex/tm.c
+++ b/sys/timex/tm.c
@@ -49,7 +49,11 @@ int tm_doomsday(int year)
return result;
}
+#ifndef ATMEGA_INCOMPATIBLE_TIME_H
void tm_get_wyday(int year, int mon, int mday, int *wday, int *yday)
+#else
+void tm_get_wyday(int year, int mon, int mday, int8_t *wday, int16_t *yday)
+#endif
{
int is_leap_year = tm_is_leap_year(year);
*yday = TM_MON_DAYS_ACCU[mon] + mday + (mon <= TM_MON_FEB ? 0 : is_leap_year) - 1;
diff --git a/tests/pkg_minmea/Makefile b/tests/pkg_minmea/Makefile
index 3ffc89397a599fbf64eb7d82df71146eaa69fcb9..272ee8ce68324c0c532ad25e000f01b41c6f8743 100644
--- a/tests/pkg_minmea/Makefile
+++ b/tests/pkg_minmea/Makefile
@@ -5,6 +5,14 @@ USEPKG += minmea
# The MSP-430 toolchain lacks mktime and NAN
BOARD_BLACKLIST := chronos msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1
+# Incompatible due to non-standard ATmega time.h
+BOARD_BLACKLIST += arduino-duemilanove \
+ arduino-mega2560 \
+ arduino-uno \
+ jiminy-mega256rfr2 \
+ mega-xplained \
+ waspmote-pro
+
TEST_ON_CI_WHITELIST += all
include $(RIOTBASE)/Makefile.include
diff --git a/tests/struct_tm_utility/main.c b/tests/struct_tm_utility/main.c
index eb9176a94e7a799720319f69b476cb80afe1267b..256568851905f128b93b3fa804076eb5cab54d87 100644
--- a/tests/struct_tm_utility/main.c
+++ b/tests/struct_tm_utility/main.c
@@ -113,7 +113,13 @@ static int cmd_day(int argc, char **argv)
puts("The supplied date is invalid, but no error should occur.");
}
+#ifndef ATMEGA_INCOMPATIBLE_TIME_H
int wday, yday;
+#else
+ int8_t wday;
+ int16_t yday;
+#endif
+
tm_get_wyday(year, mon - 1, day, &wday, &yday);
printf("What weekday was %04d-%02d-%02d? The %d(th) day of the year was a %.3s.\n",
year, mon, day, yday + 1, DAY_NAMES[wday]);