Large module cleanup

jezze · Jun 12, 2011 · c129e0e · c129e0e
1 parent 2e5b4ba
commit c129e0e
Show file tree

Hide file tree

Showing 13 changed files with 135 additions and 135 deletions.
diff --git a/arch/x86/modules/io/io.c b/arch/x86/modules/io/io.c
@@ -5,7 +5,7 @@
 #include <kernel/vfs.h>
 #include <arch/x86/modules/io/io.h>
 
-struct modules_io_device ioDevice;
+struct io_device ioDevice;
 
 static unsigned int io_device_read(char *buffer, unsigned int count, unsigned int offset)
 {

diff --git a/arch/x86/modules/kbd/kbd.c b/arch/x86/modules/kbd/kbd.c
@@ -34,7 +34,7 @@ char kbdMapUpperUS[128] =
        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0
 };
 
-struct modules_kbd_device kbdDevice;
+struct kbd_device kbdDevice;
 
 static unsigned int kbd_device_read(char *buffer)
 {
@@ -135,7 +135,7 @@ void kbd_init()
     struct file_node *devNode = call_open("/dev");
     file_write(devNode, devNode->length, 1, &kbdDevice.node);
 
-    modules_register(MODULES_TYPE_KEYBOARD, &kbdDevice.base);
+    modules_register(MODULES_TYPE_KEYBOARD, &kbdDevice.base.base);
 
     irq_register_handler(IRQ_ROUTINE_KBD, kbd_handler);
 

diff --git a/arch/x86/modules/serial/serial.c b/arch/x86/modules/serial/serial.c
@@ -8,7 +8,7 @@
 #include <arch/x86/modules/io/io.h>
 #include <arch/x86/modules/serial/serial.h>
 
-struct modules_serial_device serialDeviceCom1;
+struct serial_device serialDeviceCom1;
 
 static int serial_in_ready(unsigned short port)
 {
@@ -26,7 +26,7 @@ static char serial_inb(unsigned short port)
 
 }
 
-static unsigned int serial_read(struct modules_serial_device *device, char *buffer, unsigned int count)
+static unsigned int serial_read(struct serial_device *device, char *buffer, unsigned int count)
 {
 
     unsigned int i;
@@ -54,7 +54,7 @@ static void serial_outb(unsigned short port, char c)
 
 }
 
-static unsigned int serial_write(struct modules_serial_device *device, char *buffer, unsigned int count)
+static unsigned int serial_write(struct serial_device *device, char *buffer, unsigned int count)
 {
 
     unsigned int i;

diff --git a/arch/x86/modules/vga/vga.c b/arch/x86/modules/vga/vga.c
@@ -7,7 +7,7 @@
 #include <arch/x86/modules/io/io.h>
 #include <arch/x86/modules/vga/vga.h>
 
-struct modules_vga_device vgaDevice;
+struct vga_device vgaDevice;
 unsigned char vgaFbColor;
 
 static unsigned int vga_read_framebuffer(char *buffer, unsigned int count, unsigned int offset)
@@ -139,7 +139,7 @@ void vga_init()
     file_write(devNode, devNode->length, 1, &vgaDevice.nodeCursorColor);
     file_write(devNode, devNode->length, 1, &vgaDevice.nodeCursorOffset);
 
-    modules_register(MODULES_TYPE_VGA, &vgaDevice);
+    modules_register(MODULES_TYPE_VGA, &vgaDevice.base);
 
 }
 
diff --git a/build/Makefile b/build/Makefile
diff --git a/include/arch/x86/modules/io/io.h b/include/arch/x86/modules/io/io.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_IO_H
 #define ARCH_IO_H
 
-struct modules_io_device
+struct io_device
 {
 
     struct modules_module base;

diff --git a/include/arch/x86/modules/kbd/kbd.h b/include/arch/x86/modules/kbd/kbd.h
@@ -6,10 +6,10 @@
 
 struct isr_registers;
 
-struct modules_kbd_device
+struct kbd_device
 {
 
-    struct modules_io_device base;
+    struct io_device base;
     char buffer[256];
     unsigned int bufferSize;
     unsigned int bufferHead;

diff --git a/include/arch/x86/modules/serial/serial.h b/include/arch/x86/modules/serial/serial.h
@@ -6,13 +6,13 @@
 #define SERIAL_COM3 0x03E8
 #define SERIAL_COM4 0x02E8
 
-struct modules_serial_device
+struct serial_device
 {
 
     struct modules_module base;
     unsigned int port;
-    unsigned int (*read)(struct modules_serial_device *device, char *buffer, unsigned int count);
-    unsigned int (*write)(struct modules_serial_device *device, char *buffer, unsigned int count);
+    unsigned int (*read)(struct serial_device *device, char *buffer, unsigned int count);
+    unsigned int (*write)(struct serial_device *device, char *buffer, unsigned int count);
     struct file_node node;
 
 };

diff --git a/include/arch/x86/modules/vga/vga.h b/include/arch/x86/modules/vga/vga.h
@@ -4,7 +4,7 @@
 #define VGA_FB_ADDRESS 0xB8000
 #define VGA_FB_SIZE    2000
 
-struct modules_vga_device
+struct vga_device
 {
 
     struct modules_module base;

diff --git a/include/modules/elf/elf.h b/include/modules/elf/elf.h
@@ -3,11 +3,11 @@
 
 struct elf_header;
 
-struct modules_binary_module
+struct elf_module
 {
 
     struct modules_module base;
-    unsigned int (*check)(struct modules_binary_module *module, void *address);
+    unsigned int (*check)(struct elf_module *module, void *address);
 
 };
 

diff --git a/include/modules/tty/tty.h b/include/modules/tty/tty.h
@@ -21,7 +21,7 @@
 #define TTY_COLOR_RED2       0x0c
 #define TTY_COLOR_WHITE      0x0f
 
-struct modules_tty_device
+struct tty_device
 {
 
     struct modules_module base;

diff --git a/modules/elf/elf.c b/modules/elf/elf.c
@@ -3,7 +3,7 @@
 #include <kernel/modules.h>
 #include <modules/elf/elf.h>
 
-struct modules_binary_module elfModule;
+struct elf_module elfModule;
 
 unsigned int elf_check(void *address)
 {

diff --git a/modules/tty/tty.c b/modules/tty/tty.c
@@ -6,7 +6,7 @@
 #include <kernel/vfs.h>
 #include <modules/tty/tty.h>
 
-struct modules_tty_device ttyDevice;
+struct tty_device ttyDevice;
 
 struct file_node *ttyVgaNode;
 struct file_node *ttyVgaColorNode;