Skip to content

Commit

Permalink
Merge pull request #78 from Tearth/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Tearth authored Apr 27, 2020
2 parents d2f7b44 + 338d8fe commit fb3bc09
Show file tree
Hide file tree
Showing 38 changed files with 98 additions and 65 deletions.
6 changes: 3 additions & 3 deletions os/kernel/src/drivers/dal/videocard/videocard.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ int8_t (*_draw_pixel_external_buffer)(uint8_t*, uint16_t, int8_t, uint16_t, uint
int8_t (*_draw_line_external_buffer)(uint8_t*, uint16_t, uint8_t, uint16_t, uint16_t, uint16_t, uint16_t) = NULL;
int8_t (*_draw_circle_external_buffer)(uint8_t*, uint16_t, uint8_t, uint16_t, uint16_t, uint16_t) = NULL;
int8_t (*_draw_rectangle_external_buffer)(uint8_t*, uint16_t, uint8_t, uint16_t, uint16_t, uint16_t, uint16_t) = NULL;
int8_t (*_clear_screen_external_buffer)(uint8_t*, uint16_t) = NULL;
int8_t (*_clear_screen_external_buffer)(uint8_t*, uint16_t, uint16_t*, uint16_t*) = NULL;

int8_t (*_swap_external_buffer)(uint8_t*, uint16_t) = NULL;
uint8_t* (*_create_external_buffer)(uint16_t) = NULL;
Expand Down Expand Up @@ -466,8 +466,8 @@ int8_t video_card_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, ui
int8_t video_card_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return (*_draw_rectangle_external_buffer)(buffer, mode, color, ax, ay, bx, by);
}
int8_t video_card_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode){
return (*_clear_screen_external_buffer)(buffer, mode);
int8_t video_card_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y){
return (*_clear_screen_external_buffer)(buffer, mode, x, y);
}

