diff options
| -rw-r--r-- | apps/test.c | 16 | ||||
| -rw-r--r-- | apps/wm.c | 10 | ||||
| -rw-r--r-- | boot/load.c | 32 | ||||
| -rw-r--r-- | kernel/drivers/ide.c | 14 | ||||
| -rw-r--r-- | kernel/drivers/interrupts.c | 10 | ||||
| -rw-r--r-- | kernel/drivers/keyboard.c | 13 | ||||
| -rw-r--r-- | kernel/drivers/mouse.c | 13 | ||||
| -rw-r--r-- | kernel/drivers/rtl8139.c | 8 | ||||
| -rw-r--r-- | kernel/drivers/timer.c | 3 | ||||
| -rw-r--r-- | kernel/features/fs.c | 34 | ||||
| -rw-r--r-- | kernel/features/proc.c | 16 | ||||
| -rw-r--r-- | kernel/features/syscall.c | 3 | ||||
| -rw-r--r-- | kernel/inc/timer.h | 3 | ||||
| -rw-r--r-- | kernel/main.c | 1 | ||||
| -rw-r--r-- | libc/conv.c | 1 | ||||
| -rw-r--r-- | libc/cpu.c | 4 | ||||
| -rw-r--r-- | libc/inc/math.h | 2 | ||||
| -rw-r--r-- | libc/list.c | 4 | ||||
| -rw-r--r-- | libc/math.c | 2 | ||||
| -rw-r--r-- | libc/mem.c | 58 | ||||
| -rw-r--r-- | libc/print.c | 2 | ||||
| -rw-r--r-- | libc/serial.c | 5 | ||||
| -rw-r--r-- | libc/stack.c | 6 | ||||
| -rw-r--r-- | libc/str.c | 1 | ||||
| -rw-r--r-- | libgui/inc/png.h | 3 | ||||
| -rw-r--r-- | libgui/png.c | 12 | ||||
| -rw-r--r-- | libgui/psf.c | 2 | ||||
| -rw-r--r-- | libnet/http.c | 1 | ||||
| -rw-r--r-- | libtxt/keymap.c | 2 |
29 files changed, 149 insertions, 132 deletions
diff --git a/apps/test.c b/apps/test.c index c448ceb..a44451c 100644 --- a/apps/test.c +++ b/apps/test.c @@ -20,15 +20,15 @@ static u32 failed; -void pass_or_fail(const char *file_name, int line_num, const char *func, const char *first, - const char *second, int success) +static void pass_or_fail(const char *file_name, int line_num, const char *func, const char *first, + const char *second, int success) { failed += success ? 0 : 1; log("\x1B[%s\x1B[0m %s:%d: %s: %s == %s\n", success ? "32m[PASS]" : "31m[FAIL]", file_name, line_num, func, first, second); } -void test_malloc() +static void test_malloc() { // TODO: More tests! /* u32 *a = malloc(a_mag); */ @@ -38,14 +38,14 @@ void test_malloc() /* equals(b[-1], b_mag); */ } -void test_math() +static void test_math() { equals(pow(2, 3), 8); equals(pow(0, 3), 0); equals(pow(0, 0), 1); } -void test_conv() +static void test_conv() { char buf1[1] = { 0 }; char buf2[7] = { 0 }; @@ -61,7 +61,7 @@ void test_conv() equals_str(conv_base(0xffffffff, buf4, 10, 1), "-1"); } -void test_mem() +static void test_mem() { const char *str0 = ""; const char *str1 = ""; @@ -74,10 +74,10 @@ void test_mem() equals(memcmp(str0, str1, strlen(str0)), 0); equals(memcmp(NULL, NULL, 0), 0); - char buf[6]; + char buf[6] = { 0 }; equals_str(memcpy(buf, "hallo", 6), "hallo"); - char buf2[6]; + char buf2[6] = { 0 }; equals_str(memset(buf2, 'x', 5), "xxxxx"); } @@ -102,12 +102,12 @@ static struct window *window_find(u32 id) return NULL; } -static void window_destroy(struct window *win) +/*static void window_destroy(struct window *win) { - /* free(win->name); */ + //free(win->name); free(win->ctx.fb); free(win); -} +}*/ // Beautiful static void windows_at_rec(vec2 pos1, vec2 pos2, struct list *list) @@ -189,13 +189,15 @@ static struct rectangle rectangle_at(vec2 pos1, vec2 pos2, struct window *exclud start_x = 0; } } + u32 start_y = 0; + u32 end_y = height; u8 *srcfb = &win->ctx.fb[(pos.x + start_x) * bypp + pos.y * win->ctx.pitch]; u8 *destfb = &data[start_x * bypp]; // Copy window data to rectangle buffer - for (u32 cy = start_y; cy < height; cy++) { + for (u32 cy = start_y; cy < end_y; cy++) { int diff = 0; for (u32 cx = start_x; cx < end_x; cx++) { if (srcfb[bypp - 1]) diff --git a/boot/load.c b/boot/load.c index 2bd6028..fea2395 100644 --- a/boot/load.c +++ b/boot/load.c @@ -150,14 +150,14 @@ int main(void *data) return 0; } -u8 inb(u16 port) +static u8 inb(u16 port) { u8 value; __asm__ volatile("inb %1, %0" : "=a"(value) : "Nd"(port)); return value; } -void insl(u16 port, void *addr, int n) +static void insl(u16 port, void *addr, int n) { __asm__ volatile("cld; rep insl" : "=D"(addr), "=c"(n) @@ -165,12 +165,12 @@ void insl(u16 port, void *addr, int n) : "memory", "cc"); } -void outb(u16 port, u8 data) +static void outb(u16 port, u8 data) { __asm__ volatile("outb %0, %1" ::"a"(data), "Nd"(port)); } -void *memcpy(void *dst, const void *src, u32 n) +static void *memcpy(void *dst, const void *src, u32 n) { const char *sp = (const char *)src; char *dp = (char *)dst; @@ -179,7 +179,7 @@ void *memcpy(void *dst, const void *src, u32 n) return dst; } -void *memset(void *dst, char val, u32 n) +static void *memset(void *dst, char val, u32 n) { char *temp = (char *)dst; for (; n != 0; n--) @@ -187,7 +187,7 @@ void *memset(void *dst, char val, u32 n) return dst; } -int strncmp(const char *s1, const char *s2, u32 n) +static int strncmp(const char *s1, const char *s2, u32 n) { const u8 *c1 = (const u8 *)s1; const u8 *c2 = (const u8 *)s2; @@ -203,7 +203,7 @@ int strncmp(const char *s1, const char *s2, u32 n) return d; } -u32 strlen(const char *s) +static u32 strlen(const char *s) { const char *ss = s; while (*ss) @@ -222,12 +222,12 @@ void serial_install() outb(0x3f8 + 4, 0x0B); } -int is_transmit_empty() +static int is_transmit_empty() { return inb(0x3f8 + 5) & 0x20; } -void serial_put(char ch) +static void serial_put(char ch) { while (is_transmit_empty() == 0) ; @@ -240,12 +240,12 @@ void serial_print(const char *data) serial_put(data[i]); } -void *malloc(u32 size) +static void *malloc(u32 size) { return (u32 *)(heap += size); } -int ide_wait(int check) +static int ide_wait(int check) { char r; @@ -259,7 +259,7 @@ int ide_wait(int check) return 0; } -void *ide_read(void *b, u32 block) +static void *ide_read(void *b, u32 block) { int sector_per_block = BLOCK_SIZE / SECTOR_SIZE; // 2 int sector = block * sector_per_block; @@ -281,12 +281,12 @@ void *ide_read(void *b, u32 block) return b; } -void *buffer_read(int block) +static void *buffer_read(int block) { return ide_read(malloc(BLOCK_SIZE), block); } -struct superblock *get_superblock() +static struct superblock *get_superblock() { struct superblock *sb = buffer_read(EXT2_SUPER); if (sb->magic != EXT2_MAGIC) @@ -294,7 +294,7 @@ struct superblock *get_superblock() return sb; } -struct bgd *get_bgd() +static struct bgd *get_bgd() { return buffer_read(EXT2_SUPER + 1); } @@ -317,7 +317,7 @@ struct inode *get_inode(int i) return in; } -u32 read_indirect(u32 indirect, u32 block_num) +static u32 read_indirect(u32 indirect, u32 block_num) { char *data = buffer_read(indirect); return *(u32 *)((u32)data + block_num * sizeof(u32)); 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()); diff --git a/libc/conv.c b/libc/conv.c index d0a9a59..670fdb3 100644 --- a/libc/conv.c +++ b/libc/conv.c @@ -1,5 +1,6 @@ // MIT License, Copyright (c) 2020 Marvin Borner +#include <conv.h> #include <def.h> #include <math.h> #include <mem.h> @@ -95,12 +95,12 @@ static void cr4_set(u32 cr4) } static u32 cpu_features = 0; -u8 cpu_has_feature(u32 feature) +static u8 cpu_has_feature(u32 feature) { return (cpu_features & feature) != 0; } -void fpu_handler() +static void fpu_handler() { __asm__ volatile("clts"); } diff --git a/libc/inc/math.h b/libc/inc/math.h index 268e3e7..82f431f 100644 --- a/libc/inc/math.h +++ b/libc/inc/math.h @@ -3,8 +3,6 @@ #ifndef MATH_H #define MATH_H -#include <def.h> - int pow(int base, int exp); #endif diff --git a/libc/list.c b/libc/list.c index 6e1f95d..330d65d 100644 --- a/libc/list.c +++ b/libc/list.c @@ -29,7 +29,7 @@ void list_destroy(struct list *list) list = NULL; } -struct node *list_new_node() +static struct node *list_new_node() { struct node *node = malloc(sizeof(*node)); node->data = NULL; @@ -39,7 +39,7 @@ struct node *list_new_node() return node; } -struct node *list_add_node(struct list *list, struct node *node) +static struct node *list_add_node(struct list *list, struct node *node) { if (!list || !node) return NULL; diff --git a/libc/math.c b/libc/math.c index 9cd9cea..c8142b5 100644 --- a/libc/math.c +++ b/libc/math.c @@ -1,5 +1,7 @@ // MIT License, Copyright (c) 2020 Marvin Borner +#include <math.h> + int pow(int base, int exp) { if (exp < 0) @@ -157,7 +157,7 @@ struct heap { struct h_bin bins[BIN_COUNT]; }; -void node_add(struct h_bin *bin, struct h_node *node) +static void node_add(struct h_bin *bin, struct h_node *node) { node->magic = HEAP_MAGIC; node->next = NULL; @@ -187,7 +187,7 @@ void node_add(struct h_bin *bin, struct h_node *node) } } -void node_remove(struct h_bin *bin, struct h_node *node) +static void node_remove(struct h_bin *bin, struct h_node *node) { if (!bin->head) return; @@ -211,7 +211,7 @@ void node_remove(struct h_bin *bin, struct h_node *node) } } -struct h_node *node_best_fit(struct h_bin *bin, u32 size) +static struct h_node *node_best_fit(struct h_bin *bin, u32 size) { if (!bin->head) return NULL; @@ -225,26 +225,26 @@ struct h_node *node_best_fit(struct h_bin *bin, u32 size) return NULL; } -struct h_node *node_last(struct h_bin *bin) -{ - struct h_node *temp = bin->head; - while (temp->next) - temp = temp->next; - return temp; -} +/* static struct h_node *node_last(struct h_bin *bin) */ +/* { */ +/* struct h_node *temp = bin->head; */ +/* while (temp->next) */ +/* temp = temp->next; */ +/* return temp; */ +/* } */ -struct h_footer *node_foot(struct h_node *node) +static struct h_footer *node_foot(struct h_node *node) { return (struct h_footer *)((char *)node + sizeof(*node) + node->size); } -void node_create_foot(struct h_node *head) +static void node_create_foot(struct h_node *head) { struct h_footer *foot = node_foot(head); foot->header = head; } -u32 bin_index(u32 sz) +static u32 bin_index(u32 sz) { u32 index = 0; sz = sz < 4 ? 4 : sz; @@ -262,19 +262,19 @@ u32 bin_index(u32 sz) /* return wild_foot->header; */ /* } */ -u32 expand(struct heap *heap, u32 sz) -{ - (void)heap; - (void)sz; - return 0; -} +/* static u32 expand(struct heap *heap, u32 sz) */ +/* { */ +/* (void)heap; */ +/* (void)sz; */ +/* return 0; */ +/* } */ -u32 contract(struct heap *heap, u32 sz) -{ - (void)heap; - (void)sz; - return 0; -} +/* static u32 contract(struct heap *heap, u32 sz) */ +/* { */ +/* (void)heap; */ +/* (void)sz; */ +/* return 0; */ +/* } */ static struct heap heap = { 0 }; void heap_init(u32 start) @@ -288,7 +288,7 @@ void heap_init(u32 start) heap.end = start + HEAP_INIT_SIZE; } -void *_malloc(u32 size) +static void *_malloc(u32 size) { malloc_allocated += size; u32 index = bin_index(size); @@ -336,7 +336,7 @@ void *_malloc(u32 size) return &found->next; } -void _free(void *p) +static void _free(void *p) { if (!p) return; @@ -392,12 +392,12 @@ void _free(void *p) #define kmalloc(n) (void *)sys1(SYS_MALLOC, n) #define kfree(ptr) (void)(sys1(SYS_FREE, (int)ptr)) -void *_malloc(u32 size) +static void *_malloc(u32 size) { return kmalloc(size); } -void _free(void *ptr) +static void _free(void *ptr) { kfree(ptr); } diff --git a/libc/print.c b/libc/print.c index 3d64504..6d97599 100644 --- a/libc/print.c +++ b/libc/print.c @@ -168,7 +168,7 @@ int print(const char *str) #define WHT "\x1B[1;37m" #define RES "\x1B[0m" -void print_kernel(const char *str) +static void print_kernel(const char *str) { serial_print(RED); serial_print("[KER] "); diff --git a/libc/serial.c b/libc/serial.c index 28de140..62263fb 100644 --- a/libc/serial.c +++ b/libc/serial.c @@ -2,6 +2,7 @@ #include <cpu.h> #include <def.h> +#include <serial.h> #include <str.h> void serial_install() @@ -15,12 +16,12 @@ void serial_install() outb(0x3f8 + 4, 0x0B); } -int is_transmit_empty() +static int is_transmit_empty() { return inb(0x3f8 + 5) & 0x20; } -void serial_put(char ch) +static void serial_put(char ch) { while (is_transmit_empty() == 0) ; diff --git a/libc/stack.c b/libc/stack.c index cd5a2aa..0941e29 100644 --- a/libc/stack.c +++ b/libc/stack.c @@ -29,7 +29,7 @@ void stack_destroy(struct stack *stack) stack = NULL; } -struct stack_node *stack_new_node() +static struct stack_node *stack_new_node() { struct stack_node *node = malloc(sizeof(*node)); node->data = NULL; @@ -39,7 +39,7 @@ struct stack_node *stack_new_node() return node; } -u32 stack_push_bot_node(struct stack *stack, struct stack_node *node) +static u32 stack_push_bot_node(struct stack *stack, struct stack_node *node) { if (!stack || !node) return 0; @@ -60,7 +60,7 @@ u32 stack_push_bot_node(struct stack *stack, struct stack_node *node) return 1; } -u32 stack_push_node(struct stack *stack, struct stack_node *node) +static u32 stack_push_node(struct stack *stack, struct stack_node *node) { if (!stack || !node) return 0; @@ -2,6 +2,7 @@ #include <def.h> #include <mem.h> +#include <str.h> u32 strlen(const char *s) { diff --git a/libgui/inc/png.h b/libgui/inc/png.h index 5614295..dba0947 100644 --- a/libgui/inc/png.h +++ b/libgui/inc/png.h @@ -27,6 +27,9 @@ freely, subject to the following restrictions: #ifndef PNG_H #define PNG_H +/* For now! TODO: Use PNG encoding */ +#define PNG_NO_COMPILE_ENCODER + #include <def.h> extern const char *PNG_VERSION_STRING; diff --git a/libgui/png.c b/libgui/png.c index 71b948b..03ff89e 100644 --- a/libgui/png.c +++ b/libgui/png.c @@ -631,7 +631,7 @@ static u32 readBits(pngBitReader *reader, u32 nbits) } /* Public for testing only. steps and result must have numsteps values. */ -u32 lode_png_test_bitreader(const u8 *data, u32 size, u32 numsteps, const u32 *steps, u32 *result) +/*static u32 png_test_bitreader(const u8 *data, u32 size, u32 numsteps, const u32 *steps, u32 *result) { u32 i; pngBitReader reader; @@ -654,7 +654,7 @@ u32 lode_png_test_bitreader(const u8 *data, u32 size, u32 numsteps, const u32 *s result[i] = readBits(&reader, step); } return 1; -} +}*/ #endif /*PNG_COMPILE_DECODER*/ static u32 reverseBits(u32 bits, u32 num) @@ -4089,14 +4089,16 @@ u32 png_convert(u8 *out, const u8 *in, const pngColorMode *mode_out, const pngCo return error; } +#ifdef PNG_COMPILE_ENCODER + /* Converts a single rgb color without alpha from one type to another, color bits truncated to their bitdepth. In case of single channel (gray or palette), only the r channel is used. Slow function, do not use to process all pixels of an image. Alpha channel not supported on purpose: this is for bKGD, supporting alpha may prevent it from finding a color in the palette, from the specification it looks like bKGD should ignore the alpha values of the palette since it can use any palette index but doesn't have an alpha channel. Idem with ignoring color key. */ -u32 png_convert_rgb(u32 *r_out, u32 *g_out, u32 *b_out, u32 r_in, u32 g_in, u32 b_in, - const pngColorMode *mode_out, const pngColorMode *mode_in) +static u32 png_convert_rgb(u32 *r_out, u32 *g_out, u32 *b_out, u32 r_in, u32 g_in, u32 b_in, + const pngColorMode *mode_out, const pngColorMode *mode_in) { u32 r = 0, g = 0, b = 0; u32 mul = 65535 / ((1u << mode_in->bitdepth) - 1u); /*65535, 21845, 4369, 257, 1*/ @@ -4147,8 +4149,6 @@ u32 png_convert_rgb(u32 *r_out, u32 *g_out, u32 *b_out, u32 r_in, u32 g_in, u32 return 0; } -#ifdef PNG_COMPILE_ENCODER - void png_color_stats_init(pngColorStats *stats) { /*stats*/ diff --git a/libgui/psf.c b/libgui/psf.c index 655fb07..e590add 100644 --- a/libgui/psf.c +++ b/libgui/psf.c @@ -9,7 +9,7 @@ // Verifies the PSF magics // Returns the PSF version or 0 -int psf_verify(char *data) +static int psf_verify(char *data) { struct psf1_header *header1 = (struct psf1_header *)data; struct psf2_header *header2 = (struct psf2_header *)data; diff --git a/libnet/http.c b/libnet/http.c index 85ceefc..2910ad3 100644 --- a/libnet/http.c +++ b/libnet/http.c @@ -3,6 +3,7 @@ #include <assert.h> #include <conv.h> #include <def.h> +#include <http.h> #include <mem.h> #include <net.h> #include <print.h> diff --git a/libtxt/keymap.c b/libtxt/keymap.c index e03590e..175c715 100644 --- a/libtxt/keymap.c +++ b/libtxt/keymap.c @@ -6,7 +6,7 @@ #include <print.h> #include <sys.h> -void map(struct keymap *keymap, int line, char ch, int index) +static void map(struct keymap *keymap, int line, char ch, int index) { switch (line) { case 0: |