move time->clock

jmacd · jmacd · Nov 28, 2023 · Nov 21, 2023 · Nov 22, 2023 · Nov 25, 2023
commit eae164673f144416b920b218b9f0dcce9c03172b
diff --git a/examples/BUILD b/examples/BUILD
@@ -18,7 +18,7 @@ cc_binary(
         "//lib/initproc",
         "//lib/log/daemon",
         "//lib/rpmsg",
-        "//lib/time",
+        "//lib/time/clock",
         "//tools/toolchain/am335x",
     ],
 )

diff --git a/examples/example.c b/examples/example.c
@@ -12,7 +12,7 @@
 #include "lib/log/daemon/daemon.h"
 #include "lib/pinmap/pinmap.h"
 #include "lib/rpmsg/rpmsg.h"
-#include "lib/time/time.h"
+#include "lib/time/clock/clock.h"
 
 #define NUM_RESOURCES 1
 

diff --git a/lib/time/BUILD → lib/time/clock/BUILD b/lib/time/BUILD → lib/time/clock/BUILD
@@ -4,26 +4,26 @@ package(default_visibility = ["//visibility:public"])
 cc_library(
     name = "defs",
     hdrs = [
-        "time-defs.h",
+        "clock-defs.h",
     ],
     deps = [
         "//lib/soc",
     ],
 )
 
 cc_library(
-    name = "time",
+    name = "clock",
     srcs = [
-        "time.c",
+        "clock.c",
     ],
     hdrs = [
-        "time.h",
+        "clock.h",
     ],
     deps = [
         ":defs",
         "//lib/coroutine",
     ] + select({
-        "//tools/toolchain:am335x": ["//lib/time/am335x"],
-        "//conditions:default": ["//lib/time/test32"],
+        "//tools/toolchain:am335x": ["//lib/time/clock/am335x"],
+        "//conditions:default": ["//lib/time/clock/test32"],
     }),
 )
diff --git a/lib/time/am335x/BUILD → lib/time/clock/am335x/BUILD b/lib/time/am335x/BUILD → lib/time/clock/am335x/BUILD
@@ -4,14 +4,14 @@ package(default_visibility = ["//visibility:public"])
 cc_library(
     name = "am335x",
     hdrs = [
-        "time-am335x.h",
+        "clock-am335x.h",
     ],
     srcs = [
-        "time-am335x.c",
+        "clock-am335x.c",
     ],
     deps = [
         "//lib/thread",
-        "//lib/time:defs",
+        "//lib/time/clock:defs",
         "//tools/toolchain/am335x",
     ],
 )
diff --git a/lib/time/am335x/time-am335x.c → lib/time/clock/am335x/clock-am335x.c b/lib/time/am335x/time-am335x.c → lib/time/clock/am335x/clock-am335x.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 #include "external/ti-pru-support/include/am335x/pru_iep.h"
-#include "lib/time/time-defs.h"
+#include "lib/time/clock/clock-defs.h"
 
 Timestamp __clock;
 

diff --git a/lib/time/am335x/time-am335x.h → lib/time/clock/am335x/clock-am335x.h b/lib/time/am335x/time-am335x.h → lib/time/clock/am335x/clock-am335x.h
@@ -4,7 +4,7 @@
 #ifndef LIB_TIME_AM335X_TIME_H
 #define LIB_TIME_AM335X_TIME_H
 
-#include "lib/time/time-defs.h"
+#include "lib/time/clock/clock-defs.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/time/time-defs.h → lib/time/clock/clock-defs.h b/lib/time/time-defs.h → lib/time/clock/clock-defs.h
diff --git a/lib/time/time.c → lib/time/clock/clock.c b/lib/time/time.c → lib/time/clock/clock.c
@@ -1,7 +1,7 @@
 // Copyright Joshua MacDonald
 // SPDX-License-Identifier: MIT
 
-#include "lib/time/time.h"
+#include "lib/time/clock/clock.h"
 #include "lib/coroutine/coroutine.h"
 #include "lib/thread/thread.h"
 

diff --git a/lib/time/time.h → lib/time/clock/clock.h b/lib/time/time.h → lib/time/clock/clock.h
@@ -10,12 +10,12 @@
 extern "C" {
 #endif
 
-#include "lib/time/time-defs.h"
+#include "lib/time/clock/clock-defs.h"
 
 #if defined(SUPRUGLUE_AM335X)
-#include "lib/time/am335x/time-am335x.h"
+#include "lib/time/clock/am335x/clock-am335x.h"
 #elif defined(SUPRUGLUE_TEST32)
-#include "lib/time/test32/time-test32.h"
+#include "lib/time/clock/test32/clock-test32.h"
 #endif
 
 void Sleep(uint32_t nanos);

diff --git a/lib/time/test32/BUILD → lib/time/clock/test32/BUILD b/lib/time/test32/BUILD → lib/time/clock/test32/BUILD
@@ -4,22 +4,22 @@ package(default_visibility = ["//visibility:public"])
 cc_library(
     name = "test32",
     srcs = [
-        "time-test32.cc",
+        "clock-test32.cc",
     ],
     hdrs = [
-        "time-test32.h",
+        "clock-test32.h",
     ],
     deps = [
         "//lib/thread",
-        "//lib/time:defs",
+        "//lib/time/clock:defs",
     ],
 )
 
 cc_test(
-    name = "time_test",
-    srcs = ["time_test.cc"],
+    name = "clock_test",
+    srcs = ["clock_test.cc"],
     deps = [
-        "//lib/time",
+        "//lib/time/clock",
         "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/lib/time/test32/time-test32.cc → lib/time/clock/test32/clock-test32.cc b/lib/time/test32/time-test32.cc → lib/time/clock/test32/clock-test32.cc
@@ -1,4 +1,4 @@
 // Copyright Joshua MacDonald
 // SPDX-License-Identifier: MIT
 
-#include "lib/time/time-defs.h"
+#include "lib/time/clock/clock-defs.h"
diff --git a/lib/time/test32/time-test32.h → lib/time/clock/test32/clock-test32.h b/lib/time/test32/time-test32.h → lib/time/clock/test32/clock-test32.h
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-#include "lib/time/time-defs.h"
+#include "lib/time/clock/clock-defs.h"
 
 #ifdef __cplusplus
 }

diff --git a/lib/time/test32/time_test.cc → lib/time/clock/test32/clock_test.cc b/lib/time/test32/time_test.cc → lib/time/clock/test32/clock_test.cc
@@ -1,4 +1,4 @@
 // Copyright Joshua MacDonald
 // SPDX-License-Identifier: MIT
 
-#include "time.h"
+#include "clock-test32.h"