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

change tandy machine definition a bit

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2398
This commit is contained in:
Sebastian Strohhäcker 2005-12-02 13:10:18 +00:00
parent 19f535dbb8
commit 24b045e69f
12 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hardware/tandy_sound.cpp
View file

@ -316,7 +316,7 @@ public:
Section_prop * section=static_cast<Section_prop *>(configuration);
real_writeb(0x40,0xd4,0x00);
if (machine==MCH_TANDY) {
if (IS_TANDY_ARCH) {
/* enable tandy sound if tandy=true/auto */
if ((strcmp(section->Get_string("tandy"),"true")!=0) &&
(strcmp(section->Get_string("tandy"),"on")!=0) &&

4
src/hardware/vga_draw.cpp
View file

@ -313,7 +313,7 @@ static void VGA_VerticalTimer(Bitu val) {
vga.draw.address=(vga.draw.address*2)&0x1fff;
break;
}
if (machine==MCH_TANDY) {
if (IS_TANDY_ARCH) {
vga.draw.address+=vga.tandy.disp_bank << 14;
vga.draw.cursor.address+=vga.tandy.disp_bank << 14;
}
@ -418,7 +418,7 @@ void VGA_SetupDrawing(Bitu val) {
vga.draw.double_scan=false;
switch (machine) {
case MCH_CGA:
case MCH_TANDY:
case TANDY_ARCH_CASE:
clock=((vga.tandy.mode_control & 1) ? 14318180 : (14318180/2))/8;
break;
case MCH_HERC:

2
src/hardware/vga_memory.cpp
View file

@ -457,7 +457,7 @@ void VGA_SetupHandlers(void) {
range_handler=&vgaph.hmap;
if (vga.herc.mode_control&0x80) goto range_b800;
else goto range_b000;
case MCH_TANDY:
case TANDY_ARCH_CASE:
range_handler=&vgaph.htandy;
MEM_SetPageHandler(0x80,32,range_handler);
goto range_b800;

2
src/hardware/vga_misc.cpp
View file

@ -119,7 +119,7 @@ void VGA_SetupMisc(void) {
IO_RegisterReadHandler(0x3c2,read_p3c2,IO_MB);
IO_RegisterWriteHandler(0x3c2,write_p3c2,IO_MB);
IO_RegisterReadHandler(0x3cc,read_p3cc,IO_MB);
} else if (machine==MCH_CGA || machine==MCH_TANDY) {
} else if (machine==MCH_CGA || IS_TANDY_ARCH) {
IO_RegisterReadHandler(0x3da,read_p3da,IO_MB);
} else if (machine==MCH_HERC) {
IO_RegisterReadHandler(0x3ba,read_p3da,IO_MB);

8
src/hardware/vga_other.cpp
View file

@ -191,7 +191,7 @@ static void write_color_select(Bit8u val) {
break;
case M_TANDY4:
{
if (machine == MCH_TANDY && (vga.tandy.gfx_control & 0x8)) {
if (IS_TANDY_ARCH && (vga.tandy.gfx_control & 0x8)) {
VGA_SetCGA4Table(0,1,2,3);
return;
}
@ -342,7 +342,7 @@ static Bitu read_hercules(Bitu port,Bitu iolen) {
void VGA_SetupOther(void) {
Bitu i;
if (machine==MCH_CGA || machine==MCH_TANDY) {
if (machine==MCH_CGA || IS_TANDY_ARCH) {
extern Bit8u int10_font_08[256 * 8];
for (i=0;i<256;i++) memcpy(&vga.draw.font[i*32],&int10_font_08[i*8],8);
vga.draw.font_tables[0]=vga.draw.font_tables[1]=vga.draw.font;
@ -362,14 +362,14 @@ void VGA_SetupOther(void) {
IO_RegisterWriteHandler(0x3b8,write_hercules,IO_MB);
IO_RegisterWriteHandler(0x3bf,write_hercules,IO_MB);
}
if (machine==MCH_TANDY) {
if (IS_TANDY_ARCH) {
IO_RegisterWriteHandler(0x3d8,write_tandy,IO_MB);
IO_RegisterWriteHandler(0x3d9,write_tandy,IO_MB);
IO_RegisterWriteHandler(0x3de,write_tandy,IO_MB);
IO_RegisterWriteHandler(0x3df,write_tandy,IO_MB);
IO_RegisterWriteHandler(0x3da,write_tandy,IO_MB);
}
if (machine==MCH_CGA || machine==MCH_HERC || machine==MCH_TANDY) {
if (machine==MCH_CGA || machine==MCH_HERC || IS_TANDY_ARCH) {
Bitu base=machine==MCH_HERC ? 0x3b4 : 0x3d4;
IO_RegisterWriteHandler(base,write_crtc_index_other,IO_MB);
IO_RegisterWriteHandler(base+1,write_crtc_data_other,IO_MB);