From 7b8fd76af006a32853ca9a72c550fd8c87cbe1b8 Mon Sep 17 00:00:00 2001
From: "Justin C. Miller" <justin@devjustinian.com>
Date: Sun, 25 Sep 2022 17:23:14 -0700
Subject: [PATCH] [libj6] Move caps.h to cap_flags.h

This file is just the generated cap flag constants. Move it to not
collide with more capability code to be added.
---
 src/kernel/objects/channel.h                        | 2 +-
 src/kernel/objects/event.h                          | 2 +-
 src/kernel/objects/mailbox.h                        | 2 +-
 src/kernel/objects/process.h                        | 2 +-
 src/kernel/objects/system.h                         | 2 +-
 src/kernel/objects/thread.h                         | 2 +-
 src/kernel/objects/vm_area.h                        | 2 +-
 src/kernel/syscall_verify.cpp.cog                   | 2 +-
 src/libraries/j6/j6.module                          | 4 ++--
 src/libraries/j6/j6/{caps.h.cog => cap_flags.h.cog} | 2 +-
 src/user/drv.uart/main.cpp                          | 2 +-
 src/user/srv.init/main.cpp                          | 2 +-
 src/user/srv.logger/main.cpp                        | 2 +-
 src/user/test_runner/tests/handles.cpp              | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)
 rename src/libraries/j6/j6/{caps.h.cog => cap_flags.h.cog} (96%)

diff --git a/src/kernel/objects/channel.h b/src/kernel/objects/channel.h
index d4af43b..cbfd1f7 100644
--- a/src/kernel/objects/channel.h
+++ b/src/kernel/objects/channel.h
@@ -2,7 +2,7 @@
 /// \file channel.h
 /// Definition of channel objects and related functions
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <util/bip_buffer.h>
 #include <util/counted.h>
 #include <util/spinlock.h>
diff --git a/src/kernel/objects/event.h b/src/kernel/objects/event.h
index 26becad..88d6dc4 100644
--- a/src/kernel/objects/event.h
+++ b/src/kernel/objects/event.h
@@ -3,7 +3,7 @@
 /// Definition of event kobject types
 
 #include <stdint.h>
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 
 #include "objects/kobject.h"
 #include "wait_queue.h"
diff --git a/src/kernel/objects/mailbox.h b/src/kernel/objects/mailbox.h
index 0b883da..1a9c6fc 100644
--- a/src/kernel/objects/mailbox.h
+++ b/src/kernel/objects/mailbox.h
@@ -2,7 +2,7 @@
 /// \file mailbox.h
 /// Definition of mailbox kobject types
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <util/counted.h>
 #include <util/map.h>
 #include <util/spinlock.h>
diff --git a/src/kernel/objects/process.h b/src/kernel/objects/process.h
index 2bae4da..98dff9e 100644
--- a/src/kernel/objects/process.h
+++ b/src/kernel/objects/process.h
@@ -2,7 +2,7 @@
 /// \file process.h
 /// Definition of process kobject types
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <util/map.h>
 #include <util/vector.h>
 
diff --git a/src/kernel/objects/system.h b/src/kernel/objects/system.h
index 704b1d2..1526445 100644
--- a/src/kernel/objects/system.h
+++ b/src/kernel/objects/system.h
@@ -2,7 +2,7 @@
 /// \file system.h
 /// Definition of kobject type representing the system
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include "objects/kobject.h"
 
 namespace obj {
diff --git a/src/kernel/objects/thread.h b/src/kernel/objects/thread.h
index 737d7ca..36b4473 100644
--- a/src/kernel/objects/thread.h
+++ b/src/kernel/objects/thread.h
@@ -2,7 +2,7 @@
 /// \file thread.h
 /// Definition of thread kobject types
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <util/enum_bitfields.h>
 #include <util/linked_list.h>
 #include <util/spinlock.h>
diff --git a/src/kernel/objects/vm_area.h b/src/kernel/objects/vm_area.h
index 926234b..367270a 100644
--- a/src/kernel/objects/vm_area.h
+++ b/src/kernel/objects/vm_area.h
@@ -5,7 +5,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <util/vector.h>
 #include <util/enum_bitfields.h>
 
diff --git a/src/kernel/syscall_verify.cpp.cog b/src/kernel/syscall_verify.cpp.cog
index a8d4b41..040e92f 100644
--- a/src/kernel/syscall_verify.cpp.cog
+++ b/src/kernel/syscall_verify.cpp.cog
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <arch/memory.h>
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <j6/errors.h>
 #include <j6/types.h>
 #include <util/counted.h>
diff --git a/src/libraries/j6/j6.module b/src/libraries/j6/j6.module
index 124b8f6..ba3c5e4 100644
--- a/src/libraries/j6/j6.module
+++ b/src/libraries/j6/j6.module
@@ -10,7 +10,7 @@ j6 = module("j6",
         "sysconf.cpp.cog",
     ],
     public_headers = [
-        "j6/caps.h.cog",
+        "j6/cap_flags.h.cog",
         "j6/errors.h",
         "j6/flags.h",
         "j6/init.h",
@@ -33,7 +33,7 @@ sysconf = join(source_root, "definitions/sysconf.yaml")
 definitions = glob('definitions/**/*.def', recursive=True)
 
 j6.add_depends([
-        "j6/caps.h.cog",
+        "j6/cap_flags.h.cog",
         "j6/syscalls.h.cog",
         "syscalls.s.cog",
     ], definitions)
diff --git a/src/libraries/j6/j6/caps.h.cog b/src/libraries/j6/j6/cap_flags.h.cog
similarity index 96%
rename from src/libraries/j6/j6/caps.h.cog
rename to src/libraries/j6/j6/cap_flags.h.cog
index ab68c7e..3fb4bd0 100644
--- a/src/libraries/j6/j6/caps.h.cog
+++ b/src/libraries/j6/j6/cap_flags.h.cog
@@ -1,7 +1,7 @@
 #pragma once
 // vim: ft=cpp
 
-/// \file caps.h
+/// \file cap_flags.h
 /// Capability bitfield constants
 
 #define j6_handle_caps(h)  (((h)>>32) & 0xffffff)
diff --git a/src/user/drv.uart/main.cpp b/src/user/drv.uart/main.cpp
index 7a4a373..29d09b3 100644
--- a/src/user/drv.uart/main.cpp
+++ b/src/user/drv.uart/main.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <j6/errors.h>
 #include <j6/flags.h>
 #include <j6/init.h>
diff --git a/src/user/srv.init/main.cpp b/src/user/srv.init/main.cpp
index ea5db81..7020ab6 100644
--- a/src/user/srv.init/main.cpp
+++ b/src/user/srv.init/main.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <j6/errors.h>
 #include <j6/init.h>
 #include <j6/syscalls.h>
diff --git a/src/user/srv.logger/main.cpp b/src/user/srv.logger/main.cpp
index db5d22f..cb451b2 100644
--- a/src/user/srv.logger/main.cpp
+++ b/src/user/srv.logger/main.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <j6/errors.h>
 #include <j6/flags.h>
 #include <j6/init.h>
diff --git a/src/user/test_runner/tests/handles.cpp b/src/user/test_runner/tests/handles.cpp
index 0a2a230..7d62e97 100644
--- a/src/user/test_runner/tests/handles.cpp
+++ b/src/user/test_runner/tests/handles.cpp
@@ -1,4 +1,4 @@
-#include <j6/caps.h>
+#include <j6/cap_flags.h>
 #include <j6/errors.h>
 #include <j6/syscalls.h>
 #include <j6/types.h>