Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 182586
b: refs/heads/master
c: 8e92dc7
h: refs/heads/master
v: v3
  • Loading branch information
H. Peter Anvin committed Feb 19, 2010
1 parent 2e48ab8 commit 05a95d9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eb572a5c7951288e265b3e8f9a5d37b6abb2e996
refs/heads/master: 8e92dc767abb58357e696a48fc3d8ce615a9c01a
9 changes: 1 addition & 8 deletions trunk/arch/x86/boot/video-vga.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,15 @@ static u8 vga_set_basic_mode(void)
{
struct biosregs ireg, oreg;
u16 ax;
u8 rows;
u8 mode;

initregs(&ireg);

/* Query current mode */
ax = 0x0f00;
intcall(0x10, &ireg, &oreg);
mode = oreg.al;

set_fs(0);
rows = rdfs8(0x484); /* rows minus one */

if ((oreg.ax == 0x5003 || oreg.ax == 0x5007) &&
(rows == 0 || rows == 24))
return mode;

if (mode != 3 && mode != 7)
mode = 3;

Expand Down

0 comments on commit 05a95d9

Please sign in to comment.