Skip to content

Commit c792fa6

Browse files
committed
Resolved Static Conflict in VGA Driver
1 parent 916f8a4 commit c792fa6

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/cpu/syscall.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "acpi_power.h"
22
#include "framebuffer.h"
3+
#include "heap.h"
34
#include "idt.h"
45
#include "power_plane.h"
56
#include "sched.h"
@@ -10,6 +11,7 @@
1011
#include "timer.h"
1112
#include "trace_forge.h"
1213
#include "types.h"
14+
#include "util.h"
1315
#include "vfs.h"
1416

1517
#define SYS_COPY_LIMIT 4096u

src/drivers/vga.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ static uint16_t* const vga_buffer = (uint16_t*)0xB8000;
77
static const uint8_t vga_width = 80;
88
static const uint8_t vga_height = 25;
99

10-
static void vga_clear(uint8_t color) {
10+
void vga_clear(uint8_t color) {
1111
uint16_t blank = (uint16_t)' ' | ((uint16_t)color << 8);
1212
for (uint32_t i = 0; i < (uint32_t)vga_width * vga_height; ++i) {
1313
vga_buffer[i] = blank;

0 commit comments

Comments
 (0)