Merge pull request #113 from KaiNorberg/develop

Develop

Author: KaiNorberg

include/kernel/cpu/ipi.h

@@ -56,7 +56,7 @@ typedef struct ipi_chip
  */
 typedef struct
 {
-    void* private;
+    void* data;
 } ipi_func_data_t;
 
 /**
@@ -73,7 +73,7 @@ typedef void (*ipi_func_t)(ipi_func_data_t* data);
 typedef struct ipi
 {
     ipi_func_t func;
-    void* private;
+    void* data;
 } ipi_t;
 
 /**
@@ -158,15 +158,15 @@ uint64_t ipi_chip_amount(void);
  * @param cpu The specified CPU, check `ipi_flags_t`.
  * @param flags The flags for how to send the IPI.
  * @param func The function to execute on target CPU(s).
- * @param private The private data to pass to the function, will be found in `irq_func_data_t->private`.
+ * @param private The private data to pass to the function, will be found in `irq_func_data_t->data`.
  * @return On success, `0`. On failure, `ERR` and `errno` is set to:
  * - `EINVAL`: Invalid parameters.
  * - `ENODEV`: No IPI chip is registered.
  * - `ENOSYS`: The registered IPI chip does not have a `notify` function.
  * - `EBUSY`: The target CPU's IPI queue is full, some or all IPIs could not be sent.
  * - Other errors returned by the IPI chip's `notify` function.
  */
-uint64_t ipi_send(cpu_t* cpu, ipi_flags_t flags, ipi_func_t func, void* private);
+uint64_t ipi_send(cpu_t* cpu, ipi_flags_t flags, ipi_func_t func,  void* data);
 
 /**
  * @brief Wake up one or more CPUs.

include/kernel/cpu/irq.h

@@ -64,7 +64,7 @@ typedef struct
 {
     interrupt_frame_t* frame;
     irq_virt_t virt;
-    void* private;
+    void* data;
 } irq_func_data_t;
 
 /**
@@ -79,7 +79,7 @@ typedef struct
 {
     list_entry_t entry;
     irq_func_t func;
-    void* private;
+    void* data;
     irq_virt_t virt;
 } irq_handler_t;
 
@@ -127,7 +127,7 @@ typedef struct irq_domain
 {
     list_entry_t entry;
     irq_chip_t* chip;
-    void* private;
+    void* data;
     irq_phys_t start; ///< Inclusive
     irq_phys_t end;   ///< Exclusive
 } irq_domain_t;
@@ -222,14 +222,14 @@ uint64_t irq_virt_set_affinity(irq_virt_t virt, cpu_t* cpu);
  * @param chip The IRQ chip to register.
  * @param start The start of the physical IRQ range.
  * @param end The end of the physical IRQ range.
- * @param private Private data for the IRQ chip, will be found in `irq_t->domain->private`.
+ * @param private Private data for the IRQ chip, will be found in `irq_t->domain->data`.
  * @return On success, `0`. On failure, `ERR` and `errno` is set to:
  * - `EINVAL`: Invalid parameters.
  * - `EEXIST`: A chip with a domain overlapping the given range is already registered.
  * - `ENOMEM`: Memory allocation failed.
  * - Other errors as returned by the IRQ chip's `enable` function.
  */
-uint64_t irq_chip_register(irq_chip_t* chip, irq_phys_t start, irq_phys_t end, void* private);
+uint64_t irq_chip_register(irq_chip_t* chip, irq_phys_t start, irq_phys_t end,  void* data);
 
 /**
  * @brief Unregister all instances of the given IRQ chip within the specified range.
@@ -265,7 +265,7 @@ uint64_t irq_chip_amount(void);
  * - `ENOMEM`: Memory allocation failed.
  * - Other errors as returned by the IRQ chip's `enable` function.
  */
-uint64_t irq_handler_register(irq_virt_t virt, irq_func_t func, void* private);
+uint64_t irq_handler_register(irq_virt_t virt, irq_func_t func,  void* data);
 
 /**
  * @brief Unregister an IRQ handler.

include/kernel/cpu/regs.h

@@ -11,7 +11,7 @@
 #define XCR0_ZMM16_32_ENABLE (1 << 7)
 
 #define MSR_LAPIC 0x1B
-#define MSR_IA32_TSC_AUX 0xC0000103
+#define MSR_TSC_AUX 0xC0000103
 #define MSR_EFER 0xC0000080
 #define MSR_STAR 0xC0000081
 #define MSR_LSTAR 0xC0000082

include/kernel/drivers/abstract/fb.h

@@ -76,7 +76,7 @@ typedef struct fb
 {
     char name[MAX_PATH];
     const fb_ops_t* ops;
-    void* private;
+    void* data;
     dentry_t* dir;
     list_t files;
 } fb_t;
@@ -89,7 +89,7 @@ typedef struct fb
  * @param private Private data for the framebuffer.
  * @return On success, the new framebuffer. On failure, `NULL` and `errno` is set.
  */
