projects
/
seabios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vgabios: Extract out current mode finding into new function.
[seabios.git]
/
vgasrc
/
vgafb.c
diff --git
a/vgasrc/vgafb.c
b/vgasrc/vgafb.c
index 71a57196c0f611b77fe2a8b06024115a377625e3..f0bd71ef563dfadfee6db5bf3644eefbb8c31981 100644
(file)
--- a/
vgasrc/vgafb.c
+++ b/
vgasrc/vgafb.c
@@
-7,7
+7,6
@@
#include "biosvar.h" // GET_BDA
#include "util.h" // memset_far
#include "biosvar.h" // GET_BDA
#include "util.h" // memset_far
-#include "vgahw.h" // vgahw_find_mode
#include "stdvga.h" // stdvga_planar4_plane
#include "stdvga.h" // stdvga_planar4_plane
@@
-171,7
+170,7
@@
void
vgafb_scroll(int nblines, int attr, struct cursorpos ul, struct cursorpos lr)
{
// Get the mode
vgafb_scroll(int nblines, int attr, struct cursorpos ul, struct cursorpos lr)
{
// Get the mode
- struct vgamode_s *vmode_g =
vgahw_find_mode(GET_BDA(video_mode)
);
+ struct vgamode_s *vmode_g =
get_current_mode(
);
if (!vmode_g)
return;
if (!vmode_g)
return;
@@
-339,7
+338,7
@@
void
vgafb_write_char(struct cursorpos cp, struct carattr ca)
{
// Get the mode
vgafb_write_char(struct cursorpos cp, struct carattr ca)
{
// Get the mode
- struct vgamode_s *vmode_g =
vgahw_find_mode(GET_BDA(video_mode)
);
+ struct vgamode_s *vmode_g =
get_current_mode(
);
if (!vmode_g)
return;
if (!vmode_g)
return;
@@
-365,7
+364,7
@@
struct carattr
vgafb_read_char(struct cursorpos cp)
{
// Get the mode
vgafb_read_char(struct cursorpos cp)
{
// Get the mode
- struct vgamode_s *vmode_g =
vgahw_find_mode(GET_BDA(video_mode)
);
+ struct vgamode_s *vmode_g =
get_current_mode(
);
if (!vmode_g)
goto fail;
if (!vmode_g)
goto fail;
@@
-397,7
+396,7
@@
void
vgafb_write_pixel(u8 color, u16 x, u16 y)
{
// Get the mode
vgafb_write_pixel(u8 color, u16 x, u16 y)
{
// Get the mode
- struct vgamode_s *vmode_g =
vgahw_find_mode(GET_BDA(video_mode)
);
+ struct vgamode_s *vmode_g =
get_current_mode(
);
if (!vmode_g)
return;
if (!vmode_g)
return;
@@
-453,7
+452,7
@@
u8
vgafb_read_pixel(u16 x, u16 y)
{
// Get the mode
vgafb_read_pixel(u16 x, u16 y)
{
// Get the mode
- struct vgamode_s *vmode_g =
vgahw_find_mode(GET_BDA(video_mode)
);
+ struct vgamode_s *vmode_g =
get_current_mode(
);
if (!vmode_g)
return 0;
if (!vmode_g)
return 0;