diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-08 08:22:18 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-08 08:22:18 +0200 |
commit | 01226ec56b930398080b5c6f85d2d78e450967d7 (patch) | |
tree | fbbdc36adc0b7ad89be069cf0bb1311a4bf1d467 /cpukit | |
parent | libblock: Drop superfluous <stdlib.h> include (diff) | |
download | rtems-01226ec56b930398080b5c6f85d2d78e450967d7.tar.bz2 |
score: Compatibility with latest Newlib
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/libnetworking/rtems/rtems_bsdnet_internal.h | 4 | ||||
-rw-r--r-- | cpukit/score/src/kern_tc.c | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h index 4de1b0bda6..d2f23d645c 100644 --- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h +++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h @@ -12,7 +12,7 @@ #include <rtems.h> #include <rtems/fs.h> -#include <rtems/bsd.h> +#include <rtems/score/timecounter.h> #ifdef __cplusplus extern "C" { @@ -62,7 +62,7 @@ void *memset(void *s, int c, size_t n); #define panic rtems_panic #define suser(a,b) 0 -#define microtime(tv) rtems_bsd_microtime(tv) +#define microtime(_tvp) _Timecounter_Microtime(_tvp) #define hz rtems_bsdnet_ticks_per_second #define tick rtems_bsdnet_microseconds_per_tick diff --git a/cpukit/score/src/kern_tc.c b/cpukit/score/src/kern_tc.c index bd6ab045b1..b9ea608d9d 100644 --- a/cpukit/score/src/kern_tc.c +++ b/cpukit/score/src/kern_tc.c @@ -14,24 +14,24 @@ */ #ifdef __rtems__ -#define _KERNEL -#define bintime _Timecounter_Bintime -#define binuptime _Timecounter_Binuptime -#define boottimebin _Timecounter_Boottimebin -#define getbintime _Timecounter_Getbintime -#define getbinuptime _Timecounter_Getbinuptime -#define getmicrotime _Timecounter_Getmicrotime -#define getmicrouptime _Timecounter_Getmicrouptime -#define getnanotime _Timecounter_Getnanotime -#define getnanouptime _Timecounter_Getnanouptime -#define microtime _Timecounter_Microtime -#define microuptime _Timecounter_Microuptime -#define nanotime _Timecounter_Nanotime -#define nanouptime _Timecounter_Nanouptime -#define tc_init _Timecounter_Install -#define timecounter _Timecounter -#define time_second _Timecounter_Time_second -#define time_uptime _Timecounter_Time_uptime +#define _KERNEL +#define binuptime(_bt) _Timecounter_Binuptime(_bt) +#define nanouptime(_tsp) _Timecounter_Nanouptime(_tsp) +#define microuptime(_tvp) _Timecounter_Microuptime(_tvp) +#define bintime(_bt) _Timecounter_Bintime(_bt) +#define nanotime(_tsp) _Timecounter_Nanotime(_tsp) +#define microtime(_tvp) _Timecounter_Microtime(_tvp) +#define getbinuptime(_bt) _Timecounter_Getbinuptime(_bt) +#define getnanouptime(_tsp) _Timecounter_Getnanouptime(_tsp) +#define getmicrouptime(_tvp) _Timecounter_Getmicrouptime(_tvp) +#define getbintime(_bt) _Timecounter_Getbintime(_bt) +#define getnanotime(_tsp) _Timecounter_Getnanotime(_tsp) +#define getmicrotime(_tvp) _Timecounter_Getmicrotime(_tvp) +#define tc_init _Timecounter_Install +#define timecounter _Timecounter +#define time_second _Timecounter_Time_second +#define time_uptime _Timecounter_Time_uptime +#define boottimebin _Timecounter_Boottimebin #include <rtems/score/timecounterimpl.h> #include <rtems/score/todimpl.h> #include <rtems/score/watchdogimpl.h> |