1 files changed, 18 insertions, 24 deletions

diff --git a/src/kernel/fs/marfs/marfs.h b/src/kernel/fs/marfs/marfs.h
index ba6f0b3..f197e5b 100644
--- a/src/kernel/fs/marfs/marfs.h
+++ b/src/kernel/fs/marfs/marfs.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-struct marfs_SUPERBLOCK {
+struct marfs_superblock {
     uint64_t signature;
     uint32_t n_inodes;
     uint32_t n_chunks;
@@ -12,7 +12,7 @@ struct marfs_SUPERBLOCK {
     uint32_t s_first_chunk;
 } __attribute__((packed));
 
-struct marfs_INODE {
+struct marfs_inode {
     uint64_t size;
     uint32_t creation_time;
     uint32_t last_mod_time;
@@ -24,41 +24,35 @@ struct marfs_INODE {
     uint32_t ext_3;
     uint32_t ext_4;
     uint32_t uid;
-    uint8_t isApp;
-    uint8_t isDir;
-    uint8_t isUsed;
+    uint8_t is_app;
+    uint8_t is_dir;
+    uint8_t is_used;
 } __attribute__((packed));
 
-enum marfs_RESERVED_INODES {
-    marfs_INODE_JBOOT2,
-    marfs_INODE_KERNEL,
-    marfs_INODE_ROOT
-};
-
-struct ATA_INTERFACE *iface;
-struct marfs_SUPERBLOCK sb_cache;
-uint32_t maxLBA;
+struct ata_interface *interface;
+struct marfs_superblock sb_cache;
+uint32_t max_lba;
 
 // marfs_sectorlevel.c
-uint8_t marfs_init(struct ATA_INTERFACE *iface);
+uint8_t marfs_init(struct ata_interface *interface);
 
 uint32_t marfs_get_max_lba(void);
 
 uint8_t marfs_write_mbr(uint8_t *mbr);
 
-struct marfs_SUPERBLOCK *marfs_read_superblock();
+struct marfs_superblock *marfs_read_superblock();
 
-uint8_t marfs_writeSB(struct marfs_SUPERBLOCK *sb);
+uint8_t marfs_writeSB(struct marfs_superblock *sb);
 
 uint32_t marfs_get_free_lba_block(void);
 
-uint8_t marfs_mark_block_as_used(uint32_t LBAsector);
+uint8_t marfs_mark_block_as_used(uint32_t lba_sector);
 
-uint8_t marfs_mark_block_as_free(uint32_t LBAsector);
+uint8_t marfs_mark_block_as_free(uint32_t lba_sector);
 
 uint32_t marfs_get_free_lba_inode(void);
 
-void marfs_mark_inode_as_free(uint32_t LBAsector);
+void marfs_mark_inode_as_free(uint32_t lba_sector);
 
 // marfs_disklevel.c
 void marfs_format(void);
@@ -69,13 +63,13 @@ uint32_t marfs_new_file(uint64_t size, uint8_t *data, uint32_t uid, uint8_t exec
 // marfs_dir.c
 uint32_t marfs_new_dir(uint32_t uid);
 
-void marfs_add_to_dir(uint32_t LBAinode, char *filename, uint32_t lba);
+void marfs_add_to_dir(uint32_t lba_inode, char *filename, uint32_t lba);
 
 // marfs_read_whole_file.c
-uint32_t marfs_get_block(struct marfs_INODE *inode, uint32_t i);
+uint32_t marfs_get_block(struct marfs_inode *inode, uint32_t i);
 
-void marfs_read_whole_file(uint32_t LBAinode, uint8_t *buffer);
+void marfs_read_whole_file(uint32_t lba_inode, uint8_t *buffer);
 
-uint8_t *marfs_allocate_and_read_whole_file(uint32_t LBAinode);
+uint8_t *marfs_allocate_and_read_whole_file(uint32_t lba_inode);
 
 #endif