Rename fs_desc_buffer to desc

ce/ce.c

@@ -1,6 +1,6 @@
+#include <desc.h>
 #include <liballoc.h>
 #include <list.h>
-#include <m/fs_desc_buffer.h>
 #include <minmax.h>
 #include <printf.h>
 #include <process.h>
@@ -67,7 +67,7 @@ static void cmd_cat (struct list_node_link* tokens) {
     return;
   }
 
-  struct fs_desc_buffer desc;
+  struct desc desc;
 
   struct list_node_link *token_link, *token_tmp_link;
   list_foreach (tokens, token_link, token_tmp_link) {

include/desc.h

@@ -6,7 +6,7 @@
 #define FS_FILE 0
 #define FS_DIR  1
 
-struct fs_desc_buffer {
+struct desc {
   int type;
   size_t size;
 };

kernel/amd64/bootmain.c

@@ -13,11 +13,11 @@
 #include <libk/std.h>
 #include <limine/limine.h>
 #include <limine/requests.h>
-#include <m/ramdisk_device.h>
 #include <mm/liballoc.h>
 #include <mm/pmm.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
+#include <ramdisk_device.h>
 #include <sys/debug.h>
 #include <sys/mm.h>
 #include <sys/smp.h>

kernel/amd64/intr.c

@@ -7,13 +7,13 @@
 #include <irq/irq.h>
 #include <libk/std.h>
 #include <libk/string.h>
-#include <m/syscall_defs.h>
 #include <mm/liballoc.h>
 #include <proc/reschedule.h>
 #include <sys/debug.h>
 #include <sys/smp.h>
 #include <sys/spin.h>
 #include <syscall/syscall.h>
+#include <syscall_defs.h>
 
 /* 8259 PIC defs. */
 #define PIC1      0x20

kernel/amd64/syscall.c

@@ -5,14 +5,14 @@
 #include <amd64/msr.h>
 #include <libk/list.h>
 #include <libk/string.h>
-#include <m/status.h>
-#include <m/syscall_defs.h>
 #include <mm/liballoc.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
+#include <status.h>
 #include <sys/debug.h>
 #include <sys/smp.h>
 #include <syscall/syscall.h>
+#include <syscall_defs.h>
 
 extern void syscall_entry (void);
 

kernel/device/device.c

@@ -1,18 +1,18 @@
 #include <device/device.h>
 #include <device/ramdrv.h>
 #include <device/terminal.h>
+#include <kb_device.h>
 #include <libk/fieldlengthof.h>
 #include <libk/rbtree.h>
 #include <libk/std.h>
 #include <libk/string.h>
 #include <limine/requests.h>
-#include <m/kb_device.h>
-#include <m/ramdisk_device.h>
-#include <m/terminal_device.h>
-#include <m/xdrv_device.h>
 #include <mm/liballoc.h>
+#include <ramdisk_device.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
+#include <terminal_device.h>
+#include <xdrv_device.h>
 
 #if defined(__x86_64__)
 #include <device/ps2_kb.h>

kernel/device/ps2_kb.c

@@ -4,14 +4,14 @@
 #include <device/device.h>
 #include <device/ps2_kb.h>
 #include <irq/irq.h>
+#include <kb_device.h>
 #include <libk/ringbuffer.h>
 #include <libk/std.h>
-#include <m/kb_device.h>
-#include <m/status.h>
 #include <proc/capability.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
 #include <proc/suspension_q.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 #include <sys/smp.h>

kernel/device/ramdrv.c

@@ -2,9 +2,9 @@
 #include <device/ramdrv.h>
 #include <libk/std.h>
 #include <libk/string.h>
-#include <m/status.h>
-#include <m/xdrv_device.h>
 #include <mm/liballoc.h>
+#include <status.h>
+#include <xdrv_device.h>
 
 bool ramdrv_init (struct device* device, void* arg) {
   struct ramdrv_init* init = arg;

kernel/device/terminal.c

@@ -4,10 +4,10 @@
 #include <device/terminal.h>
 #include <libk/std.h>
 #include <limine/requests.h>
-#include <m/status.h>
 #include <mm/liballoc.h>
 #include <proc/capability.h>
 #include <proc/proc.h>
+#include <status.h>
 #include <sys/debug.h>
 
 struct flanterm_context* ft_ctx;

kernel/fs/tarfs.c

@@ -1,3 +1,4 @@
+#include <desc.h>
 #include <fs/path.h>
 #include <fs/tarfs.h>
 #include <fs/vfs.h>
@@ -6,12 +7,11 @@
 #include <libk/std.h>
 #include <libk/string.h>
 #include <limine/requests.h>
-#include <m/fs_desc_buffer.h>
-#include <m/path.h>
-#include <m/status.h>
-#include <m/xdrv_device.h>
 #include <mm/liballoc.h>
+#include <path.h>
+#include <status.h>
 #include <sys/debug.h>
+#include <xdrv_device.h>
 
 static struct tar_file* tar_get_file (struct tarfs* tarfs, const char* filename) {
   for (size_t i = 0; i < TARFS_FILES_MAX; i++) {
@@ -103,8 +103,7 @@ int tarfs_mount (struct vfs_mountpoint* mountpoint, struct proc* proc,
   return ret;
 }
 
-int tarfs_describe (struct vfs_mountpoint* mountpoint, const char* path,
-                    struct fs_desc_buffer* desc) {
+int tarfs_describe (struct vfs_mountpoint* mountpoint, const char* path, struct desc* desc) {
   (void)mountpoint;
 
   const char* filename = path_basename (path);

kernel/fs/tarfs.h

@@ -1,9 +1,9 @@
 #ifndef _KERNEL_FS_TARFS_H
 #define _KERNEL_FS_TARFS_H
 
+#include <desc.h>
 #include <device/device.h>
 #include <libk/std.h>
-#include <m/fs_desc_buffer.h>
 #include <proc/proc.h>
 #include <proc/reschedule.h>
 
@@ -35,8 +35,7 @@ struct vfs_mountpoint;
 
 int tarfs_mount (struct vfs_mountpoint* mountpoint, struct proc* proc, struct reschedule_ctx* rctx);
 
-int tarfs_describe (struct vfs_mountpoint* mountpoint, const char* path,
-                    struct fs_desc_buffer* desc);
+int tarfs_describe (struct vfs_mountpoint* mountpoint, const char* path, struct desc* desc);
 
 int tarfs_read (struct vfs_mountpoint* mountpoint, const char* path, uint8_t* buffer, size_t off,
                 size_t size);

kernel/fs/vfs.c

@@ -6,10 +6,10 @@
 #include <libk/lengthof.h>
 #include <libk/std.h>
 #include <libk/string.h>
-#include <m/status.h>
 #include <mm/liballoc.h>
 #include <proc/proc.h>
 #include <proc/procgroup.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 
@@ -122,7 +122,7 @@ int vfs_close (struct procgroup* procgroup, const char* mountpoint, const char*
 }
 
 int vfs_describe (struct procgroup* procgroup, const char* mountpoint, const char* path,
-                  struct fs_desc_buffer* desc) {
+                  struct desc* desc) {
   struct vfs_mountpoint* vmp = vfs_find_mountpoint (mountpoint);
 
   if (vmp == NULL)

kernel/fs/vfs.h

@@ -1,11 +1,11 @@
 #ifndef _KERNEL_FS_VFS_H
 #define _KERNEL_FS_VFS_H
 
+#include <desc.h>
 #include <device/device.h>
 #include <libk/hash.h>
 #include <libk/list.h>
 #include <libk/std.h>
-#include <m/fs_desc_buffer.h>
 #include <proc/proc.h>
 #include <proc/procgroup.h>
 #include <proc/reschedule.h>
@@ -24,8 +24,7 @@ struct vfs_mountpoint {
     int (*mount) (struct vfs_mountpoint* mountpoint, struct proc* proc,
                   struct reschedule_ctx* rctx);
 
-    int (*describe) (struct vfs_mountpoint* mountpoint, const char* path,
-                     struct fs_desc_buffer* desc);
+    int (*describe) (struct vfs_mountpoint* mountpoint, const char* path, struct desc* desc);
 
     int (*read) (struct vfs_mountpoint* mountpoint, const char* path, uint8_t* buffer, size_t off,
                  size_t size);
@@ -43,7 +42,7 @@ int vfs_create_mountpoint (const char* key, int fs_type, struct device* back_dev
                            struct proc* proc, struct reschedule_ctx* rctx);
 
 int vfs_describe (struct procgroup* procgroup, const char* mountpoint, const char* path,
-                  struct fs_desc_buffer* desc);
+                  struct desc* desc);
 
 int vfs_read (struct procgroup* procgroup, const char* mountpoint, const char* path,
               uint8_t* buffer, size_t off, size_t size);

kernel/proc/proc.c

@@ -1,5 +1,6 @@
 #include <aux/compiler.h>
 #include <aux/elf.h>
+#include <desc.h>
 #include <fs/vfs.h>
 #include <irq/irq.h>
 #include <libk/align.h>
@@ -8,8 +9,6 @@
 #include <libk/std.h>
 #include <libk/string.h>
 #include <limine/requests.h>
-#include <m/fs_desc_buffer.h>
-#include <m/status.h>
 #include <mm/liballoc.h>
 #include <mm/pmm.h>
 #include <proc/capability.h>
@@ -17,6 +16,7 @@
 #include <proc/procgroup.h>
 #include <proc/reschedule.h>
 #include <proc/resource.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 #include <sys/mm.h>
@@ -106,7 +106,7 @@ struct elf_aux proc_load_segments (struct proc* proc, uint8_t* elf) {
 
 struct proc* proc_from_file (struct procgroup* procgroup, const char* mountpoint,
                              const char* path) {
-  struct fs_desc_buffer desc;
+  struct desc desc;
 
   if (vfs_open (procgroup, mountpoint, path) != ST_OK)
     return NULL;

kernel/syscall/syscall.c

@@ -7,19 +7,19 @@
 #include <libk/fieldsizeof.h>
 #include <libk/std.h>
 #include <limine/requests.h>
-#include <m/status.h>
-#include <m/syscall_defs.h>
 #include <mm/pmm.h>
 #include <proc/mail.h>
 #include <proc/mutex.h>
 #include <proc/proc.h>
 #include <proc/procgroup.h>
 #include <proc/resource.h>
+#include <status.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
 #include <sys/mm.h>
 #include <sys/proc.h>
 #include <syscall/syscall.h>
+#include <syscall_defs.h>
 
 #define DEFINE_SYSCALL(name)                                                                       \
   uintptr_t name (struct proc* UNUSED proc, void* UNUSED regs, struct reschedule_ctx* UNUSED rctx, \
@@ -384,13 +384,12 @@ DEFINE_SYSCALL (sys_read) {
   return SYSRESULT (vfs_read (proc->procgroup, mountpoint, subpath, buffer, off, size));
 }
 
-/* int describe (char* path, struct fs_desc_buffer* desc) */
+/* int describe (char* path, struct desc* desc) */
 DEFINE_SYSCALL (sys_describe) {
   uintptr_t uvaddr_path = a1;
   uintptr_t uvaddr_desc = a2;
 
-  struct fs_desc_buffer* desc =
-      sys_get_user_buffer (proc, uvaddr_desc, sizeof (struct fs_desc_buffer));
+  struct desc* desc = sys_get_user_buffer (proc, uvaddr_desc, sizeof (struct desc));
 
   if (desc == NULL)
     return SYSRESULT (-ST_BAD_ADDRESS_SPACE);

libkb/kb.c

@@ -1,6 +1,6 @@
 #include <kb.h>
-#include <m/kb_device.h>
-#include <m/status.h>
+#include <kb_device.h>
+#include <status.h>
 #include <stdint.h>
 #include <system.h>
 

libkb/kb.h

@@ -1,7 +1,7 @@
 #ifndef _LIBKB_KB_H
 #define _LIBKB_KB_H
 
-#include <m/kb_device.h>
+#include <kb_device.h>
 #include <stdint.h>
 
 /* \brief Read key from keyboard

libprocess/process.c

@@ -1,6 +1,6 @@
 #include <liballoc.h>
-#include <m/status.h>
 #include <process.h>
+#include <status.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <system.h>

libsystem/str_status.h

@@ -1,7 +1,7 @@
 #ifndef _LIBSYSTEM_STR_STATUS_H
 #define _LIBSYSTEM_STR_STATUS_H
 
-#include <m/status.h>
+#include <status.h>
 
 static const char* str_status[] = {
     [ST_OK] = "ok",

libsystem/syscall.h

@@ -1,7 +1,7 @@
 #ifndef _LIBMSL_M_SYSCALL_H
 #define _LIBMSL_M_SYSCALL_H
 
-#include <m/syscall_defs.h>
+#include <syscall_defs.h>
 
 #if defined(__x86_64__)
 #include <amd64/syscall.h>

libsystem/system.c

@@ -49,7 +49,7 @@ int read (const char* path, size_t off, uint8_t* buffer, size_t size) {
   return (int)do_syscall (SYS_READ, path, off, buffer, size);
 }
 
-int describe (const char* path, struct fs_desc_buffer* desc) {
+int describe (const char* path, struct desc* desc) {
   return (int)do_syscall (SYS_DESCRIBE, path, desc);
 }
 

libsystem/system.h

@@ -1,7 +1,7 @@
 #ifndef _LIBMSL_M_SYSTEM_H
 #define _LIBMSL_M_SYSTEM_H
 
-#include <m/fs_desc_buffer.h>
+#include <desc.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -63,7 +63,7 @@ int close (const char* path);
 int read (const char* path, size_t off, uint8_t* buffer, size_t size);
 
 /* describe a file */
-int describe (const char* path, struct fs_desc_buffer* desc);
+int describe (const char* path, struct desc* desc);
 
 /* send a message to a procgroup's mail */
 int mail_send (int pgid, void* mesg, size_t mesg_size);

libterminal/terminal.h

@@ -1,8 +1,8 @@
 #ifndef _LIBTERMINAL_TERMINAL_TERMINAL_H
 #define _LIBTERMINAL_TERMINAL_TERMINAL_H
 
-#include <m/terminal_device.h>
 #include <stddef.h>
+#include <terminal_device.h>
 
 /* Print a string onto a graphical terminal. Prints len chars */
 void terminal_print (const char* string, size_t len);