aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Ruppert <info@vruppert.de>2004-02-23 21:07:59 +0000
committerVolker Ruppert <info@vruppert.de>2004-02-23 21:07:59 +0000
commitb423f792ac7cd67d55c0da3196a5dc7375407c99 (patch)
treed0c8e62b4910021e2e5c20265fa98f35dfcb44e4
parent79afcf31ab9b5582682bf74b3cd3976f502010dc (diff)
downloadvgabios-b423f792ac7cd67d55c0da3196a5dc7375407c99.tar.gz
- dispi_get_max_bpp(): restore the original value of the vbe enable register
-rw-r--r--vbe.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/vbe.c b/vbe.c
index c8e4066..179a9eb 100644
--- a/vbe.c
+++ b/vbe.c
@@ -175,14 +175,15 @@ static Bit16u dispi_get_bpp()
static Bit16u dispi_get_max_bpp()
{
- Bit16u max_bpp;
+ Bit16u max_bpp, vbe_enable;
outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_ENABLE);
- outw(VBE_DISPI_IOPORT_DATA,VBE_DISPI_GETCAPS);
+ vbe_enable = inw(VBE_DISPI_IOPORT_DATA);
+ outw(VBE_DISPI_IOPORT_DATA,vbe_enable|VBE_DISPI_GETCAPS);
outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_BPP);
max_bpp = inw(VBE_DISPI_IOPORT_DATA);
outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_ENABLE);
- outw(VBE_DISPI_IOPORT_DATA,VBE_DISPI_DISABLED);
+ outw(VBE_DISPI_IOPORT_DATA,vbe_enable);
return max_bpp;
}