summaryrefslogtreecommitdiff
path: root/kernel/include
diff options
context:
space:
mode:
authorAleksa Vuckovic <aleksa@vuckovic.cc>2023-02-25 07:26:22 +0100
committerAleksa Vuckovic <aleksa@vuckovic.cc>2023-02-25 08:45:12 +0100
commit5ba212fe7123d454414f64d42ec7ff0822458c13 (patch)
treea82f8057cc57b6efb8ac19f9d01c2cc1aebc29c0 /kernel/include
parent239900af293f192931391dc5579afab39a43e6c6 (diff)
ANSI C: // -> /* */
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/ext2.h12
-rw-r--r--kernel/include/idt.h14
-rw-r--r--kernel/include/multiboot2.h4
3 files changed, 15 insertions, 15 deletions
diff --git a/kernel/include/ext2.h b/kernel/include/ext2.h
index 53c6b33..710ad73 100644
--- a/kernel/include/ext2.h
+++ b/kernel/include/ext2.h
@@ -5,7 +5,7 @@
#include <libk/list.h>
struct ext2_superblock_t {
- // base fields
+ /* base fields */
uint32_t inodes_count;
uint32_t blocks_count;
uint32_t superuser_blocks;
@@ -31,7 +31,7 @@ struct ext2_superblock_t {
uint32_t version_major;
uint16_t superuser_id;
uint16_t supergroup_id;
- // extended fields
+ /* extended fields */
uint32_t first_inode;
uint16_t inode_size;
uint16_t superblock_group;
@@ -49,7 +49,7 @@ struct ext2_superblock_t {
uint32_t journal_inode;
uint32_t journal_device;
uint32_t orphan_inode_head;
- // unused
+ /* unused */
};
typedef struct ext2_superblock_t ext2_superblock_t;
@@ -88,7 +88,7 @@ struct ext2_inode_t {
};
typedef struct ext2_inode_t ext2_inode_t;
-// inode type
+/* inode type */
#define TYPE_FIFO 0x1000
#define TYPE_CHAR_DEV 0x2000
#define TYPE_DIR 0x4000
@@ -97,7 +97,7 @@ typedef struct ext2_inode_t ext2_inode_t;
#define TYPE_SYMLINK 0xA000
#define TYPE_SOCKET 0xC000
-// inode permission
+/* inode permission */
#define PERM_OE 0x001
#define PERM_OR 0x002
#define PERM_OW 0x004
@@ -134,7 +134,7 @@ typedef struct dentry_list_t dentry_list_t;
extern ext2_superblock_t *ext2_superblock;
-// size of structs
+/* size of structs */
#define BG_DESC_SIZE 32
#define BLOCK_SIZE (uint32_t)(1024 << ext2_superblock->block_size)
#define INODE_SIZE (ext2_superblock->inode_size)
diff --git a/kernel/include/idt.h b/kernel/include/idt.h
index 22e05ec..2d28be0 100644
--- a/kernel/include/idt.h
+++ b/kernel/include/idt.h
@@ -9,13 +9,13 @@
#define TRAP_GATE 0x8F
struct idt_entry {
- uint16_t offset_1; // offset bits 0..15
- uint16_t selector; // a code segment selector in GDT or LDT
- uint8_t ist; // bits 0..2 holds Interrupt Stack Table offset, rest of bits zero.
- uint8_t type_attributes; // gate type, dpl, and p fields
- uint16_t offset_2; // offset bits 16..31
- uint32_t offset_3; // offset bits 32..63
- uint32_t zero; // reserved
+ uint16_t offset_1; /* offset bits 0..15 */
+ uint16_t selector; /* a code segment selector in GDT or LDT */
+ uint8_t ist; /* bits 0..2 holds Interrupt Stack Table offset, rest of bits zero. */
+ uint8_t type_attributes; /* gate type, dpl, and p fields */
+ uint16_t offset_2; /* offset bits 16..31 */
+ uint32_t offset_3; /* offset bits 32..63 */
+ uint32_t zero; /* reserved */
} __attribute__((packed));
typedef struct idt_entry idt_entry;
diff --git a/kernel/include/multiboot2.h b/kernel/include/multiboot2.h
index 5891a56..c427f3a 100644
--- a/kernel/include/multiboot2.h
+++ b/kernel/include/multiboot2.h
@@ -55,10 +55,10 @@ typedef struct mmap_t mmap_t;
extern mmap_t mmap;
-// multiboot2 magic check
+/* multiboot2 magic check */
#define MB2_MAGIC 0x36D76289
-// multiboot2 tag
+/* multiboot2 tag */
#define MB2_TAG_END 0
#define MB2_TAG_CMDLINE 1
#define MB2_TAG_BOOTLOADER 2