From d94b024b73aeca06de417e0fd3c502495312a8b2 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 7 Dec 2019 13:40:28 +0100
Subject: Added userspace libc and began userspace based shell

---
 src/kernel/fs/marfs/directory.c       | 2 +-
 src/kernel/fs/marfs/disklevel.c       | 2 +-
 src/kernel/fs/marfs/marfs.h           | 2 +-
 src/kernel/fs/marfs/new_file.c        | 2 +-
 src/kernel/fs/marfs/read_whole_file.c | 2 +-
 src/kernel/fs/marfs/sectorlevel.c     | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/kernel/fs/marfs')

diff --git a/src/kernel/fs/marfs/directory.c b/src/kernel/fs/marfs/directory.c
index 210d908..d0a1bff 100644
--- a/src/kernel/fs/marfs/directory.c
+++ b/src/kernel/fs/marfs/directory.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include <mlibc/stdlib.h>
+#include <kernel/lib/stdlib.h>
 #include <kernel/fs/marfs/marfs.h>
 
 uint32_t marfs_new_dir(uint32_t uid)
diff --git a/src/kernel/fs/marfs/disklevel.c b/src/kernel/fs/marfs/disklevel.c
index a902362..106540e 100644
--- a/src/kernel/fs/marfs/disklevel.c
+++ b/src/kernel/fs/marfs/disklevel.c
@@ -14,7 +14,7 @@ void marfs_format(void)
     sb.s_first_chunk = 2 + sb.n_inodes;
 
     // Write to disk
-    marfs_writeSB(&sb);
+    marfs_write_superblock(&sb);
 
     // Initialize the inodes
     for (uint32_t i = 0; i < sb.n_inodes; i++) ata_clear28(interface, 2 + i);
diff --git a/src/kernel/fs/marfs/marfs.h b/src/kernel/fs/marfs/marfs.h
index f197e5b..67b693c 100644
--- a/src/kernel/fs/marfs/marfs.h
+++ b/src/kernel/fs/marfs/marfs.h
@@ -42,7 +42,7 @@ uint8_t marfs_write_mbr(uint8_t *mbr);
 
 struct marfs_superblock *marfs_read_superblock();
 
-uint8_t marfs_writeSB(struct marfs_superblock *sb);
+uint8_t marfs_write_superblock(struct marfs_superblock *sb);
 
 uint32_t marfs_get_free_lba_block(void);
 
diff --git a/src/kernel/fs/marfs/new_file.c b/src/kernel/fs/marfs/new_file.c
index 4503ed1..4fef3b9 100644
--- a/src/kernel/fs/marfs/new_file.c
+++ b/src/kernel/fs/marfs/new_file.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include <mlibc/stdlib.h>
+#include <kernel/lib/stdlib.h>
 #include <kernel/fs/marfs/marfs.h>
 
 static uint8_t last_max_level = 0;
diff --git a/src/kernel/fs/marfs/read_whole_file.c b/src/kernel/fs/marfs/read_whole_file.c
index 324cd9b..85f9bbb 100644
--- a/src/kernel/fs/marfs/read_whole_file.c
+++ b/src/kernel/fs/marfs/read_whole_file.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include <mlibc/stdlib.h>
+#include <kernel/lib/stdlib.h>
 #include <kernel/fs/marfs/marfs.h>
 
 static uint8_t last_max_level = 0;
diff --git a/src/kernel/fs/marfs/sectorlevel.c b/src/kernel/fs/marfs/sectorlevel.c
index d9fa2c4..d905315 100644
--- a/src/kernel/fs/marfs/sectorlevel.c
+++ b/src/kernel/fs/marfs/sectorlevel.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include <mlibc/stdlib.h>
+#include <kernel/lib/stdlib.h>
 #include <kernel/fs/ata_pio.h>
 #include <kernel/fs/marfs/marfs.h>
 
@@ -29,7 +29,7 @@ struct marfs_superblock *marfs_read_superblock()
     return p;
 }
 
-uint8_t marfs_writeSB(struct marfs_superblock *sb)
+uint8_t marfs_write_superblock(struct marfs_superblock *sb)
 {
     sb_cache = *sb;
     return ata_write28(interface, 1, (uint8_t *) sb);
-- 
cgit v1.2.3