Added *many* static keywords

11 files changed, 63 insertions, 55 deletions

diff --git a/kernel/drivers/ide.c b/kernel/drivers/ide.c
index 9be7956..2d02f94 100644
--- a/kernel/drivers/ide.c
+++ b/kernel/drivers/ide.c
@@ -14,7 +14,7 @@ struct ata_data {
 	u8 drive;
 };
 
-void ide_select_drive(u8 bus, u8 drive)
+static void ide_select_drive(u8 bus, u8 drive)
 {
 	if (bus == ATA_PRIMARY) {
 		if (drive == ATA_MASTER)
@@ -29,7 +29,7 @@ void ide_select_drive(u8 bus, u8 drive)
 	}
 }
 
-u8 ide_find(u8 bus, u8 drive)
+static u8 ide_find(u8 bus, u8 drive)
 {
 	u16 io = bus == ATA_PRIMARY ? ATA_PRIMARY_IO : ATA_SECONDARY_IO;
 	ide_select_drive(bus, drive);
@@ -61,13 +61,13 @@ u8 ide_find(u8 bus, u8 drive)
 	return 1;
 }
 
-void ide_delay(u16 io) // 400ns
+static void ide_delay(u16 io) // 400ns
 {
 	for (int i = 0; i < 4; i++)
 		inb(io + ATA_REG_ALTSTATUS);
 }
 
-void ide_poll(u16 io)
+static void ide_poll(u16 io)
 {
 	for (int i = 0; i < 4; i++)
 		inb(io + ATA_REG_ALTSTATUS);
@@ -83,7 +83,7 @@ void ide_poll(u16 io)
 	} while (!(status & ATA_SR_DRQ));
 }
 
-u8 ata_read_one(u8 *buf, u32 lba, struct device *dev)
+static u8 ata_read_one(u8 *buf, u32 lba, struct device *dev)
 {
 	u8 drive = ((struct ata_data *)dev->data)->drive;
 	u16 io = (drive & ATA_PRIMARY << 1) == ATA_PRIMARY ? ATA_PRIMARY_IO : ATA_SECONDARY_IO;
@@ -106,7 +106,7 @@ u8 ata_read_one(u8 *buf, u32 lba, struct device *dev)
 	return 1;
 }
 