-fb_t* fb_new(const char* name, const fb_ops_t* ops, void* private);
+fb_t* fb_new(const char* name, const fb_ops_t* ops,  void* data);
 
 /**
  * @brief Frees a framebuffer.

include/kernel/fs/dentry.h

@@ -110,7 +110,7 @@ typedef struct dir_ctx
      */
     bool (*emit)(dir_ctx_t* ctx, const char* name, ino_t number, itype_t type);
     size_t pos;    ///< The current position in the directory, can be used to skip entries.
-    void* private; ///< Private data that the filesystem can use to conveniently pass data.
+    void* data; ///< Private data that the filesystem can use to conveniently pass data.
     size_t index;  ///< An index that the filesystem can use for its own purposes.
 } dir_ctx_t;
 
@@ -162,7 +162,7 @@ typedef struct dentry
     list_t children;
     superblock_t* superblock;
     const dentry_ops_t* ops;
-    void* private;
+    void* data;
     struct dentry* next;          ///< Next dentry in the dentry cache hash bucket.
     _Atomic(uint64_t) mountCount; ///< Number of mounts targeting this dentry.
     rcu_entry_t rcu;              ///< RCU entry for deferred cleanup.

include/kernel/fs/devfs.h

@@ -39,7 +39,7 @@ void devfs_init(void);
  * @param private Private data to store in the inode of the new directory, can be `NULL`.
  * @return On success, the new devfs directory. On failure, `NULL` and `errno` is set.
  */
-dentry_t* devfs_dir_new(dentry_t* parent, const char* name, const inode_ops_t* inodeOps, void* private);
+dentry_t* devfs_dir_new(dentry_t* parent, const char* name, const inode_ops_t* inodeOps,  void* data);
 
 /**
  * @brief Create a new file inside a mounted devfs instance.
@@ -52,7 +52,7 @@ dentry_t* devfs_dir_new(dentry_t* parent, const char* name, const inode_ops_t* i
  * @return On success, the new devfs file. On failure, `NULL` and `errno` is set.
  */
 dentry_t* devfs_file_new(dentry_t* parent, const char* name, const inode_ops_t* inodeOps, const file_ops_t* fileOps,
-    void* private);
+     void* data);
 
 /**
  * @brief Create a new symbolic link inside a mounted devfs instance.
@@ -63,7 +63,7 @@ dentry_t* devfs_file_new(dentry_t* parent, const char* name, const inode_ops_t*
  * @param private Private data to store in the inode of the new symbolic link, can be `NULL`.
  * @return On success, the new devfs symbolic link. On failure, `NULL` and `errno` is set.
  */
-dentry_t* devfs_symlink_new(dentry_t* parent, const char* name, const inode_ops_t* inodeOps, void* private);
+dentry_t* devfs_symlink_new(dentry_t* parent, const char* name, const inode_ops_t* inodeOps,  void* data);
 
 /**
  * @brief Descriptor for batch file creation.
@@ -74,7 +74,7 @@ typedef struct devfs_file_desc
     const char* name;            ///< Name of the file, `NULL` marks end of array.
     const inode_ops_t* inodeOps; ///< Inode operations, can be `NULL`.
     const file_ops_t* fileOps;   ///< File operations, can be `NULL`.
-    void* private;               ///< Private data to store in the inode of the file.
+    void* data;               ///< Private data to store in the inode of the file.
 } devfs_file_desc_t;
 
 /**

include/kernel/fs/file.h

@@ -43,7 +43,7 @@ typedef struct file
     inode_t* inode;
     path_t path;
     const file_ops_t* ops;
-    void* private;
+    void* data;
 } file_t;
 
 /**

include/kernel/fs/filesystem.h

@@ -65,7 +65,7 @@ typedef struct filesystem
      * @param private Private data for the filesystem's mount function.
      * @return On success, the root dentry of the mounted filesystem. On failure, `NULL` and `errno` is set.
      */
-    dentry_t* (*mount)(filesystem_t* fs, const char* details, void* private);
+    dentry_t* (*mount)(filesystem_t* fs, const char* details,  void* data);
 } filesystem_t;
 
 /**s

include/kernel/fs/inode.h

@@ -58,7 +58,7 @@ typedef struct inode
     time_t modifyTime; ///< Unix time stamp for last file content alteration.
     time_t changeTime; ///< Unix time stamp for the last file metadata alteration.
     time_t createTime; ///< Unix time stamp for the inode creation.
-    void* private;
+    void* data;
     superblock_t* superblock;
     const inode_ops_t* ops;
     const file_ops_t* fileOps;

include/kernel/fs/namespace.h

@@ -136,7 +136,7 @@ bool namespace_rcu_traverse(namespace_t* ns, mount_t** mount, dentry_t** dentry)
  * - Other errors as returned by the filesystem's `mount()` operation or `mount_new()`.
  */
 mount_t* namespace_mount(namespace_t* ns, path_t* target, filesystem_t* fs, const char* options, mode_t mode,
-    void* private);
+     void* data);
 
 /**
  * @brief Bind a source path to a target path in a namespace.