summaryrefslogtreecommitdiff
path: root/src/c
diff options
context:
space:
mode:
Diffstat (limited to 'src/c')
-rw-r--r--src/c/gdt.c35
-rw-r--r--src/c/heap.c61
-rw-r--r--src/c/idt.c39
-rw-r--r--src/c/irq_handler.c (renamed from src/c/irq.c)67
-rw-r--r--src/c/kernel.c5
-rw-r--r--src/c/keyboard.c5
-rw-r--r--src/c/keymap.c3
-rw-r--r--src/c/paging.c7
-rw-r--r--src/c/stack_protector.c3
-rw-r--r--src/c/stdio.c15
-rw-r--r--src/c/string.c23
-rw-r--r--src/c/timer.c7
-rw-r--r--src/c/tty.c19
-rw-r--r--src/c/vga.c23
14 files changed, 136 insertions, 176 deletions
diff --git a/src/c/gdt.c b/src/c/gdt.c
index e3d2b4c..8791cbe 100644
--- a/src/c/gdt.c
+++ b/src/c/gdt.c
@@ -1,46 +1,31 @@
+#include<source/gdt.h>
#include<types.h>
-struct gdt_entry
-{
- uint16_t limit;
- uint16_t base1;
- uint8_t base2;
- uint8_t access;
- uint8_t limit_flags;
- uint8_t base3;
-} __attribute__((packed));
-
-struct gdt_pointer
-{
- uint16_t size;
- uint32_t offset;
-} __attribute__((packed));
-
extern void load_gdt(struct gdt_pointer *gdtp);
struct gdt_entry gdt[5];
struct gdt_pointer gdtp;
-void init_gdt_entry(size_t num, uint32_t limit, uint32_t base, uint8_t access, uint8_t limit_flags)
+void init_gdt_entry(size_t num, uint16_t limit, uint32_t base, uint8_t access, uint8_t limit_flags)
{
gdt[num].limit=limit;
gdt[num].base1=(base & 0xffff);
- gdt[num].base2=(base & 0xff0000) >> 16;
+ gdt[num].base2=(uint8_t)((base & 0xff0000) >> 16);
gdt[num].access=access;
gdt[num].limit_flags=limit_flags;
- gdt[num].base3=(base & 0xff000000) >> 24;
+ gdt[num].base3=(uint8_t)((base & 0xff000000) >> 24);
}
-void init_gdt_table()
+void init_gdt_table(void)
{
gdtp.size=sizeof(gdt)-1;
gdtp.offset=(uint32_t)&gdt;
- init_gdt_entry(0,0,0,0,0); // null segment
- init_gdt_entry(1,0xffffffff,0,0b10011010,0b11001111); // code segment
- init_gdt_entry(2,0xffffffff,0,0b10010010,0b11001111); // data segment
- init_gdt_entry(3,0xffffffff,0,0b11111010,0b11001111); // user mode code segment
- init_gdt_entry(4,0xffffffff,0,0b11110010,0b11001111); // user mode data segment
+ init_gdt_entry(0,0,0,0,0); // null segment
+ init_gdt_entry(1,0xffff,0,0x9a,0xcf); // code segment
+ init_gdt_entry(2,0xffff,0,0x92,0xcf); // data segment
+ init_gdt_entry(3,0xffff,0,0xfa,0xcf); // user mode code segment
+ init_gdt_entry(4,0xffff,0,0xf2,0xcf); // user mode data segment
load_gdt(&gdtp);
}
diff --git a/src/c/heap.c b/src/c/heap.c
index 99d0a37..aaa35dc 100644
--- a/src/c/heap.c
+++ b/src/c/heap.c
@@ -1,22 +1,13 @@
+#include<source/heap.h>
#include<types.h>
-typedef struct _KHEAPBLOCKBM {
- struct _KHEAPBLOCKBM *next;
- uint32_t size;
- uint32_t used;
- uint32_t bsize;
- uint32_t lfb;
-} KHEAPBLOCKBM;
-
-typedef struct _KHEAPBM {
- KHEAPBLOCKBM *fblock;
-} KHEAPBM;
-
-void k_heapBMInit(KHEAPBM *heap) {
+void k_heapBMInit(KHEAPBM *heap)
+{
heap->fblock = 0;
}
-int k_heapBMAddBlock(KHEAPBM *heap, uintptr_t addr, uint32_t size, uint32_t bsize) {
+int k_heapBMAddBlock(KHEAPBM *heap, uintptr_t addr, uint32_t size, uint32_t bsize)
+{
KHEAPBLOCKBM *b;
uint32_t bcnt;
uint32_t x;
@@ -48,13 +39,16 @@ int k_heapBMAddBlock(KHEAPBM *heap, uintptr_t addr, uint32_t size, uint32_t bsiz
return 1;
}
-static uint8_t k_heapBMGetNID(uint8_t a, uint8_t b) {
+static uint8_t k_heapBMGetNID(uint8_t a, uint8_t b);
+static uint8_t k_heapBMGetNID(uint8_t a, uint8_t b)
+{
uint8_t c;
- for (c = a + 1; c == b || c == 0; ++c);
+ for (c=a+1;c==b||c==0;++c);
return c;
}
-void *k_heapBMAlloc(KHEAPBM *heap, uint32_t size) {
+void *k_heapBMAlloc(KHEAPBM *heap, uint32_t size)
+{
KHEAPBLOCKBM *b;
uint8_t *bm;
uint32_t bcnt;
@@ -63,33 +57,34 @@ void *k_heapBMAlloc(KHEAPBM *heap, uint32_t size) {
uint8_t nid;
/* iterate blocks */
- for (b = heap->fblock; b; b = b->next) {
+ for (b = heap->fblock; b; b = b->next)
+ {
/* check if block has enough room */
- if (b->size - (b->used * b->bsize) >= size) {
+ if (b->size - (b->used * b->bsize) >= size)
+ {
bcnt = b->size / b->bsize;
bneed = (size / b->bsize) * b->bsize < size ? size / b->bsize + 1 : size / b->bsize;
bm = (uint8_t*)&b[1];
- for (x = (b->lfb + 1 >= bcnt ? 0 : b->lfb + 1); x != b->lfb; ++x) {
+ for (x = (b->lfb + 1 >= bcnt ? 0 : b->lfb + 1); x != b->lfb; ++x)
+ {
/* just wrap around */
- if (x >= bcnt) {
- x = 0;
- }
+ if (x >= bcnt) x = 0;
- if (bm[x] == 0) {
+ if (bm[x] == 0)
+ {
/* count free blocks */
for (y = 0; bm[x + y] == 0 && y < bneed && (x + y) < bcnt; ++y);
/* we have enough, now allocate them */
- if (y == bneed) {
+ if (y == bneed)
+ {
/* find ID that does not match left or right */
nid = k_heapBMGetNID(bm[x - 1], bm[x + y]);
/* allocate by setting id */
- for (z = 0; z < y; ++z) {
- bm[x + z] = nid;
- }
+ for (z = 0; z < y; ++z) bm[x + z] = nid;
/* optimization */
b->lfb = (x + bneed) - 2;
@@ -110,7 +105,8 @@ void *k_heapBMAlloc(KHEAPBM *heap, uint32_t size) {
return 0;
}
-void k_heapBMFree(KHEAPBM *heap, void *ptr) {
+void k_heapBMFree(KHEAPBM *heap, void *ptr)
+{
KHEAPBLOCKBM *b;
uintptr_t ptroff;
uint32_t bi, x;
@@ -118,7 +114,8 @@ void k_heapBMFree(KHEAPBM *heap, void *ptr) {
uint8_t id;
uint32_t max;
- for (b = heap->fblock; b; b = b->next) {
+ for (b = heap->fblock; b; b = b->next)
+ {
if ((uintptr_t)ptr > (uintptr_t)b && (uintptr_t)ptr < (uintptr_t)b + sizeof(KHEAPBLOCKBM) + b->size) {
/* found block */
ptroff = (uintptr_t)ptr - (uintptr_t)&b[1]; /* get offset to get block */
@@ -130,9 +127,7 @@ void k_heapBMFree(KHEAPBM *heap, void *ptr) {
id = bm[bi];
/* oddly.. GCC did not optimize this */
max = b->size / b->bsize;
- for (x = bi; bm[x] == id && x < max; ++x) {
- bm[x] = 0;
- }
+ for (x = bi; bm[x] == id && x < max; ++x) bm[x] = 0;
/* update free block count */
b->used -= x - bi;
return;
diff --git a/src/c/idt.c b/src/c/idt.c
index 843c9da..c27743f 100644
--- a/src/c/idt.c
+++ b/src/c/idt.c
@@ -1,54 +1,29 @@
+#include<source/idt.h>
#include<types.h>
-#include<irq.h>
+#include<source/irq.h>
#include<asm.h>
-#define INTERRUPT_GATE_32 0x8E
-
-#define KERNEL_CODE 0x08
-#define KERNEL_DATA 0x10
-
-#define PIC1_COMMAND_PORT 0x20
-#define PIC1_DATA_PORT 0x21
-#define PIC2_COMMAND_PORT 0xA0
-#define PIC2_DATA_PORT 0xA1
-
-struct idt_entry
-{
- uint16_t offset1;
- uint16_t selector;
- uint8_t zero;
- uint8_t type_attr;
- uint16_t offset2;
-} __attribute__((packed));
-
-struct idt_pointer
-{
- uint16_t size;
- uint32_t offset;
-} __attribute__((packed));
-
extern void load_idt(struct idt_pointer *idtp);
-extern void keyboard_irq();
struct idt_entry idt[256];
struct idt_pointer idtp;
void init_idt_entry(size_t num, uint32_t offset, uint16_t selector, uint8_t type_attr)
{
- idt[num].offset1=(offset & 0xffff);
+ idt[num].offset1=(uint16_t)(offset & 0xffff);
idt[num].selector=selector;
idt[num].zero=0;
idt[num].type_attr=type_attr;
- idt[num].offset2=(offset & 0xffff0000)>>16;
+ idt[num].offset2=(uint16_t)((offset & 0xffff0000)>>16);
}
-void add_idt_entry(size_t num,uint32_t offset)
+void add_idt_entry(size_t num, uint32_t offset)
{
init_idt_entry(num,offset,KERNEL_CODE,INTERRUPT_GATE_32);
}
-void init_pic()
+void init_pic(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x11);
ioport_out(PIC2_COMMAND_PORT, 0x11);
@@ -63,7 +38,7 @@ void init_pic()
ioport_out(PIC1_DATA_PORT, 0xFC);
}
-void init_idt_table()
+void init_idt_table(void)
{
init_pic();
add_idt_entry(0,(uint32_t)irq0);
diff --git a/src/c/irq.c b/src/c/irq_handler.c
index 62b53ee..797639d 100644
--- a/src/c/irq.c
+++ b/src/c/irq_handler.c
@@ -1,4 +1,5 @@
-#include<stdio.h>
+#include<source/irq_handler.h>
+#include<source/stdio.h>
#include<asm.h>
#define INTERRUPT_GATE_32 0x8e
@@ -11,224 +12,224 @@
#define PIC2_COMMAND_PORT 0xA0
#define PIC2_DATA_PORT 0xA1
-void irq0_handler()
+void irq0_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 0.\n");
printf("Divide-by-zero Error\n");
}
-void irq1_handler()
+void irq1_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 1.\n");
printf("Debug\n");
}
-void irq2_handler()
+void irq2_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 2.\n");
printf("Non-maskable Interrupt\n");
}
-void irq3_handler()
+void irq3_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 3.\n");
printf("Breakpoint\n");
}
-void irq4_handler()
+void irq4_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 4.\n");
printf("Overflow\n");
}
-void irq5_handler()
+void irq5_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 5.\n");
printf("Bound Range Exceeded\n");
}
-void irq6_handler()
+void irq6_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 6.\n");
printf("Invalid Opcode\n");
}
-void irq7_handler()
+void irq7_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 7.\n");
printf("Device Not Available\n");
}
-void irq8_handler()
+void irq8_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 8.\n");
printf("Double Fault\n");
}
-void irq9_handler()
+void irq9_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 9.\n");
printf("Coprocessor Segment Overrun\n");
}
-void irq10_handler()
+void irq10_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 10.\n");
printf("Invalid TSS\n");
}
-void irq11_handler()
+void irq11_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 11.\n");
printf("Segment Not Present\n");
}
-void irq12_handler()
+void irq12_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 12.\n");
printf("Stack-Segment Fault\n");
}
-void irq13_handler()
+void irq13_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 13.\n");
printf("General Protection Fault\n");
}
-void irq14_handler()
+void irq14_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 14.\n");
printf("Page Fault\n");
}
-void irq15_handler()
+void irq15_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 15.\n");
printf("Reserved\n");
}
-void irq16_handler()
+void irq16_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 16.\n");
printf("x87 Floating-Point Exception\n");
}
-void irq17_handler()
+void irq17_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 17.\n");
printf("Alignment Check\n");
}
-void irq18_handler()
+void irq18_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 18.\n");
printf("Machine Check\n");
}
-void irq19_handler()
+void irq19_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 19.\n");
printf("SIMD Floating-Point ExceptionM/#XF\n");
}
-void irq20_handler()
+void irq20_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 20.\n");
printf("Virtualization Exception\n");
}
-void irq21_handler()
+void irq21_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 21.\n");
printf("Reserved\n");
}
-void irq22_handler()
+void irq22_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 22.\n");
printf("Reserved\n");
}
-void irq23_handler()
+void irq23_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 23.\n");
printf("Reserved\n");
}
-void irq24_handler()
+void irq24_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 24.\n");
printf("Reserved\n");
}
-void irq25_handler()
+void irq25_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 25.\n");
printf("Reserved\n");
}
-void irq26_handler()
+void irq26_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 26.\n");
printf("Reserved\n");
}
-void irq27_handler()
+void irq27_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 27.\n");
printf("Reserved\n");
}
-void irq28_handler()
+void irq28_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 28.\n");
printf("Reserved\n");
}
-void irq29_handler()
+void irq29_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 29.\n");
printf("Reserved\n");
}
-void irq30_handler()
+void irq30_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 30.\n");
printf("Security Exception\n");
}
-void irq31_handler()
+void irq31_handler(void)
{
ioport_out(PIC1_COMMAND_PORT, 0x20);
printf("Interrupt 31.\n");
diff --git a/src/c/kernel.c b/src/c/kernel.c
index 849a356..1142a23 100644
--- a/src/c/kernel.c
+++ b/src/c/kernel.c
@@ -1,11 +1,12 @@
-#include<heap.h>
+#include<source/kernel.h>
+#include<source/heap.h>
void terminal_initialize(void);
void init_idt_table(void);
void init_keyboard(void);
void init_timer(uint32_t frequency);
void prompt(void);
-void set_paging();
+void set_paging(void);
void kernel_main(void)
{
diff --git a/src/c/keyboard.c b/src/c/keyboard.c
index 2218f09..8af463b 100644
--- a/src/c/keyboard.c
+++ b/src/c/keyboard.c
@@ -1,6 +1,7 @@
+#include<source/keyboard.h>
#include<types.h>
#include<asm.h>
-#include<stdio.h>
+#include<source/stdio.h>
#define BUFFER_SIZE 200
#define BUFFER_LOG 200
@@ -21,7 +22,7 @@ size_t buffer_index=0;
void previous_field(void);
void tty(char *buffer);
void prompt(void);
-void clear();
+void clear(void);
void us_en(char keymap[]);
void us_en_shift(char keymap[]);
diff --git a/src/c/keymap.c b/src/c/keymap.c
index 168d5f9..d9315b6 100644
--- a/src/c/keymap.c
+++ b/src/c/keymap.c
@@ -1,3 +1,5 @@
+#include<source/keymap.h>
+
void us_en(char keymap[])
{
keymap[0x01]=' '; //escape pressed
@@ -171,6 +173,7 @@ void us_en(char keymap[])
keymap[0xD7]=' '; //F11 released
keymap[0xD8]=' '; //F12 released
}
+
void us_en_shift(char keymap[])
{
keymap[0x01]=' '; //escape pressed
diff --git a/src/c/paging.c b/src/c/paging.c
index f08530d..f7b6e6a 100644
--- a/src/c/paging.c
+++ b/src/c/paging.c
@@ -1,11 +1,12 @@
+#include<source/paging.h>
#include<types.h>
extern void loadPageDirectory(uint32_t*);
-extern void enablePaging();
+extern void enablePaging(void);
uint32_t page_directory[1024] __attribute__((aligned(4096)));
-void set_pd()
+void set_pd(void)
{
//set each entry to not present
for(size_t i=0;i<1024;i++)
@@ -37,7 +38,7 @@ void set_pt(size_t num,uint32_t address)
// attributes: supervisor level, read/write, present
}
-void set_paging()
+void set_paging(void)
{
set_pd();
for(size_t i=0;i<1024;i++) set_pt(i,0x00400000 * i); // all 4GB mapped
diff --git a/src/c/stack_protector.c b/src/c/stack_protector.c
index 37f7cda..e2d7ab2 100644
--- a/src/c/stack_protector.c
+++ b/src/c/stack_protector.c
@@ -1,5 +1,6 @@
+#include<source/stack_protector.h>
#include<stdint.h>
-#include<stdio.h>
+#include<source/stdio.h>
#if UINT32_MAX == UINTPTR_MAX
#define STACK_CHK_GUARD 0xe2dee396
diff --git a/src/c/stdio.c b/src/c/stdio.c
index 3a51e9a..e47f43d 100644
--- a/src/c/stdio.c
+++ b/src/c/stdio.c
@@ -1,13 +1,10 @@
+#include<source/stdio.h>
#include<types.h>
-#include<string.h>
#include<stdarg.h>
+#include<source/string.h>
+#include<source/vga.h>
-void terminal_putchar(char c);
-void terminal_writestring(char* data);
-void terminal_writeint(uint32_t data);
-void terminal_writefloat(double num);
-
-void printf(char *str, ...)
+void printf(const char *str, ...)
{
size_t count=0;
for(size_t i=0;str[i]!='\0';i++) if(str[i]=='%') count++;
@@ -22,11 +19,11 @@ void printf(char *str, ...)
i++;
if(str[i]=='c') terminal_putchar((char)va_arg(list,int));
else if(str[i]=='s') terminal_writestring(va_arg(list,char*));
- else if(str[i]=='d') terminal_writeint(va_arg(list,int));
+ else if(str[i]=='d') terminal_writeint((uint32_t)va_arg(list,int));
else if(str[i]=='f') terminal_writefloat(va_arg(list,double));
else
{
- terminal_writestring("wrong format using print function\n");
+ terminal_writestring("Wrong format using print function\n");
return;
}
}
diff --git a/src/c/string.c b/src/c/string.c
index ce33528..201353f 100644
--- a/src/c/string.c
+++ b/src/c/string.c
@@ -1,6 +1,7 @@
+#include<source/string.h>
#include<types.h>
-size_t stringlen(char *str)
+size_t stringlen(char* str)
{
size_t i;
@@ -9,7 +10,7 @@ size_t stringlen(char *str)
return i;
}
-bool stringcmp(char *str1,char *str2)
+bool stringcmp(const char* str1, const char* str2)
{
size_t i;
for(i=0;str1[i]||str2[i];i++) if(str1[i]!=str2[i]) return 0;
@@ -17,7 +18,7 @@ bool stringcmp(char *str1,char *str2)
return 0;
}
-void stringcat(char *str1,char *str2)
+void stringcat(char* str1, const char* str2)
{
char *tmp=str1;
while(*tmp) tmp++;
@@ -25,7 +26,7 @@ void stringcat(char *str1,char *str2)
*tmp=*str2;
}
-void stringcpy(char *str1,char *str2)
+void stringcpy(char *str1, const char *str2)
{
for(size_t i=0;str2[i]!='\0';i++) str1[i]=str2[i];
}
@@ -42,7 +43,7 @@ void stringrev(char *str)
}
}
-uint32_t stoi(const char *str)
+uint32_t stoi(const char* str)
{
uint32_t num=0;
@@ -50,26 +51,26 @@ uint32_t stoi(const char *str)
{
if(str[i]<'0'||str[i]>'9') return num;
num*=10;
- num+=str[i]-'0';
+ num+=(uint32_t)(str[i]-'0');
}
return num;
}
-void itos(uint32_t num,char *str)
+void itos(uint32_t num, char* str)
{
if(num==0) stringcpy(str,"0");
else
{
size_t i=0;
- for(;num>0;num/=10,i++) str[i]='0'+num%10;
+ for(;num>0;num/=10,i++) str[i]=(char)('0'+num%10);
str[i]='\0';
stringrev(str);
}
}
-double stof(const char *str)
+double stof(const char* str)
{
double num=0;
@@ -95,7 +96,7 @@ double stof(const char *str)
}
const size_t decimals=7;
-void ftos(double num, char *str)
+void ftos(double num, char* str)
{
itos((uint32_t)num,str);
@@ -107,7 +108,7 @@ void ftos(double num, char *str)
{
num-=(uint32_t)num;
num*=10;
- c[0]=(uint32_t)num+'0';
+ c[0]=(char)(num+'0');
stringcat(str,c);
}
}
diff --git a/src/c/timer.c b/src/c/timer.c
index 390e512..412e443 100644
--- a/src/c/timer.c
+++ b/src/c/timer.c
@@ -1,15 +1,14 @@
+#include<source/timer.h>
#include<types.h>
#include<asm.h>
-#include<stdio.h>
-
-void add_idt_entry(size_t num,uint32_t offset);
+#include<source/stdio.h>
uint32_t tick=0;
const uint32_t TICKS_PER_SECOND=50;
extern uint32_t time;
uint32_t time=0;
-void timer_handler()
+void timer_handler(void)
{
tick++;
if(tick==TICKS_PER_SECOND)
diff --git a/src/c/tty.c b/src/c/tty.c
index 62ccd02..a05773f 100644
--- a/src/c/tty.c
+++ b/src/c/tty.c
@@ -1,11 +1,10 @@
+#include<source/tty.h>
#include<types.h>
-#include<string.h>
-#include<stdio.h>
-#include<vga.h>
+#include<source/string.h>
+#include<source/stdio.h>
+#include<source/vga.h>
-#define CMD_LENGTH 20
-void clear();
extern uint32_t time;
size_t pieces(char pieces[][CMD_LENGTH],char *buffer)
@@ -48,7 +47,7 @@ void merge(char parts[][CMD_LENGTH])
printf("%s\n",str1);
}
-void ls()
+void ls(void)
{
printf("Filesystem not implemented yet\n");
}
@@ -63,12 +62,12 @@ void number(size_t numberof,char parts[][CMD_LENGTH])
}
}
-void uptime()
+void uptime(void)
{
printf("System uptime is: %d seconds\n",time);
}
-void prompt()
+void prompt(void)
{
//printf("[user@myos]$ ");
set_color(VGA_COLOR_RED,VGA_COLOR_BLACK);
@@ -85,7 +84,7 @@ void prompt()
printf("$ ");
}
-void neofetch()
+void neofetch(void)
{
set_color(VGA_COLOR_WHITE,VGA_COLOR_BLACK);
printf(" . "); printf("Dobrodosli u moj \n");
@@ -120,7 +119,7 @@ void neofetch()
uptime();
}
-void help()
+void help(void)
{
printf("Currently available commands:\n");
printf("clear echo merge ls number uptime neofetch help\n");
diff --git a/src/c/vga.c b/src/c/vga.c
index 67c8b02..5294144 100644
--- a/src/c/vga.c
+++ b/src/c/vga.c
@@ -1,7 +1,7 @@
+#include<source/vga.h>
#include<types.h>
-#include<string.h>
+#include<source/string.h>
#include<asm.h>
-#include<vga.h>
size_t terminal_row;
size_t terminal_column;
@@ -10,15 +10,16 @@ uint16_t* terminal_buffer;
void set_color(enum vga_color fg, enum vga_color bg)
{
- terminal_color = fg | bg << 4;
+ terminal_color = (uint8_t)(fg|bg<<4);
}
-static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
+static inline uint16_t vga_entry(char uc, uint8_t color);
+static inline uint16_t vga_entry(char uc, uint8_t color)
{
- return (uint16_t) uc | (uint16_t) color << 8;
+ return (uint16_t)(uc|color<<8);
}
-void terminal_initialize()
+void terminal_initialize(void)
{
terminal_row=0;
terminal_column=0;
@@ -40,19 +41,19 @@ void terminal_putentryat(char c, uint8_t color, size_t x, size_t y)
terminal_buffer[index]=vga_entry(c, color);
}
-void movescreen()
+void movescreen(void)
{
terminal_row--;
for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++)
terminal_buffer[i*VGA_WIDTH+j]=terminal_buffer[(i+1)*VGA_WIDTH+j];
}
-void next_field()
+void next_field(void)
{
if(++terminal_column==VGA_WIDTH) terminal_column=0,terminal_row++;
}
-void previous_field()
+void previous_field(void)
{
if(terminal_column) terminal_column--;
else terminal_row--,terminal_column=VGA_WIDTH-1;
@@ -69,7 +70,7 @@ void terminal_putchar(char c)
if (terminal_row==VGA_HEIGHT) movescreen();
}
-void terminal_writestring(char* data)
+void terminal_writestring(const char* data)
{
for(int i=0;data[i]!='\0';i++) terminal_putchar(data[i]);
}
@@ -92,7 +93,7 @@ void terminal_writefloat(double num)
terminal_writestring(str);
}
-void clear()
+void clear(void)
{
for(size_t i=0;i<VGA_HEIGHT;i++) for(size_t j=0;j<VGA_WIDTH;j++) terminal_putchar(' ');
terminal_column=0;
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-17 10:14:40 +0000