started to make driver construtors similar (keyboard, mouse)

passing context around to pci scanning function for driver initialization

5 files changed, 13 insertions, 13 deletions

diff --git a/src/drivers/hdi/ps2/keyboard.c b/src/drivers/hdi/ps2/keyboard.c
index ccae3e7..1c5f978 100644
--- a/src/drivers/hdi/ps2/keyboard.c
+++ b/src/drivers/hdi/ps2/keyboard.c
@@ -73,16 +73,17 @@ static keyboard_vtable_t const keyboard_vtable = {
 	}
 };
 
-void keyboard_init( keyboard_t *keyboard, keyboard_event_handler_t handler, void *context )
+void keyboard_init( keyboard_t *keyboard, keyboard_event_handler_t handler, interrupt_t *interrupt, void *context )
 {
 	memset( keyboard, 0, sizeof( keyboard_t ) );
 
+	driver_init( (driver_t *)keyboard, interrupt, context );
+	
 	port8_init( &keyboard->command_port, 0x64 );
 	port8_init( &keyboard->data_port, 0x60 );
 
 	keyboard->shift = false;
 	keyboard->handler = handler;
-	keyboard->context = context;
 
 	((driver_t *)keyboard)->vtable = (driver_vtable_t *)&keyboard_vtable;
 }
@@ -315,7 +316,7 @@ uint32_t keyboard_handle_interrupt( interrupt_handler_t *handler, uint32_t esp )
 		event.key = KEYBOARD_KEY_ESC;
 	}
 
-	keyboard->handler( &event, keyboard->context );
+	keyboard->handler( &event, keyboard->base.context );
 	
 	return esp;
 }
diff --git a/src/drivers/hdi/ps2/keyboard.h b/src/drivers/hdi/ps2/keyboard.h
index 5f90ee8..c80b363 100644
--- a/src/drivers/hdi/ps2/keyboard.h
+++ b/src/drivers/hdi/ps2/keyboard.h
@@ -51,14 +51,13 @@ typedef struct {
 	port8_t data_port;
 	bool shift;
 	keyboard_event_handler_t handler;
-	void *context;
 } keyboard_t;
 
 typedef struct {
 	driver_vtable_t base;
 } keyboard_vtable_t;
 
-void keyboard_init( keyboard_t *keyboard, keyboard_event_handler_t handler, void *context );
+void keyboard_init( keyboard_t *keyboard, keyboard_event_handler_t handler, interrupt_t *interrupt, void *context );
 void keyboard_activate( void *obj );
 void keyboard_deactivate( void *obj );
 void keyboard_deinit( void *obj );
diff --git a/src/drivers/hdi/ps2/mouse.c b/src/drivers/hdi/ps2/mouse.c
index 1421729..169f994 100644
--- a/src/drivers/hdi/ps2/mouse.c
+++ b/src/drivers/hdi/ps2/mouse.c
@@ -85,16 +85,17 @@ static mouse_vtable_t const mouse_vtable = {
 	}
 };
 
-void mouse_init( mouse_t *mouse, mouse_event_handler_t handler, const uint32_t res_x, const uint32_t res_y, void *context )
+void mouse_init( mouse_t *mouse, mouse_event_handler_t handler, const uint32_t res_x, const uint32_t res_y, interrupt_t *interrupt, void *context )
 {
 	memset( mouse, 0, sizeof( mouse_t ) );
+	
+	driver_init( (driver_t *)mouse, interrupt, context );
 
 	// TODO: we should probe for wheel mouse and more than 3 packets
 	mouse->nof_packets = DEFAULT_NOF_PACKETS;
 
 	mouse_set_resolution( mouse, res_x, res_y );
 	mouse->handler = handler;
-	mouse->context = context;
 
 	port8_init( &mouse->command_port, 0x64 );
 	port8_init( &mouse->data_port, 0x60 );
@@ -185,7 +186,7 @@ uint32_t mouse_handle_interrupt( interrupt_handler_t *handler, uint32_t esp )
 						}
 						event.cursor_x = mouse->cursor_x;
 						event.cursor_y = mouse->cursor_y;
-						mouse->handler( &event, mouse->context );
+						mouse->handler( &event, mouse->base.context );
 					}
 				}
 				mouse->buttons = mouse->buf[0];
@@ -222,7 +223,7 @@ uint32_t mouse_handle_interrupt( interrupt_handler_t *handler, uint32_t esp )
 				event.cursor_x = mouse->cursor_x;
 				event.cursor_y = mouse->cursor_y;
 
-				mouse->handler( &event, mouse->context );
+				mouse->handler( &event, mouse->base.context );
 			}
 
 			break;
diff --git a/src/drivers/hdi/ps2/mouse.h b/src/drivers/hdi/ps2/mouse.h
index e6ac326..b87efa5 100644
--- a/src/drivers/hdi/ps2/mouse.h
+++ b/src/drivers/hdi/ps2/mouse.h
@@ -47,14 +47,13 @@ typedef struct {
 	int32_t cursor_x;
 	int32_t cursor_y;
 	mouse_event_handler_t handler;
-	void *context;
 } mouse_t;
 
 typedef struct {
 	driver_vtable_t base;
 } mouse_vtable_t;
 
-void mouse_init( mouse_t *mouse, mouse_event_handler_t handler, const uint32_t res_x, const uint32_t res_y, void *context );
+void mouse_init( mouse_t *mouse, mouse_event_handler_t handler, const uint32_t res_x, const uint32_t res_y, interrupt_t *interrupt, void *context );
 void mouse_activate( void *obj );
 void mouse_deactivate( void *obj );
 void mouse_deinit( void *obj );
diff --git a/src/drivers/video/vga.c b/src/drivers/video/vga.c
index a8836fd..3db41ad 100644
--- a/src/drivers/video/vga.c
+++ b/src/drivers/video/vga.c
@@ -41,12 +41,12 @@ void vga_init( vga_t *vga, interrupt_t *interrupt, void *context )
 
 void vga_activate( void *obj )
 {
-	puts( "Activating driver for VGA video card.." );
+	puts( "Activating driver for generic VGA video card.." );
 }
 
 void vga_deactivate( void *obj )
 {
-	puts( "Dectivating driver for VGA video card.." );
+	puts( "Dectivating driver for generic VGA video card.." );
 }
 
 void vga_deinit( void *obj )