diff options
Diffstat (limited to 'src/drivers/video')
-rw-r--r-- | src/drivers/video/vga.c | 8 | ||||
-rw-r--r-- | src/drivers/video/vga.h | 1 | ||||
-rw-r--r-- | src/drivers/video/video.c | 29 | ||||
-rw-r--r-- | src/drivers/video/video.h | 4 |
4 files changed, 13 insertions, 29 deletions
diff --git a/src/drivers/video/vga.c b/src/drivers/video/vga.c index 670df02..3ce0e86 100644 --- a/src/drivers/video/vga.c +++ b/src/drivers/video/vga.c @@ -15,6 +15,7 @@ static vga_vtable_t const vga_vtable = { vga_activate, vga_deactivate, vga_deinit, + vga_print_name, vga_print_info }, video_register_mode, @@ -146,11 +147,16 @@ void vga_deinit( void *obj ) } } -void vga_print_info( void *obj ) +void vga_print_name( void *obj ) { puts( "Generic VGA video driver" ); } +void vga_print_info( void *obj ) +{ + // TODO: print avaiable modes, colors, resolutions +} + static void write_registers( vga_t *vga, uint8_t *regs ) { // misc diff --git a/src/drivers/video/vga.h b/src/drivers/video/vga.h index faafd8e..26b66cd 100644 --- a/src/drivers/video/vga.h +++ b/src/drivers/video/vga.h @@ -48,6 +48,7 @@ void vga_init( vga_t *vga, interrupt_t *interrupt, void *context ); void vga_activate( void *obj ); void vga_deactivate( void *obj ); void vga_deinit( void *obj ); +void vga_print_name( void *obj ); void vga_print_info( void *obj ); bool vga_switch_mode( void *obj, const video_mode_t *mode ); diff --git a/src/drivers/video/video.c b/src/drivers/video/video.c index 064a1f6..6169714 100644 --- a/src/drivers/video/video.c +++ b/src/drivers/video/video.c @@ -7,10 +7,11 @@ static video_vtable_t const video_vtable = { { - video_activate, - video_deactivate, - video_deinit, - video_print_info + driver_activate, + driver_deactivate, + driver_deinit, + driver_print_name, + driver_print_info } }; @@ -25,26 +26,6 @@ void video_init( video_t *video, interrupt_t *interrupt, void *context ) ((driver_t *)video)->vtable = (driver_vtable_t *)&video_vtable; } -void video_activate( void *obj ) -{ - kernel_panic( "Calling abstract method in file %s at line %d.", __FILE__, __LINE__ ); -} - -void video_deactivate( void *obj ) -{ - kernel_panic( "Calling abstract method in file %s at line %d.", __FILE__, __LINE__ ); -} - -void video_deinit( void *obj ) -{ - // nothing to be done -} - -void video_print_info( void *obj ) -{ - kernel_panic( "Calling abstract method in file %s at line %d.", __FILE__, __LINE__ ); -} - video_mode_t video_make_mode( const video_mode_type_t mode_type, const int x, const int y, const int color_depth ) { video_mode_t mode; diff --git a/src/drivers/video/video.h b/src/drivers/video/video.h index 8cfebb3..037d703 100644 --- a/src/drivers/video/video.h +++ b/src/drivers/video/video.h @@ -48,10 +48,6 @@ typedef struct { } video_vtable_t; void video_init( video_t *video, interrupt_t *interrupt, void *context ); -void video_activate( void *obj ); -void video_deactivate( void *obj ); -void video_deinit( void *obj ); -void video_print_info( void *obj ); video_mode_t video_make_mode( const video_mode_type_t mode_type, const int x, const int y, const int color_depth ); |