int8_t video_card_swap_external_buffer(uint8_t* buffer, uint16_t mode){
Expand Down
4 changes: 2 additions & 2 deletions os/kernel/src/drivers/dal/videocard/videocard.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ typedef struct _driver_init_struct
int8_t (*draw_line_external_buffer)(uint8_t*, uint16_t, uint8_t, uint16_t, uint16_t, uint16_t, uint16_t);
int8_t (*draw_circle_external_buffer)(uint8_t*, uint16_t, uint8_t, uint16_t, uint16_t, uint16_t);
int8_t (*draw_rectangle_external_buffer)(uint8_t*, uint16_t, uint8_t, uint16_t, uint16_t, uint16_t, uint16_t);
int8_t (*clear_screen_external_buffer)(uint8_t*, uint16_t);
int8_t (*clear_screen_external_buffer)(uint8_t*, uint16_t, uint16_t*, uint16_t*);

int8_t (*swap_external_buffer)(uint8_t*, uint16_t);
uint8_t* (*create_external_buffer)(uint16_t);
Expand Down Expand Up @@ -507,7 +507,7 @@ int8_t video_card_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int
int8_t video_card_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t video_card_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t video_card_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t video_card_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t video_card_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t video_card_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* video_card_create_external_buffer(uint16_t mode);
Expand Down
6 changes: 3 additions & 3 deletions os/kernel/src/drivers/harddisk/ata/harddisk_ata.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ int8_t __harddisk_ata_write_sector(HARDDISK_ATA_MASTER_SLAVE type, HARDDISK_ATA_
for(int i = 0; i < 256; i++)
{
// Write 256 16-bit values.
io_out_word(io_port, buffer[i]);
// Cache flush.
io_out_byte(io_port + HARDDISK_IO_COMMAND_REGISTER_OFFSET, 0xE7);
io_out_word(io_port, buffer[i]);
}
// Cache flush.
io_out_byte(io_port + HARDDISK_IO_COMMAND_REGISTER_OFFSET, 0xE7);
__harddisk_400ns_delay(control_port);
return 1;
}
Expand Down
34 changes: 17 additions & 17 deletions os/kernel/src/drivers/vga/genericvga.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,41 +431,41 @@ int8_t generic_vga_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode
default: return -1;
}
}
int8_t generic_vga_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode){
int8_t generic_vga_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y){
switch(mode)
{
case 0x00:
return mode00h_clear_screen_external_buffer(buffer, mode);
return mode00h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x01:
return mode01h_clear_screen_external_buffer(buffer, mode);
return mode01h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x02:
return mode02h_clear_screen_external_buffer(buffer, mode);
return mode02h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x03:
return mode03h_clear_screen_external_buffer(buffer, mode);
return mode03h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x04:
return mode04h_clear_screen_external_buffer(buffer, mode);
return mode04h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x05:
return mode05h_clear_screen_external_buffer(buffer, mode);
return mode05h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x06:
return mode06h_clear_screen_external_buffer(buffer, mode);
return mode06h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x07:
return mode07h_clear_screen_external_buffer(buffer, mode);
return mode07h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x0D:
return mode0dh_clear_screen_external_buffer(buffer, mode);
return mode0dh_clear_screen_external_buffer(buffer, mode, x, y);
case 0x0E:
return mode0eh_clear_screen_external_buffer(buffer, mode);
return mode0eh_clear_screen_external_buffer(buffer, mode, x, y);
case 0x0F:
return mode0fh_clear_screen_external_buffer(buffer, mode);
return mode0fh_clear_screen_external_buffer(buffer, mode, x, y);
case 0x10:
return mode10h_clear_screen_external_buffer(buffer, mode);
return mode10h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x11:
return mode11h_clear_screen_external_buffer(buffer, mode);
return mode11h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x12:
return mode12h_clear_screen_external_buffer(buffer, mode);
return mode12h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x13:
return mode13h_clear_screen_external_buffer(buffer, mode);
return mode13h_clear_screen_external_buffer(buffer, mode, x, y);
case 0x69:
return modey_clear_screen_external_buffer(buffer, mode);
return modey_clear_screen_external_buffer(buffer, mode, x, y);
default: return -1;
}
}
Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/genericvga.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ int8_t generic_vga_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, in
int8_t generic_vga_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t generic_vga_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t generic_vga_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t generic_vga_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t generic_vga_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t generic_vga_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* generic_vga_create_external_buffer(uint16_t mode);
Expand Down
6 changes: 4 additions & 2 deletions os/kernel/src/drivers/vga/modes/mode_00h/mode_00h.c
Original file line number Diff line number Diff line change
Expand Up @@ -912,8 +912,10 @@ int8_t mode00h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8
int8_t mode00h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return -1;
}
int8_t mode00h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode)
int8_t mode00h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y)
{
if(x != NULL) *x = 0;
if(y != NULL) *y = 0;
vga_color_without_blink col = {.background = VGA_MODE_00H_COLOR_BLACK, .letter = VGA_MODE_00H_COLOR_LIGHT_GRAY};
for (uint16_t i = 0; i < VGA_MODE_00H_SCREEN_ROWS; ++i)
{
Expand All @@ -936,7 +938,7 @@ int8_t mode00h_swap_external_buffer(uint8_t* buffer, uint16_t mode){
uint8_t* mode00h_create_external_buffer(uint16_t mode){
uint8_t* ptr = heap_kernel_alloc(MODE00H_HEIGHT * MODE00H_WIDTH * sizeof(screen_char), 0);
memset(ptr, 0, MODE00H_HEIGHT * MODE00H_WIDTH * sizeof(screen_char));
mode00h_clear_screen_external_buffer(ptr, mode);
mode00h_clear_screen_external_buffer(ptr, mode, NULL, NULL);
return ptr;
}

Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_00h/mode_00h.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ int8_t mode00h_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int8_t
int8_t mode00h_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode00h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t mode00h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode00h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t mode00h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t mode00h_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* mode00h_create_external_buffer(uint16_t mode);
Expand Down
6 changes: 4 additions & 2 deletions os/kernel/src/drivers/vga/modes/mode_01h/mode_01h.c
Original file line number Diff line number Diff line change
Expand Up @@ -912,8 +912,10 @@ int8_t mode01h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8
int8_t mode01h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return -1;
}
int8_t mode01h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode)
int8_t mode01h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y)
{
if(x != NULL) *x = 0;
if(y != NULL) *y = 0;
vga_color_without_blink col = {.background = VGA_MODE_01H_COLOR_BLACK, .letter = VGA_MODE_01H_COLOR_LIGHT_GRAY};
for (uint16_t i = 0; i < VGA_MODE_01H_SCREEN_ROWS; ++i)
{
Expand All @@ -936,7 +938,7 @@ int8_t mode01h_swap_external_buffer(uint8_t* buffer, uint16_t mode){
uint8_t* mode01h_create_external_buffer(uint16_t mode){
uint8_t* ptr = heap_kernel_alloc(MODE01H_HEIGHT * MODE01H_WIDTH * sizeof(screen_char), 0);
memset(ptr, 0, MODE01H_HEIGHT * MODE01H_WIDTH * sizeof(screen_char));
mode01h_clear_screen_external_buffer(ptr, mode);
mode01h_clear_screen_external_buffer(ptr, mode, NULL, NULL);
return ptr;
}

Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_01h/mode_01h.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ int8_t mode01h_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int8_t
int8_t mode01h_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode01h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t mode01h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode01h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t mode01h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t mode01h_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* mode01h_create_external_buffer(uint16_t mode);
Expand Down
6 changes: 4 additions & 2 deletions os/kernel/src/drivers/vga/modes/mode_02h/mode_02h.c
Original file line number Diff line number Diff line change
Expand Up @@ -912,8 +912,10 @@ int8_t mode02h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8
int8_t mode02h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return -1;
}
int8_t mode02h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode)
int8_t mode02h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y)
{
if(x != NULL) *x = 0;
if(y != NULL) *y = 0;
vga_color_without_blink col = {.background = VGA_MODE_02H_COLOR_BLACK, .letter = VGA_MODE_02H_COLOR_LIGHT_GRAY};
for (uint16_t i = 0; i < VGA_MODE_02H_SCREEN_ROWS; ++i)
{
Expand All @@ -936,7 +938,7 @@ int8_t mode02h_swap_external_buffer(uint8_t* buffer, uint16_t mode){
uint8_t* mode02h_create_external_buffer(uint16_t mode){
uint8_t* ptr = heap_kernel_alloc(MODE02H_HEIGHT * MODE02H_WIDTH * sizeof(screen_char), 0);
memset(ptr, 0, MODE02H_HEIGHT * MODE02H_WIDTH * sizeof(screen_char));
mode02h_clear_screen_external_buffer(ptr, mode);
mode02h_clear_screen_external_buffer(ptr, mode, NULL, NULL);
return ptr;
}

Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_02h/mode_02h.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ int8_t mode02h_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int8_t
int8_t mode02h_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode02h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t mode02h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode02h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t mode02h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t mode02h_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* mode02h_create_external_buffer(uint16_t mode);
Expand Down
6 changes: 4 additions & 2 deletions os/kernel/src/drivers/vga/modes/mode_03h/mode_03h.c
Original file line number Diff line number Diff line change
Expand Up @@ -920,8 +920,10 @@ int8_t mode03h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8
int8_t mode03h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return -1;
}
int8_t mode03h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode)
int8_t mode03h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y)
{
if(x != NULL) *x = 0;
if(y != NULL) *y = 0;
vga_color_without_blink col = {.background = VGA_MODE_03H_COLOR_BLACK, .letter = VGA_MODE_03H_COLOR_LIGHT_GRAY};
for (uint16_t i = 0; i < VGA_MODE_03H_SCREEN_ROWS; ++i)
{
Expand All @@ -944,7 +946,7 @@ int8_t mode03h_swap_external_buffer(uint8_t* buffer, uint16_t mode){
uint8_t* mode03h_create_external_buffer(uint16_t mode){
uint8_t* ptr = heap_kernel_alloc(MODE03H_HEIGHT * MODE03H_WIDTH * sizeof(screen_char), 0);
memset(ptr, 0, MODE03H_HEIGHT * MODE03H_WIDTH * sizeof(screen_char));
mode03h_clear_screen_external_buffer(ptr, mode);
mode03h_clear_screen_external_buffer(ptr, mode, NULL, NULL);
return ptr;
}

Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_03h/mode_03h.h
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ int8_t mode03h_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int8_t
int8_t mode03h_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode03h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t mode03h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode03h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t mode03h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t mode03h_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* mode03h_create_external_buffer(uint16_t mode);
Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_04h/mode_04h.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ int8_t mode04h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8
int8_t mode04h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return 0;
}
int8_t mode04h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode){
int8_t mode04h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y){
memset(buffer, 0, 2 * MODE04H_HEIGHT * MODE04H_WIDTH / 8);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_04h/mode_04h.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int8_t mode04h_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int8_t
int8_t mode04h_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode04h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t mode04h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode04h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t mode04h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t mode04h_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* mode04h_create_external_buffer(uint16_t mode);
Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_05h/mode_05h.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ int8_t mode05h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8
int8_t mode05h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return 0;
}
int8_t mode05h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode){
int8_t mode05h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t*x, uint16_t* y ){
memset(buffer, 0, 2 * MODE05H_HEIGHT * MODE05H_WIDTH / 8);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_05h/mode_05h.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int8_t mode05h_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int8_t
int8_t mode05h_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode05h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t mode05h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode05h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t mode05h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t mode05h_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* mode05h_create_external_buffer(uint16_t mode);
Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_06h/mode_06h.c
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ int8_t mode06h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8
int8_t mode06h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by){
return 0;
}
int8_t mode06h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode){
int8_t mode06h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y){
memset(buffer, 0, 2 * MODE06H_HEIGHT * MODE06H_WIDTH / 16);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion os/kernel/src/drivers/vga/modes/mode_06h/mode_06h.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int8_t mode06h_draw_pixel_external_buffer(uint8_t* buffer, uint16_t mode, int8_t
int8_t mode06h_draw_line_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode06h_draw_circle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t x, uint16_t y, uint16_t radius);
int8_t mode06h_draw_rectangle_external_buffer(uint8_t* buffer, uint16_t mode, uint8_t color, uint16_t ax, uint16_t ay, uint16_t bx, uint16_t by);
int8_t mode06h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode);
int8_t mode06h_clear_screen_external_buffer(uint8_t* buffer, uint16_t mode, uint16_t* x, uint16_t* y);

int8_t mode06h_swap_external_buffer(uint8_t* buffer, uint16_t mode);
uint8_t* mode06h_create_external_buffer(uint16_t mode);
Expand Down
Loading

0 comments on commit fb3bc09

Please sign in to comment.