move rrrrrrread_tsc from libsys to libc so anyone can use it

diff --git a/include/minix/minlib.h b/include/minix/minlib.h
index b123e5f7de9e757797e30a28e8032460f00d3733..faf69353e8f6abb99797ec1d4870a85b7989edcd 100644 (file)
--- a/include/minix/minlib.h
+++ b/include/minix/minlib.h
@@ -21,6 +21,10 @@ _PROTOTYPE(int rewrite_mtab, (char *_prog_name));
 _PROTOTYPE(int get_mtab_entry, (char *_s1, char *_s2, char *_s3, char *_s4));
 _PROTOTYPE(int put_mtab_entry, (char *_s1, char *_s2, char *_s3, char *_s4));
 
+/* read_tsc() and friends */
+_PROTOTYPE(void read_tsc, (u32_t *hi, u32_t *lo));
+_PROTOTYPE(void read_tsc_64, (u64_t *t));
+
 /* return values for fsversion */
 #define FSVERSION_MFS1 0x00001
 #define FSVERSION_MFS2 0x00002

diff --git a/include/minix/sysutil.h b/include/minix/sysutil.h
index 9316ec6278a1f7a301a1dee4de6bf0ecb79bcecd..20ec899deb625d5867eb616b1c6cecfa1b952a1e 100644 (file)
--- a/include/minix/sysutil.h
+++ b/include/minix/sysutil.h
@@ -87,9 +87,5 @@ struct util_timingdata {
 
 typedef struct util_timingdata util_timingdata_t;
 
-/* read_tsc() and friends. */
-_PROTOTYPE( void read_tsc_64, (u64_t *t)                               );
-_PROTOTYPE( void read_tsc, (u32_t *hi, u32_t *lo)                      );
-
 #endif /* _MINIX_SYSUTIL_H */
 

diff --git a/lib/libc/other/Makefile.inc b/lib/libc/other/Makefile.inc
index 2433397cf569a9bcd325e97278b827c694fe094f..8f18fb62a924d7f9a995ec773006311d2b347ed7 100644 (file)
--- a/lib/libc/other/Makefile.inc
+++ b/lib/libc/other/Makefile.inc
@@ -86,6 +86,8 @@ SRCS+=  \
        putw.c \
        pwcache.c \
        random.c \
+       read_tsc.S \
+       read_tsc_64.c \
        realpath.c \
        rindex.c \
        rlimit.c \

diff --git a/lib/libsys/read_tsc.S b/lib/libc/other/read_tsc.S
similarity index 100%
rename from lib/libsys/read_tsc.S
rename to lib/libc/other/read_tsc.S

diff --git a/lib/libsys/read_tsc_64.c b/lib/libc/other/read_tsc_64.c
similarity index 71%
rename from lib/libsys/read_tsc_64.c
rename to lib/libc/other/read_tsc_64.c
index e13ef1ba9b89616dc2c467973a86a90807e50723..63faa10ad0c137c11851dc716ab18dab59b4ba6b 100644 (file)
--- a/lib/libsys/read_tsc_64.c
+++ b/lib/libc/other/read_tsc_64.c
@@ -1,12 +1,11 @@
 
-#include "sysutil.h"
 #include <minix/u64.h>
-#include <minix/syslib.h>
+#include <minix/minlib.h>
 
 /* Utility function to work directly with u64_t
  * By Antonio Mancina
  */
-PUBLIC void read_tsc_64(t)
+void read_tsc_64(t)
 u64_t* t;
 {
     u32_t lo, hi;

diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index a4c1dfab280a6963fad293f3c8e5e2799823ee67..7469515e4450cfadac4054d2ea15aca62f7ab3c4 100644 (file)
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -112,8 +112,6 @@ SRCS=  \
        env_prefix.c \
        fkey_ctl.c \
        tsc_util.c \
-       read_tsc.S \
-       read_tsc_64.c \
        ser_putc.c \
        stacktrace.c \
        sys_hz.c \