valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

add default palette skipping on modeset functionality (int10 alternate function select; fixes WW2 Battles of the South Pacific)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2902
This commit is contained in:
Sebastian Strohhäcker 2007-06-28 16:32:45 +00:00
parent f034692ce8
commit cd9b01ef68
2 changed files with 74 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ints/int10.cpp
View file

@ -299,6 +299,21 @@ graphics_chars:
reg_bl=3; //256 kb
reg_cx=real_readb(BIOSMEM_SEG,BIOSMEM_SWITCHES) & 0x0F;
break;
case 0x20: /* Set alternate printscreen */
break;
case 0x30: /* Select vertical resolution */
case 0x32: /* Video adressing */
LOG(LOG_INT10,LOG_ERROR)("Function 12:Call %2X not handled",reg_bl);
reg_al=0x12; //fake a success call
break;
case 0x31: /* Palette loading on modeset */
{
Bit8u temp = real_readb(BIOSMEM_SEG,BIOSMEM_MODESET_CTL) & 0xf7;
if (reg_al&1) temp|=8; // enable if al=0
real_writeb(BIOSMEM_SEG,BIOSMEM_MODESET_CTL,temp);
reg_al=0x12;
break;
}
case 0x33: /* SWITCH GRAY-SCALE SUMMING */
{
Bit8u temp = real_readb(BIOSMEM_SEG,BIOSMEM_MODESET_CTL) & 0xfd;
@ -324,7 +339,8 @@ graphics_chars:
break;
default:
LOG(LOG_INT10,LOG_ERROR)("Function 12:Call %2X not handled",reg_bl);
reg_al=0x12; //Always fake a success call
reg_al=0x12; // wrong!?
break;
}
break;
case 0x13: /* Write String */

110
src/ints/int10_modes.cpp
View file

@ -874,65 +874,69 @@ att_text16:
break;
}
IO_Read(mono_mode ? 0x3ba : 0x3da);
for (i=0;i<ATT_REGS;i++) {
IO_Write(0x3c0,i);
IO_Write(0x3c0,att_data[i]);
}
IO_Write(0x3c0,0x20); IO_Write(0x3c0,0x00); //Disable palette access
/* Setup the DAC */
IO_Write(0x3c8,0);
IO_Write(0x3c6,0xff); //Reset Pelmask
switch (CurMode->type) {
case M_EGA:
if (CurMode->mode>0xf) goto dac_text16;
else if (CurMode->mode==0xf) goto dac_mtext16;
for (i=0;i<64;i++) {
IO_Write(0x3c9,ega_palette[i][0]);
IO_Write(0x3c9,ega_palette[i][1]);
IO_Write(0x3c9,ega_palette[i][2]);
if ((modeset_ctl & 8)==0) {
for (i=0;i<ATT_REGS;i++) {
IO_Write(0x3c0,i);
IO_Write(0x3c0,att_data[i]);
}
break;
case M_CGA2:
case M_CGA4:
case M_TANDY16:
for (i=0;i<64;i++) {
IO_Write(0x3c9,cga_palette_2[i][0]);
IO_Write(0x3c9,cga_palette_2[i][1]);
IO_Write(0x3c9,cga_palette_2[i][2]);
}
break;
case M_TEXT:
if (CurMode->mode==7) {
dac_mtext16:
IO_Write(0x3c0,0x20); IO_Write(0x3c0,0x00); //Disable palette access
IO_Write(0x3c6,0xff); //Reset Pelmask
/* Setup the DAC */
IO_Write(0x3c8,0);
switch (CurMode->type) {
case M_EGA:
if (CurMode->mode>0xf) goto dac_text16;
else if (CurMode->mode==0xf) goto dac_mtext16;
for (i=0;i<64;i++) {
IO_Write(0x3c9,mtext_palette[i][0]);
IO_Write(0x3c9,mtext_palette[i][1]);
IO_Write(0x3c9,mtext_palette[i][2]);
IO_Write(0x3c9,ega_palette[i][0]);
IO_Write(0x3c9,ega_palette[i][1]);
IO_Write(0x3c9,ega_palette[i][2]);
}
break;
case M_CGA2:
case M_CGA4:
case M_TANDY16:
for (i=0;i<64;i++) {
IO_Write(0x3c9,cga_palette_2[i][0]);
IO_Write(0x3c9,cga_palette_2[i][1]);
IO_Write(0x3c9,cga_palette_2[i][2]);
}
break;
case M_TEXT:
if (CurMode->mode==7) {
dac_mtext16:
for (i=0;i<64;i++) {
IO_Write(0x3c9,mtext_palette[i][0]);
IO_Write(0x3c9,mtext_palette[i][1]);
IO_Write(0x3c9,mtext_palette[i][2]);
}
break;
}
dac_text16:
for (i=0;i<64;i++) {
IO_Write(0x3c9,text_palette[i][0]);
IO_Write(0x3c9,text_palette[i][1]);
IO_Write(0x3c9,text_palette[i][2]);
}
break;
case M_VGA:
case M_LIN8:
case M_LIN16:
for (i=0;i<256;i++) {
IO_Write(0x3c9,vga_palette[i][0]);
IO_Write(0x3c9,vga_palette[i][1]);
IO_Write(0x3c9,vga_palette[i][2]);
}
break;
}
dac_text16:
for (i=0;i<64;i++) {
IO_Write(0x3c9,text_palette[i][0]);
IO_Write(0x3c9,text_palette[i][1]);
IO_Write(0x3c9,text_palette[i][2]);
}
break;
case M_VGA:
case M_LIN8:
case M_LIN16:
for (i=0;i<256;i++) {
IO_Write(0x3c9,vga_palette[i][0]);
IO_Write(0x3c9,vga_palette[i][1]);
IO_Write(0x3c9,vga_palette[i][2]);
}
break;
}
if (machine==MCH_VGA) {
/* check if gray scale summing is enabled */
if (real_readb(BIOSMEM_SEG,BIOSMEM_MODESET_CTL) & 2) {
INT10_PerformGrayScaleSumming(0,256);
if (machine==MCH_VGA) {
/* check if gray scale summing is enabled */
if (real_readb(BIOSMEM_SEG,BIOSMEM_MODESET_CTL) & 2) {
INT10_PerformGrayScaleSumming(0,256);
}
}
} else {
IO_Write(0x3c0,0x20); //Disable palette access
}
/* Setup some special stuff for different modes */
Bit8u feature=real_readb(BIOSMEM_SEG,BIOSMEM_INITIAL_MODE);