diff options
| author | sos <sos@FreeBSD.org> | 1996-12-07 22:33:05 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 1996-12-07 22:33:05 +0000 |
| commit | 7bab9fc90a4fbdb99f4be6e2788ccfb74a9e8c70 (patch) | |
| tree | cb37af5342584943bde02743072146c481c75573 /sys/i386/isa | |
| parent | ba8fcf69ff169cf6da03e78c66c56af5880a4849 (diff) | |
| download | FreeBSD-src-7bab9fc90a4fbdb99f4be6e2788ccfb74a9e8c70.zip FreeBSD-src-7bab9fc90a4fbdb99f4be6e2788ccfb74a9e8c70.tar.gz | |
Fix the broken support for monochrome VGA's.
It was MY fault after all, damn..
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/syscons.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 691460a..6c0c97c 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.189 1996/11/19 17:08:10 nate Exp $ + * $Id: syscons.c,v 1.190 1996/12/01 19:05:47 sos Exp $ */ #include "sc.h" @@ -2429,7 +2429,17 @@ static scr_stat static void init_scp(scr_stat *scp) { - scp->mode = M_VGA_C80x25; + if (crtc_vga) + if (crtc_addr == MONO_BASE) + scp->mode = M_VGA_M80x25; + else + scp->mode = M_VGA_C80x25; + else + if (crtc_addr == MONO_BASE) + scp->mode = M_B80x25; + else + scp->mode = M_C80x25; + scp->font_size = FONT_16; scp->xsize = COL; scp->ysize = ROW; @@ -3246,12 +3256,21 @@ set_normal_mode() outb(GDCIDX, 0x04); outb(GDCREG, modetable[0x04+55]); outb(GDCIDX, 0x05); outb(GDCREG, modetable[0x05+55]); outb(GDCIDX, 0x06); outb(GDCREG, modetable[0x06+55]); + if (crtc_addr == MONO_BASE) { + outb(GDCIDX, 0x06); outb(GDCREG,(modetable[0x06+55] & 0x03) | 0x08); + } + else { + outb(GDCIDX, 0x06); outb(GDCREG,(modetable[0x06+55] & 0x03) | 0x0c); + } #else outw(TSIDX, 0x0002 | (modetable[0x02+4]<<8)); outw(TSIDX, 0x0004 | (modetable[0x04+4]<<8)); outw(GDCIDX, 0x0004 | (modetable[0x04+55]<<8)); outw(GDCIDX, 0x0005 | (modetable[0x05+55]<<8)); - outw(GDCIDX, 0x0006 | (modetable[0x06+55]<<8)); + if (crtc_addr == MONO_BASE) + outw(GDCIDX, 0x0006 | (((modetable[0x06+55] & 0x03) | 0x08)<<8)); + else + outw(GDCIDX, 0x0006 | (((modetable[0x06+55] & 0x03) | 0x0c)<<8)); #endif splx(s); } |
