d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the broken support for monochrome VGA's.

Browse Source 
It was MY fault after all, damn..
This commit is contained in:
Søren Schmidt 1996-12-07 22:33:05 +00:00
parent 2f71230e78
commit 2092b5ac38
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=20197
3 changed files with 66 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/syscons/syscons.c
View File

@ -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);
}

25
sys/i386/isa/syscons.c
View File

@ -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);
}

25
sys/isa/syscons.c
View File

@ -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);
}