1
0
Fork 0

Merge branch 'svn/trunk' r4276

This commit is contained in:
Patryk Obara 2019-10-28 05:36:50 +01:00
commit b87966cd11

View file

@ -1333,23 +1333,18 @@ dac_text16:
real_writeb(RealSeg(dsapt),RealOff(dsapt)+0x10,0); // overscan
}
/* Setup some special stuff for different modes */
Bit8u feature=real_readb(BIOSMEM_SEG,BIOSMEM_INITIAL_MODE);
switch (CurMode->type) {
case M_CGA2:
feature=(feature&~0x30)|0x20;
real_writeb(BIOSMEM_SEG,BIOSMEM_CURRENT_MSR,0x1e);
break;
case M_CGA4:
feature=(feature&~0x30)|0x20;
if (CurMode->mode==4) real_writeb(BIOSMEM_SEG,BIOSMEM_CURRENT_MSR,0x2a);
else if (CurMode->mode==5) real_writeb(BIOSMEM_SEG,BIOSMEM_CURRENT_MSR,0x2e);
else real_writeb(BIOSMEM_SEG,BIOSMEM_CURRENT_MSR,0x2);
break;
case M_TANDY16:
feature=(feature&~0x30)|0x20;
break;
case M_TEXT:
feature=(feature&~0x30)|0x20;
switch (CurMode->mode) {
case 0:real_writeb(BIOSMEM_SEG,BIOSMEM_CURRENT_MSR,0x2c);break;
case 1:real_writeb(BIOSMEM_SEG,BIOSMEM_CURRENT_MSR,0x28);break;
@ -1361,11 +1356,8 @@ dac_text16:
case M_LIN4:
case M_EGA:
case M_VGA:
feature=(feature&~0x30);
break;
}
// disabled, has to be set in bios.cpp exclusively
// real_writeb(BIOSMEM_SEG,BIOSMEM_INITIAL_MODE,feature);
if (svgaCard == SVGA_S3Trio) {
/* Setup the CPU Window */