-s32 ata_read(void *buf, u32 lba, u32 sector_count, struct device *dev)
+static s32 ata_read(void *buf, u32 lba, u32 sector_count, struct device *dev)
 {
 	u8 *b = buf; // I love bytes, yk
 	for (u32 i = 0; i < sector_count; i++) {
@@ -117,7 +117,7 @@ s32 ata_read(void *buf, u32 lba, u32 sector_count, struct device *dev)
 }
 
 int ata_pm = 0, ata_ps = 0, ata_sm = 0, ata_ss = 0;
-void ata_probe(void)
+static void ata_probe(void)
 {
 	for (int i = 0; i < 4; i++) {
 		int bus = i < 2 ? ATA_PRIMARY : ATA_SECONDARY;
diff --git a/kernel/drivers/interrupts.c b/kernel/drivers/interrupts.c
index 4c5c3b7..d9d514c 100644
--- a/kernel/drivers/interrupts.c
+++ b/kernel/drivers/interrupts.c
@@ -29,7 +29,7 @@ void idt_set_gate(u8 num, u32 base, u16 sel, u8 flags)
 }
 
 // Install IDT
-void idt_install()
+static void idt_install()
 {
 	// Set IDT pointer and limit
 	idt_ptr.limit = (sizeof(struct idt_entry) * 256) - 1;
@@ -60,7 +60,7 @@ void irq_uninstall_handler(int irq)
 }
 
 // Remap the IRQ table
-void irq_remap()
+static void irq_remap()
 {
 	outb(0x20, 0x11);
 	outb(0xA0, 0x11);
@@ -75,6 +75,7 @@ void irq_remap()
 }
 
 // Handle IRQ ISRs
+void irq_handler(struct regs *r);
 void irq_handler(struct regs *r)
 {
 	void (*handler)(struct regs * r);
@@ -93,7 +94,7 @@ void irq_handler(struct regs *r)
 }
 
 // Map ISRs to the correct entries in the IDT
-void irq_install(void)
+static void irq_install(void)
 {
 	irq_remap();
 
@@ -168,6 +169,7 @@ void isr_uninstall_handler(int isr)
 	isr_routines[isr] = 0;
 }
 
+void isr_handler(struct regs *r);
 void isr_handler(struct regs *r)
 {
 	if (r->int_no <= 32) {
@@ -186,7 +188,7 @@ void isr_handler(struct regs *r)
 	}
 }
 
-void isr_install(void)
+static void isr_install(void)
 {
 	idt_set_gate(0, (u32)isr0, 0x08, 0x8E);
 	idt_set_gate(1, (u32)isr1, 0x08, 0x8E);
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index f22af80..f7f9d2d 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -4,6 +4,7 @@
 #include <def.h>
 #include <fs.h>
 #include <interrupts.h>
+#include <keyboard.h>
 #include <mem.h>
 #include <print.h>
 #include <proc.h>
@@ -17,7 +18,7 @@ static u32 dev_id = 0;
 
 static int state = 0;
 static int merged = 0;
-void keyboard_handler()
+static void keyboard_handler()
 {
 	int scancode = inb(0x60);
 
@@ -45,20 +46,20 @@ void keyboard_handler()
 	proc_enable_waiting(dev_id, PROC_WAIT_DEV);
 }
 
-void keyboard_acknowledge(void)
+/*static void keyboard_acknowledge(void)
 {
 	while (inb(0x60) != 0xfa)
 		;
 }
 
-void keyboard_rate(void)
+static void keyboard_rate(void)
 {
 	outb(0x60, 0xF3);
 	keyboard_acknowledge();
 	outb(0x60, 0x0); // Rate{00000} Delay{00} 0
-}
+}*/
 
-s32 keyboard_read(void *buf, u32 offset, u32 count, struct device *dev)
+static s32 keyboard_read(void *buf, u32 offset, u32 count, struct device *dev)
 {
 	(void)dev;
 	if (stack_empty(queue))
@@ -70,7 +71,7 @@ s32 keyboard_read(void *buf, u32 offset, u32 count, struct device *dev)
 	return count;
 }
 
-u8 keyboard_ready(void)
+static u8 keyboard_ready(void)
 {
 	return !stack_empty(queue);
 }
diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c
index e2f7311..ce9d15c 100644
--- a/kernel/drivers/mouse.c
+++ b/kernel/drivers/mouse.c
@@ -5,6 +5,7 @@
 #include <fs.h>
 #include <interrupts.h>
 #include <mem.h>
+#include <mouse.h>
 #include <print.h>
 #include <proc.h>
 #include <stack.h>
@@ -18,7 +19,7 @@ static u32 dev_id = 0;
 
 static struct event_mouse *event = NULL;
 
-void mouse_handler()
+static void mouse_handler()
 {
 	switch (mouse_cycle) {
 	case 0:
@@ -51,7 +52,7 @@ void mouse_handler()
 	}
 }
 
-void mouse_serial_wait(u8 a_type)
+static void mouse_serial_wait(u8 a_type)
 {
 	u32 time_out = 100000;
 	if (a_type == 0) {
@@ -67,7 +68,7 @@ void mouse_serial_wait(u8 a_type)
 	}
 }
 
-void mouse_serial_write(u8 a_write)
+static void mouse_serial_write(u8 a_write)
 {
 	mouse_serial_wait(1);
 	outb(0x64, 0xD4);
@@ -75,18 +76,18 @@ void mouse_serial_write(u8 a_write)
 	outb(0x60, a_write);
 }
 
-u8 mouse_serial_read(void)
+static u8 mouse_serial_read(void)
 {
 	mouse_serial_wait(0);
 	return inb(0x60);
 }
 
-u8 mouse_ready(void)
+static u8 mouse_ready(void)
 {
 	return !stack_empty(queue);
 }
 
-s32 mouse_read(void *buf, u32 offset, u32 count, struct device *dev)
+static s32 mouse_read(void *buf, u32 offset, u32 count, struct device *dev)
 {
 	(void)dev;
 	if (stack_empty(queue))
diff --git a/kernel/drivers/rtl8139.c b/kernel/drivers/rtl8139.c
index 9317d7b..1f9eed9 100644
--- a/kernel/drivers/rtl8139.c
+++ b/kernel/drivers/rtl8139.c
@@ -27,7 +27,7 @@ u8 *rtl8139_get_mac(void)
 	return mac;
 }
 
-void rtl8139_receive_packet(void)
+static void rtl8139_receive_packet(void)
 {
 	while ((inb(rtl_iobase + RTL_PORT_CMD) & 0x01) == 0) {
 		int offset = cur_rx % 0x2000;
@@ -75,14 +75,14 @@ void rtl8139_send_packet(void *data, u32 len)
 		tx_current = 0;
 }
 
-void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra)
+static void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra)
 {
 	if ((vendor_id == 0x10ec) && (device_id == 0x8139)) {
 		*((u32 *)extra) = device;
 	}
 }
 
-void rtl8139_irq_handler()
+static void rtl8139_irq_handler()
 {
 	u16 status = inw(rtl_iobase + RTL_PORT_ISR);
 	if (!status)
@@ -93,7 +93,7 @@ void rtl8139_irq_handler()
 		rtl8139_receive_packet();
 }
 
-void rtl8139_init(void)
+static void rtl8139_init(void)
 {
 	if (!rtl_device_pci)
 		return;
diff --git a/kernel/drivers/timer.c b/kernel/drivers/timer.c
index 766512f..8887279 100644
--- a/kernel/drivers/timer.c
+++ b/kernel/drivers/timer.c
@@ -4,11 +4,12 @@
 #include <def.h>
 #include <interrupts.h>
 #include <proc.h>
+#include <timer.h>
 
 static u32 timer_ticks = 0;
 static u8 call_scheduler = 0;
 
-void timer_phase(int hz)
+static void timer_phase(int hz)
 {
 	int divisor = 3579545 / 3 / hz;
 	outb(0x43, 0x36); // 01 10 11 0b // CTR, RW, MODE, BCD
diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index 1744b51..9ea5458 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -15,7 +15,7 @@
 
 static struct list *mount_points = NULL;
 
-char *vfs_normalize_path(const char *path)
+static char *vfs_normalize_path(const char *path)
 {
 	char *fixed = strdup(path);
 	int len = strlen(fixed);
@@ -36,7 +36,7 @@ u8 vfs_mounted(struct device *dev, const char *path)
 	return 0;
 }
 
-struct mount_info *vfs_recursive_find(char *path)
+static struct mount_info *vfs_recursive_find(char *path)
 {
 	struct node *iterator = mount_points->head;
 	char *fixed = vfs_normalize_path(path);
@@ -60,7 +60,7 @@ struct mount_info *vfs_recursive_find(char *path)
 	return vfs_recursive_find(fixed);
 }
 
-struct mount_info *vfs_find_mount_info(const char *path)
+static struct mount_info *vfs_find_mount_info(const char *path)
 {
 	assert(path[0] == '/');
 	return vfs_recursive_find(strdup(path));
@@ -75,7 +75,7 @@ struct device *vfs_find_dev(const char *path)
 	return m && m->dev ? m->dev : NULL;
 }
 
-const char *vfs_resolve_type(enum vfs_type type)
+/*static const char *vfs_resolve_type(enum vfs_type type)
 {
 	switch (type) {
 	case VFS_DEVFS:
@@ -91,7 +91,7 @@ const char *vfs_resolve_type(enum vfs_type type)
 	}
 }
 
-void vfs_list_mounts()
+static void vfs_list_mounts()
 {
 	struct node *iterator = mount_points->head;
 	while (iterator) {
@@ -100,7 +100,7 @@ void vfs_list_mounts()
 		       vfs_resolve_type(m->dev->vfs->type));
 		iterator = iterator->next;
 	}
-}
+}*/
 
 s32 vfs_mount(struct device *dev, const char *path)
 {
@@ -276,7 +276,7 @@ struct device *device_get_by_name(const char *name)
 	return NULL;
 }
 
-s32 devfs_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev)
+static s32 devfs_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev)
 {
 	struct device *target = device_get_by_name(path + 1);
 	if (!target || !target->read)
@@ -284,7 +284,7 @@ s32 devfs_read(const char *path, void *buf, u32 offset, u32 count, struct device
 	return target->read(buf, offset, count, dev);
 }
 
-u8 devfs_perm(const char *path, enum vfs_perm perm, struct device *dev)
+static u8 devfs_perm(const char *path, enum vfs_perm perm, struct device *dev)
 {
 	(void)path;
 	(void)perm;
@@ -292,7 +292,7 @@ u8 devfs_perm(const char *path, enum vfs_perm perm, struct device *dev)
 	return 1;
 }
 
-u8 devfs_ready(const char *path, struct device *dev)
+static u8 devfs_ready(const char *path, struct device *dev)
 {
 	(void)dev;
 
@@ -326,14 +326,14 @@ void device_install(void)
  */
 
 // TODO: Remove malloc from buffer_read (attempt in #56cd63f199)
-void *buffer_read(u32 block, struct device *dev)
+static void *buffer_read(u32 block, struct device *dev)
 {
 	void *buf = malloc(BLOCK_SIZE);
 	dev->read(buf, block * SECTOR_COUNT, SECTOR_COUNT, dev);
 	return buf;
 }
 
-struct ext2_superblock *get_superblock(struct device *dev)
+static struct ext2_superblock *get_superblock(struct device *dev)
 {
 	struct ext2_superblock *sb = buffer_read(EXT2_SUPER, dev);
 
@@ -341,12 +341,12 @@ struct ext2_superblock *get_superblock(struct device *dev)
 	return sb;
 }
 
-struct ext2_bgd *get_bgd(struct device *dev)
+static struct ext2_bgd *get_bgd(struct device *dev)
 {
 	return buffer_read(EXT2_SUPER + 1, dev);
 }
 
-struct ext2_inode *get_inode(u32 i, struct device *dev)
+static struct ext2_inode *get_inode(u32 i, struct device *dev)
 {
 	struct ext2_superblock *s = get_superblock(dev);
 	assert(s);
@@ -370,7 +370,7 @@ struct ext2_inode *get_inode(u32 i, struct device *dev)
 	return in;
 }
 
-u32 read_indirect(u32 indirect, u32 block_num, struct device *dev)
+static u32 read_indirect(u32 indirect, u32 block_num, struct device *dev)
 {
 	char *data = buffer_read(indirect, dev);
 	u32 ind = *(u32 *)((u32)data + block_num * sizeof(u32));
@@ -378,7 +378,7 @@ u32 read_indirect(u32 indirect, u32 block_num, struct device *dev)
 	return ind;
 }
 
-s32 read_inode(struct ext2_inode *in, void *buf, u32 offset, u32 count, struct device *dev)
+static s32 read_inode(struct ext2_inode *in, void *buf, u32 offset, u32 count, struct device *dev)
 {
 	// TODO: Support read offset
 	(void)offset;
@@ -422,7 +422,7 @@ s32 read_inode(struct ext2_inode *in, void *buf, u32 offset, u32 count, struct d
 	return count;
 }
 
-u32 find_inode(const char *name, u32 dir_inode, struct device *dev)
+static u32 find_inode(const char *name, u32 dir_inode, struct device *dev)
 {
 	if (!dir_inode)
 		return (unsigned)-1;
@@ -456,7 +456,7 @@ u32 find_inode(const char *name, u32 dir_inode, struct device *dev)
 	return (unsigned)-1;
 }
 
-struct ext2_inode *find_inode_by_path(const char *path, struct device *dev)
+static struct ext2_inode *find_inode_by_path(const char *path, struct device *dev)
 {
 	if (path[0] != '/')
 		return 0;
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index d5cc82c..c21ffcc 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -74,7 +74,7 @@ void scheduler(struct regs *regs)
 	/* printf("{%d}", ((struct proc *)current->data)->pid); */
 }
 
-void kernel_idle()
+static void kernel_idle()
 {
 	while (1)
 		;
@@ -250,7 +250,7 @@ struct proc *proc_make(void)
 
 // TODO: Procfs needs a simpler interface structure (memcmp and everything sucks)
 
-const char *procfs_parse_path(const char **path, u32 *pid)
+static const char *procfs_parse_path(const char **path, u32 *pid)
 {
 	while (**path == '/')
 		(*path)++;
@@ -268,7 +268,7 @@ const char *procfs_parse_path(const char **path, u32 *pid)
 	return *path;
 }
 
-enum stream_defaults procfs_stream(const char *path)
+static enum stream_defaults procfs_stream(const char *path)
 {
 	if (!memcmp(path, "in", 3)) {
 		return STREAM_IN;
@@ -283,7 +283,7 @@ enum stream_defaults procfs_stream(const char *path)
 	}
 }
 
-s32 procfs_write(const char *path, void *buf, u32 offset, u32 count, struct device *dev)
+static s32 procfs_write(const char *path, void *buf, u32 offset, u32 count, struct device *dev)
 {
 	u32 pid = 0;
 	procfs_parse_path(&path, &pid);
@@ -321,7 +321,7 @@ s32 procfs_write(const char *path, void *buf, u32 offset, u32 count, struct devi
 	return -1;
 }
 
-s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev)
+static s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev)
 {
 	(void)dev;
 	u32 pid = 0;
@@ -369,7 +369,7 @@ s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struct devic
 	return -1;
 }
 
-s32 procfs_wait(const char *path, s32 (*func)(), struct device *dev)
+static s32 procfs_wait(const char *path, s32 (*func)(), struct device *dev)
 {
 	u32 pid = 0;
 	procfs_parse_path(&path, &pid);
@@ -392,7 +392,7 @@ s32 procfs_wait(const char *path, s32 (*func)(), struct device *dev)
 	return -1;
 }
 
-u8 procfs_perm(const char *path, enum vfs_perm perm, struct device *dev)
+static u8 procfs_perm(const char *path, enum vfs_perm perm, struct device *dev)
 {
 	(void)path;
 	(void)dev;
@@ -403,7 +403,7 @@ u8 procfs_perm(const char *path, enum vfs_perm perm, struct device *dev)
 		return 1;
 }
 
-u8 procfs_ready(const char *path, struct device *dev)
+static u8 procfs_ready(const char *path, struct device *dev)
 {
 	(void)dev;
 
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 9f05471..538fd59 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -10,9 +10,10 @@
 #include <proc.h>
 #include <str.h>
 #include <sys.h>
+#include <syscall.h>
 #include <timer.h>
 
-void syscall_handler(struct regs *r)
+static void syscall_handler(struct regs *r)
 {
 	enum sys num = r->eax;
 	r->eax = 0;
diff --git a/kernel/inc/timer.h b/kernel/inc/timer.h
index d6123b4..5d747d0 100644
--- a/kernel/inc/timer.h
+++ b/kernel/inc/timer.h
@@ -4,11 +4,12 @@
 #define TIMER_H
 
 #include <def.h>
+#include <interrupts.h>
 
 u32 timer_get(void);
 void timer_wait(u32 ticks);
 void timer_install(void);
-void timer_handler(void); // For scheduler
+void timer_handler(struct regs *r);
 
 void scheduler_enable(void);
 void scheduler_disable(void);
diff --git a/kernel/main.c b/kernel/main.c
index dea92d7..f8815eb 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -16,6 +16,7 @@
 #include <syscall.h>
 #include <timer.h>
 
+void kernel_main(struct vid_info *vid_info); // Decl
 void kernel_main(struct vid_info *vid_info)
 {
 	heap_init(0x00f00000 + rand());