diff options
author | Marvin Borner | 2021-05-20 22:18:35 +0200 |
---|---|---|
committer | Marvin Borner | 2021-05-20 22:19:20 +0200 |
commit | d8d17375291f89d37cad43df36c11d9c132e23be (patch) | |
tree | ed6ba70ac6bd6b4e50dde6e1a0b2d62b7881e721 /libs | |
parent | 298aaf63f15350e6248d5a96e8c6a63b0ec93e0f (diff) |
Added BGA driver and generic FB wrapper
Diffstat (limited to 'libs')
-rw-r--r-- | libs/libc/inc/sys.h | 8 | ||||
-rw-r--r-- | libs/libgui/gfx.c | 1 | ||||
-rw-r--r-- | libs/libgui/gfx.h | 1 | ||||
-rw-r--r-- | libs/libgui/vesa.h | 46 |
4 files changed, 8 insertions, 48 deletions
diff --git a/libs/libc/inc/sys.h b/libs/libc/inc/sys.h index 7d81f33..14d9698 100644 --- a/libs/libc/inc/sys.h +++ b/libs/libc/inc/sys.h @@ -52,6 +52,14 @@ enum io_type { #define IOCTL_BUS_CONNECT_CONN 1 #define IOCTL_BUS_REGISTER 2 +struct fb_generic { + u16 bpp; + u16 pitch; + u16 width; + u16 height; + u8 *fb; +}; + struct bus_header { u32 conn; // Data starts here diff --git a/libs/libgui/gfx.c b/libs/libgui/gfx.c index e68c2ad..3ed8375 100644 --- a/libs/libgui/gfx.c +++ b/libs/libgui/gfx.c @@ -10,7 +10,6 @@ #include <libgui/msg.h> #include <libgui/png.h> #include <libgui/psf.h> -#include <libgui/vesa.h> #include <list.h> #include <mem.h> #include <str.h> diff --git a/libs/libgui/gfx.h b/libs/libgui/gfx.h index d0d0e1e..1dfa96d 100644 --- a/libs/libgui/gfx.h +++ b/libs/libgui/gfx.h @@ -5,7 +5,6 @@ #define GFX_H #include <def.h> -#include <libgui/vesa.h> #include <sys.h> #include <vec.h> diff --git a/libs/libgui/vesa.h b/libs/libgui/vesa.h deleted file mode 100644 index 892bd89..0000000 --- a/libs/libgui/vesa.h +++ /dev/null @@ -1,46 +0,0 @@ -// MIT License, Copyright (c) 2020 Marvin Borner - -#ifndef VBE_H -#define VBE_H - -#include <def.h> - -struct vbe { - u16 attributes; - u8 window_a; - u8 window_b; - u16 granularity; - u16 window_size; - u16 segment_a; - u16 segment_b; - u32 win_func_ptr; - u16 pitch; - u16 width; - u16 height; - u8 w_char; - u8 y_char; - u8 planes; - u8 bpp; - u8 banks; - u8 memory_model; - u8 bank_size; - u8 image_pages; - u8 reserved0; - - u8 red_mask; - u8 red_position; - u8 green_mask; - u8 green_position; - u8 blue_mask; - u8 blue_position; - u8 reserved_mask; - u8 reserved_position; - u8 direct_color_attributes; - - u8 *fb; - u32 off_screen_mem_off; - u16 off_screen_mem_size; - u8 reserved1[206]; -}; - -#endif |