diff --git a/sys/include/file.h b/sys/include/file.h index a364414..5cb4303 100644 --- a/sys/include/file.h +++ b/sys/include/file.h @@ -1,3 +1,4 @@ +#include #define FS_ROOT_INODE 1 #define FS_BSIZE 512 #define FS_NDIRECT 12 @@ -17,9 +18,9 @@ struct superblock { u32 firstlog; u32 firstinode; u32 firstfreemapblock; -} +}; struct dirent { u16 inum; s8 name[FS_DIRSIZ]; -} +}; diff --git a/sys/include/video.h b/sys/include/video.h index f3e663e..333ee4b 100644 --- a/sys/include/video.h +++ b/sys/include/video.h @@ -3,7 +3,7 @@ #include -#define VGA_SIZE 4000 +#define VGA_SIZE 4000 #define VGA_TEXT_SIZE 2000 s32 unused = 0; diff --git a/sys/lib.c b/sys/lib.c index 9b61b4d..96f0625 100644 --- a/sys/lib.c +++ b/sys/lib.c @@ -5,8 +5,7 @@ strlen(const char *str) { size_t i; - for (i = 0; str[i] != NULL; i++) - ; + for (i = 0; str[i] != NULL; i++); return i; } diff --git a/sys/memory.c b/sys/memory.c index be51074..c0ab408 100644 --- a/sys/memory.c +++ b/sys/memory.c @@ -1,10 +1,10 @@ #include void * -malloc(s32 size) +malloc(s32 size) { s32 actual_size = size + sizeof(s32) + sizeof(void *); - + if (start == NULL) { start = (void *) START; @@ -14,9 +14,9 @@ malloc(s32 size) start[3] = '\0'; SIZE(m) = size; - + return USABLE(m); - } + } /* TODO */ -} +} diff --git a/sys/video.c b/sys/video.c index 93de120..94d217a 100644 --- a/sys/video.c +++ b/sys/video.c @@ -9,27 +9,27 @@ vga_write(s8 *sequence, s16 size, s8 flags) for (s16 i = 0; i <= VGA_SIZE; i++) { vga_vidmem[i] = sequence[using_size + i]; - vga_vidmem[++i] = flags; } + vga_vidmem[++i] = flags; } unused = 4001; return; - } + } if (size * 2 + unused >= VGA_SIZE) { s16 needed_space = size * 2; for (s16 i = 0; i <= (unused = VGA_SIZE - needed_space); i++) { vga_vidmem[i] = vga_vidmem[needed_space + i]; - } + } unused--; unused--; - } + } for (s16 i = 0; i < size; i++) { vga_vidmem[unused++] = sequence[i]; vga_vidmem[unused++] = flags; } -} +} void vga_clearscreen(void)