From 394801c998512ea7b7258c55fe95987e8a3bcb16 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Mon, 12 Feb 2024 14:52:06 +0100
Subject: [PATCH] hw: re-name scheduler files according to class

Fix genodelabs/genode#5115
---
 repos/base-hw/lib/mk/core-hw.inc                            | 2 +-
 repos/base-hw/src/core/kernel/cpu_context.h                 | 2 +-
 .../src/core/kernel/{cpu_scheduler.cc => scheduler.cc}      | 2 +-
 .../src/core/kernel/{cpu_scheduler.h => scheduler.h}        | 6 +++---
 repos/base-hw/src/test/cpu_scheduler/main.cc                | 2 +-
 repos/base-hw/src/test/cpu_scheduler/target.mk              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename repos/base-hw/src/core/kernel/{cpu_scheduler.cc => scheduler.cc} (99%)
 rename repos/base-hw/src/core/kernel/{cpu_scheduler.h => scheduler.h} (97%)

diff --git a/repos/base-hw/lib/mk/core-hw.inc b/repos/base-hw/lib/mk/core-hw.inc
index 98657c1581..688bcca8e5 100644
--- a/repos/base-hw/lib/mk/core-hw.inc
+++ b/repos/base-hw/lib/mk/core-hw.inc
@@ -50,7 +50,7 @@ SRC_CC += region_map_support.cc
 SRC_CC += pager.cc
 SRC_CC += _main.cc
 SRC_CC += kernel/cpu.cc
-SRC_CC += kernel/cpu_scheduler.cc
+SRC_CC += kernel/scheduler.cc
 SRC_CC += kernel/ipc_node.cc
 SRC_CC += kernel/irq.cc
 SRC_CC += kernel/main.cc
diff --git a/repos/base-hw/src/core/kernel/cpu_context.h b/repos/base-hw/src/core/kernel/cpu_context.h
index 48f25f5cb0..8c7444ac3d 100644
--- a/repos/base-hw/src/core/kernel/cpu_context.h
+++ b/repos/base-hw/src/core/kernel/cpu_context.h
@@ -16,7 +16,7 @@
 #define _CORE__KERNEL__CPU_CONTEXT_H_
 
 /* core includes */
-#include <kernel/cpu_scheduler.h>
+#include <kernel/scheduler.h>
 #include <kernel/timer.h>
 
 namespace Kernel {
diff --git a/repos/base-hw/src/core/kernel/cpu_scheduler.cc b/repos/base-hw/src/core/kernel/scheduler.cc
similarity index 99%
rename from repos/base-hw/src/core/kernel/cpu_scheduler.cc
rename to repos/base-hw/src/core/kernel/scheduler.cc
index a719742f15..dff191b197 100644
--- a/repos/base-hw/src/core/kernel/cpu_scheduler.cc
+++ b/repos/base-hw/src/core/kernel/scheduler.cc
@@ -14,7 +14,7 @@
 
 #include <types.h>
 #include <hw/assert.h>
-#include <kernel/cpu_scheduler.h>
+#include <kernel/scheduler.h>
 
 using namespace Kernel;
 
diff --git a/repos/base-hw/src/core/kernel/cpu_scheduler.h b/repos/base-hw/src/core/kernel/scheduler.h
similarity index 97%
rename from repos/base-hw/src/core/kernel/cpu_scheduler.h
rename to repos/base-hw/src/core/kernel/scheduler.h
index b44a65db7f..48e0bc9cb3 100644
--- a/repos/base-hw/src/core/kernel/cpu_scheduler.h
+++ b/repos/base-hw/src/core/kernel/scheduler.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU Affero General Public License version 3.
  */
 
-#ifndef _CORE__KERNEL__CPU_SCHEDULER_H_
-#define _CORE__KERNEL__CPU_SCHEDULER_H_
+#ifndef _CORE__KERNEL__SCHEDULER_H_
+#define _CORE__KERNEL__SCHEDULER_H_
 
 /* core includes */
 #include <util.h>
@@ -246,4 +246,4 @@ class Kernel::Scheduler
 			return Genode::min(_current_quantum, _super_period_left); }
 };
 
-#endif /* _CORE__KERNEL__CPU_SCHEDULER_H_ */
+#endif /* _CORE__KERNEL__SCHEDULER_H_ */
diff --git a/repos/base-hw/src/test/cpu_scheduler/main.cc b/repos/base-hw/src/test/cpu_scheduler/main.cc
index e144b7a2e0..6479a0de6c 100644
--- a/repos/base-hw/src/test/cpu_scheduler/main.cc
+++ b/repos/base-hw/src/test/cpu_scheduler/main.cc
@@ -17,7 +17,7 @@
 #include <base/component.h>
 
 /* core includes */
-#include <kernel/cpu_scheduler.h>
+#include <kernel/scheduler.h>
 
 using namespace Genode;
 using namespace Kernel;
diff --git a/repos/base-hw/src/test/cpu_scheduler/target.mk b/repos/base-hw/src/test/cpu_scheduler/target.mk
index 21ac7ad2e7..c36ac734fc 100644
--- a/repos/base-hw/src/test/cpu_scheduler/target.mk
+++ b/repos/base-hw/src/test/cpu_scheduler/target.mk
@@ -5,7 +5,7 @@
 #
 
 TARGET   = test-cpu_scheduler
-SRC_CC   = main.cc cpu_scheduler.cc
+SRC_CC   = main.cc scheduler.cc
 INC_DIR += $(REP_DIR)/src/core $(REP_DIR)/src/include $(BASE_DIR)/src/include
 LIBS     = base