score: Change _Timecounter_Time_uptime to int32_t

Move basic timecounter API shared with BSD network stack to
<machine/_timecounter.h>.

Update #3185.

cpukit/libcsupport/Makefile.am

@@ -29,6 +29,7 @@ include_machine_HEADERS += include/machine/_kernel_cpuset.h
 include_machine_HEADERS += include/machine/_kernel_param.h
 include_machine_HEADERS += include/machine/_kernel_time.h
 include_machine_HEADERS += include/machine/_kernel_types.h
+include_machine_HEADERS += include/machine/_timecounter.h
 
 ##  General stuff
 ERROR_C_FILES = src/error.c src/__assert.c

cpukit/libcsupport/include/machine/_kernel_time.h

@@ -28,6 +28,8 @@
 #error "must be included via <sys/time.h> in kernel space"
 #endif
 
+#include <machine/_timecounter.h>
+
 /* Operations on timespecs */
 #define	timespecclear(tvp)	((tvp)->tv_sec = (tvp)->tv_nsec = 0)
 #define	timespecisset(tvp)	((tvp)->tv_sec || (tvp)->tv_nsec)

cpukit/libcsupport/include/machine/_timecounter.h

@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 2016 embedded brains GmbH
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS_TIME_H_
+#error "<sys/time.h> must be included first"
+#endif /* !_SYS_TIME_H_ */
+
+#ifndef _MACHINE__TIMECOUNTER_H_
+#define _MACHINE__TIMECOUNTER_H_
+
+__BEGIN_DECLS
+extern volatile time_t _Timecounter_Time_second;
+extern volatile int32_t _Timecounter_Time_uptime;
+extern struct bintime _Timecounter_Boottimebin;
+
+void   _Timecounter_Binuptime(struct bintime *);
+void   _Timecounter_Nanouptime(struct timespec *);
+void   _Timecounter_Microuptime(struct timeval *);
+void   _Timecounter_Bintime(struct bintime *);
+void   _Timecounter_Nanotime(struct timespec *);
+void   _Timecounter_Microtime(struct timeval *);
+void   _Timecounter_Getbinuptime(struct bintime *);
+void   _Timecounter_Getnanouptime(struct timespec *);
+void   _Timecounter_Getmicrouptime(struct timeval *);
+void   _Timecounter_Getbintime(struct bintime *);
+void   _Timecounter_Getnanotime(struct timespec *);
+void   _Timecounter_Getmicrotime(struct timeval *);
+__END_DECLS
+
+#endif /* _MACHINE__TIMECOUNTER_H_ */

cpukit/libcsupport/preinstall.am

@@ -95,3 +95,7 @@ $(PROJECT_INCLUDE)/machine/_kernel_types.h: include/machine/_kernel_types.h $(PR
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_types.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_types.h
 
+$(PROJECT_INCLUDE)/machine/_timecounter.h: include/machine/_timecounter.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_timecounter.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_timecounter.h
+

cpukit/score/include/rtems/score/timecounter.h

@@ -25,6 +25,7 @@
 
 #include <sys/time.h>
 #include <sys/timetc.h>
+#include <machine/_timecounter.h>
 
 #include <rtems/score/isrlock.h>
 
@@ -227,7 +228,7 @@ extern volatile time_t _Timecounter_Time_second;
  * For compatibility with the FreeBSD network stack the initial value is one
  * second.
  */
-extern volatile time_t _Timecounter_Time_uptime;
+extern volatile int32_t _Timecounter_Time_uptime;
 
 /**
  * @brief The current timecounter.

cpukit/score/src/kern_tc.c

@@ -203,10 +203,11 @@ int tc_min_ticktock_freq = 1;
 
 #ifndef __rtems__
 volatile time_t time_second = 1;
+volatile time_t time_uptime = 1;
 #else /* __rtems__ */
 volatile time_t time_second = TOD_SECONDS_1970_THROUGH_1988;
+volatile int32_t time_uptime = 1;
 #endif /* __rtems__ */
-volatile time_t time_uptime = 1;
 
 #ifndef __rtems__
 static int sysctl_kern_boottime(SYSCTL_HANDLER_ARGS);