summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--driver/keyboard.c2
-rw-r--r--driver/mouse.c2
-rw-r--r--driver/pci.c2
-rw-r--r--driver/serial.c2
-rw-r--r--driver/timer.c2
-rw-r--r--driver/vesa.c2
-rw-r--r--fs/elf.c2
-rw-r--r--fs/ext2.c2
-rw-r--r--fs/fs.c2
-rw-r--r--kernel/acpi.c2
-rw-r--r--kernel/fifo.c2
-rw-r--r--kernel/gdt.c2
-rw-r--r--kernel/interrupts.c2
-rw-r--r--kernel/kernel.c2
-rw-r--r--kernel/kmalloc.c2
-rw-r--r--kernel/log.c2
-rw-r--r--kernel/mem.c2
-rw-r--r--kernel/mp.c2
-rw-r--r--kernel/multiboot.c2
-rw-r--r--kernel/ringbuffer.c2
-rw-r--r--kernel/scheduler.c2
-rw-r--r--kernel/smashing.c2
-rw-r--r--kernel/smp.c2
-rw-r--r--kernel/spinlock.c2
-rw-r--r--kernel/syscalls.c2
-rw-r--r--kernel/usermode.c2
-rw-r--r--kernel/vmem.c2
-rw-r--r--terminal/terminal.c2
-rw-r--r--xxx/inactive/console.c2
-rw-r--r--xxx/inactive/floppy.c2
30 files changed, 30 insertions, 30 deletions
diff --git a/driver/keyboard.c b/driver/keyboard.c
index 9377515..423be69 100644
--- a/driver/keyboard.c
+++ b/driver/keyboard.c
@@ -1,7 +1,7 @@
/// idiots keyboard driver ////
// http://www.computer-engineering.org/ps2keyboard/scancodes1.html
-#define FOOLOS_MODULE_NAME "keyboard"
+
#include "asm/x86.h"
#include <stdbool.h>
diff --git a/driver/mouse.c b/driver/mouse.c
index e37b017..f70393c 100644
--- a/driver/mouse.c
+++ b/driver/mouse.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "mouse"
+
//http://forum.osdev.org/viewtopic.php?t=10247
//based on Mouse.inc by SANiK
diff --git a/driver/pci.c b/driver/pci.c
index 7ad5daa..48aaff9 100644
--- a/driver/pci.c
+++ b/driver/pci.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "pci"
+
#include "kernel/kernel.h"
#include "asm/x86.h"
diff --git a/driver/serial.c b/driver/serial.c
index 6fb206f..db6599b 100644
--- a/driver/serial.c
+++ b/driver/serial.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "serial"
+
#include "driver/serial.h"
#include "asm/x86.h" // provides x86_inb() and x86_outb()
diff --git a/driver/timer.c b/driver/timer.c
index 2d4c7ff..1d04353 100644
--- a/driver/timer.c
+++ b/driver/timer.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "timer"
+
#include "timer.h"
#include "asm/x86.h"
diff --git a/driver/vesa.c b/driver/vesa.c
index d57174f..06c9f6f 100644
--- a/driver/vesa.c
+++ b/driver/vesa.c
@@ -5,7 +5,7 @@
#include "vesa.h"
#include "lib/printf/printf.h"
-#define FOOLOS_MODULE_NAME "vesa"
+
//#define FOOLSOS_SHOW_VESAMODES
diff --git a/fs/elf.c b/fs/elf.c
index 0a8d752..3e32f55 100644
--- a/fs/elf.c
+++ b/fs/elf.c
@@ -1,7 +1,7 @@
#include <stdint.h>
#include "ext2.h"
-#define FOOLOS_MODULE_NAME "elf"
+
#define EI_NIDENT 16
diff --git a/fs/ext2.c b/fs/ext2.c
index e685938..17e64b6 100644
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -1,7 +1,7 @@
// ext2 minidriver
// based on osdev wiki article: http://wiki.osdev.org/Ext2
-#define FOOLOS_MODULE_NAME "ext2"
+
#include <stdbool.h>
#include <stdint.h>
diff --git a/fs/fs.c b/fs/fs.c
index 253be98..0194358 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1,5 +1,5 @@
// abstraction layer for filesystems
-#define FOOLOS_MODULE_NAME "mount"
+
#include "fs.h"
#include "ext2.h"
diff --git a/kernel/acpi.c b/kernel/acpi.c
index 6ab6e9e..169aa84 100644
--- a/kernel/acpi.c
+++ b/kernel/acpi.c
@@ -1,7 +1,7 @@
// Advanced Configuration and Power Interface
// http://wiki.xomb.org/index.php?title=ACPI_Tables
-#define FOOLOS_MODULE_NAME "acpi"
+
#include <stdint.h>
#include <stdbool.h>
diff --git a/kernel/fifo.c b/kernel/fifo.c
index 2950eff..5366cef 100644
--- a/kernel/fifo.c
+++ b/kernel/fifo.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "fifo"
+
#include "fifo.h"
#include "ringbuffer.h"
diff --git a/kernel/gdt.c b/kernel/gdt.c
index 88478c7..46bf61a 100644
--- a/kernel/gdt.c
+++ b/kernel/gdt.c
@@ -1,5 +1,5 @@
// http://wiki.osdev.org/GDT_Tutorial
-#define FOOLOS_MODULE_NAME "gdt"
+
#include "usermode.h"
#include <stdint.h>
diff --git a/kernel/interrupts.c b/kernel/interrupts.c
index 9d5c2b1..f9b80a8 100644
--- a/kernel/interrupts.c
+++ b/kernel/interrupts.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "interrupts"
+
#include "asm/asm.h"
#include "asm/pit.h"
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 3bae34d..c2d85ba 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "dupa"
+
#include "kernel/kernel.h"
#include <stdint.h>
diff --git a/kernel/kmalloc.c b/kernel/kmalloc.c
index 26822e0..25c2006 100644
--- a/kernel/kmalloc.c
+++ b/kernel/kmalloc.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "kmalloc"
+
#include "kmalloc.h"
#include "kernel.h"
diff --git a/kernel/log.c b/kernel/log.c
index a14205a..95aa83c 100644
--- a/kernel/log.c
+++ b/kernel/log.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "log"
+
#include "log.h"
#include <stdarg.h>
diff --git a/kernel/mem.c b/kernel/mem.c
index 429587a..7738af7 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "mem"
+
#include <stdint.h>
diff --git a/kernel/mp.c b/kernel/mp.c
index 83c50e7..8e5a7a6 100644
--- a/kernel/mp.c
+++ b/kernel/mp.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "mp"
+
#include <stdbool.h>
diff --git a/kernel/multiboot.c b/kernel/multiboot.c
index 8a9f59d..d1ab07c 100644
--- a/kernel/multiboot.c
+++ b/kernel/multiboot.c
@@ -1,5 +1,5 @@
//https://www.gnu.org/software/grub/manual/multiboot/multiboot.html#Boot-information-format
-#define FOOLOS_MODULE_NAME "multiboot"
+
#include "multiboot.h"
#include "driver/vesa.h"
diff --git a/kernel/ringbuffer.c b/kernel/ringbuffer.c
index 69f11b2..d6d515d 100644
--- a/kernel/ringbuffer.c
+++ b/kernel/ringbuffer.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "ringbuffer"
+
#include "ringbuffer.h"
// TODO: this is disabled because a kb interrupt can occur anytime
diff --git a/kernel/scheduler.c b/kernel/scheduler.c
index 657baf2..6cd63fe 100644
--- a/kernel/scheduler.c
+++ b/kernel/scheduler.c
@@ -1,7 +1,7 @@
// http://hosted.cjmovie.net/TutMultitask.htm
//
//
-#define FOOLOS_MODULE_NAME "task"
+
#include "kernel.h"
#include "mem.h"
diff --git a/kernel/smashing.c b/kernel/smashing.c
index 4b7c206..4757b71 100644
--- a/kernel/smashing.c
+++ b/kernel/smashing.c
@@ -9,7 +9,7 @@
#define STACK_CHK_GUARD 0x595e9fbd94fda766
#endif
-#define FOOLOS_MODULE_NAME "ssp"
+
uintptr_t __stack_chk_guard = STACK_CHK_GUARD;
diff --git a/kernel/smp.c b/kernel/smp.c
index 2751d37..6a1068c 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -3,7 +3,7 @@
// http://www.scs.stanford.edu/05au-cs240c/lab/ia32/IA32-3.pdf
-#define FOOLOS_MODULE_NAME "smp"
+
#include <stdint.h>
#include "smp.h"
diff --git a/kernel/spinlock.c b/kernel/spinlock.c
index 99121c0..9c21d06 100644
--- a/kernel/spinlock.c
+++ b/kernel/spinlock.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "spinlock"
+
#include "spinlock.h"
#include "kernel.h"
diff --git a/kernel/syscalls.c b/kernel/syscalls.c
index baa341f..25e41e6 100644
--- a/kernel/syscalls.c
+++ b/kernel/syscalls.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "syscalls"
+
#include "lib/string/string.h"
#include "fs/fs.h"
diff --git a/kernel/usermode.c b/kernel/usermode.c
index ca1385d..b6d01f3 100644
--- a/kernel/usermode.c
+++ b/kernel/usermode.c
@@ -1,4 +1,4 @@
-#define FOOLOS_MODULE_NAME "usermode"
+
#include "usermode.h"
#include "syscalls.h"
diff --git a/kernel/vmem.c b/kernel/vmem.c
index bf310c1..3d78cae 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -7,7 +7,7 @@
#include "mem.h"
#include "vmem.h"
-#define FOOLOS_MODULE_NAME "vmem"
+
static uint32_t kernel_pages;
static uint32_t fb_addr;
diff --git a/terminal/terminal.c b/terminal/terminal.c
index 8fec95c..6ac1533 100644
--- a/terminal/terminal.c
+++ b/terminal/terminal.c
@@ -4,7 +4,7 @@
// man 4 console_codes
//
-#define FOOLOS_MODULE_NAME "terminal"
+
#include "terminal.h"
#include "kernel/kmalloc.h"
diff --git a/xxx/inactive/console.c b/xxx/inactive/console.c
index dc9b90e..50bfdae 100644
--- a/xxx/inactive/console.c
+++ b/xxx/inactive/console.c
@@ -9,7 +9,7 @@
#include "fs/ext2.h"
-#define FOOLOS_MODULE_NAME "console"
+
#ifdef FOOLOS_CONSOLE
diff --git a/xxx/inactive/floppy.c b/xxx/inactive/floppy.c
index 56ec856..b7c2f55 100644
--- a/xxx/inactive/floppy.c
+++ b/xxx/inactive/floppy.c
@@ -15,7 +15,7 @@
*
*/
-#define FOOLOS_MODULE_NAME "floppy"
+
#include "config.h"
#ifdef FOOLOS_COMPILE_FLOPPY