diff options
| author | Marvin Borner | 2019-10-13 20:11:32 +0200 |
|---|---|---|
| committer | Marvin Borner | 2019-10-13 20:11:32 +0200 |
| commit | 8754542ce074bef0984f91ce1b1cd8aff9b3d5e9 (patch) | |
| tree | 66c6df9f2a2e9e4482ddfbce10490f706f78da33 /src/kernel/graphics/vesa.c | |
| parent | 58804851fc49f6db1c87f791d39779766108efb0 (diff) | |
Fixed all compiler warnings
Diffstat (limited to 'src/kernel/graphics/vesa.c')
| -rw-r--r-- | src/kernel/graphics/vesa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c index cc9dd97..d19e7d8 100644 --- a/src/kernel/graphics/vesa.c +++ b/src/kernel/graphics/vesa.c @@ -15,7 +15,7 @@ void switch_to_vga() { } struct edid_data get_edid() { - /*struct edid_data *edid = umalloc(sizeof(struct edid_data)); + struct edid_data *edid = (struct edid_data *) kmalloc(sizeof(struct edid_data)); regs16_t regs; regs.ax = 0x4F15; @@ -24,9 +24,9 @@ struct edid_data get_edid() { regs.di = get_offset(edid); int32(0x10, ®s); - ufree(edid); + kfree(edid); - return *edid;*/ + return *edid; } struct vbe_mode_info *vbe_set_mode(unsigned short mode) { @@ -81,7 +81,7 @@ void set_optimal_resolution() { regs16_t regs; regs.ax = 0x4F00; regs.es = 0; - regs.di = (unsigned short) info; + regs.di = 0x2000; int32(0x10, ®s); if (regs.ax != 0x004F || strcmp(info->signature, "VESA") != 0) { |