[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,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>

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"

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>

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>
 

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 {

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>

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>
 

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>

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)

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)

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>

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>

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>

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>