claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Properly fixed Adaptec AHA-1640 MCA adapter, setup is handled directly by the ADF file in the reference disks.

Browse Source 
Re-introduced the Acer V35n machine, but with a proper bios (r01-c0.bin instead of the service one).
MCA serial and parallel initialization fixes alongside the ISA PS/1 and PS/2 Model 30 ones.
This commit is contained in:
TC1995
2017-06-15 05:17:34 +02:00
parent 805237fb33
commit 12e1e8dfa7
6 changed files with 90 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mem.c
View File

@@ -716,15 +716,13 @@ int loadbios()
biosmask = 0x1ffff;
return 1;
#if 0
case ROM_ACERV35N:
f = romfopen(L"roms/acerv35n/V35ND1S1.BIN", L"rb");
case ROM_ACERV35N:
f = romfopen(L"roms/acerv35n/R01-C0.BIN", L"rb");
if (!f) break;
fread(rom, 0x20000, 1, f);
fclose(f);
biosmask = 0x1ffff;
return 1;
#endif
case ROM_P55VA:
f = romfopen(L"roms/p55va/VA021297.BIN", L"rb");

1
src/model.c
View File

@@ -212,6 +212,7 @@ MODEL models[] =
{"AOpen AP53", ROM_AP53, "ap53", { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE | MODEL_PCI, 1, 256, 1, 127, at_ap53_init, NULL},
{"ASUS P/I-P55T2S", ROM_P55T2S, "p55t2s", { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE | MODEL_PCI, 1, 256, 1, 127, at_p55t2s_init, NULL},
{"Acer M3a", ROM_ACERM3A, "acerm3a", { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE | MODEL_PCI, 1, 256, 1, 127, at_acerm3a_init, NULL},
{"Acer V35n", ROM_ACERV35N, "acerv35n", { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE | MODEL_PCI, 1, 256, 1, 127, at_acerm3a_init, NULL},
{"ASUS P/I-P55T2P4", ROM_P55T2P4, "p55r2p4", { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE | MODEL_PCI, 1, 256, 1, 127, at_p55t2p4_init, NULL},
{"Epox P55-VA", ROM_P55VA, "p55va", { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE | MODEL_PCI, 1, 256, 1, 127, at_p55va_init, NULL},
{"ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE | MODEL_PCI, 1, 256, 1, 127, at_p55tvp4_init, NULL},

10
src/ps1.c
View File

@@ -295,13 +295,8 @@ void ps1mb_m2121_init()
MEM_MAPPING_EXTERNAL);
ps1_190 = 0;
lpt1_remove();
lpt2_remove();
lpt1_init(0x3bc);
serial_remove(1);
serial_remove(2);
mem_remap_top_384k();
}
@@ -315,12 +310,7 @@ void ps1mb_m2133_init()
ps1_190 = 0;
lpt1_remove();
lpt2_remove();
lpt1_init(0x3bc);
serial_remove(1);
serial_remove(2);
mem_remap_top_384k();
}

5
src/ps2.c
View File

@@ -127,12 +127,7 @@ void ps2board_init()
ps2_190 = 0;
lpt1_remove();
lpt2_remove();
lpt1_init(0x3bc);
serial_remove(1);
serial_remove(2);
memset(&ps2_hd, 0, sizeof(ps2_hd));
}

9
src/ps2_mca.c
View File

@@ -552,12 +552,7 @@ static void ps2_mca_board_common_init()
ps2.setup = 0xff;
lpt1_remove();
lpt2_remove();
lpt1_init(0x3bc);
serial_remove(1);
serial_remove(2);
}
void ps2_mca_board_model_50_init()
@@ -701,7 +696,7 @@ void ps2_mca_board_model_80_type2_init()
mem_remap_top_256k();
ps2.split_addr = mem_size * 1024;
mca_init(8);
mca_init(24);
ps2.planar_read = model_80_read;
ps2.planar_write = model_80_write;
@@ -746,7 +741,7 @@ void ps2_mca_board_model_80_type2_init()
if (mem_size > 4096)
{
/* Only 4 MB supported on planar, create a memory expansion card for the rest */
mem_mapping_set_addr(&ram_high_mapping, 0x100000, 0x300000);
mem_mapping_set_addr(&ram_high_mapping, 0x100000, 0x800000);
ps2.mem_pos_regs[0] = 0xff;
ps2.mem_pos_regs[1] = 0xfc;

168
src/scsi_aha154x.c
View File

@@ -1483,8 +1483,8 @@ aha_0x01:
break;
case 0x04:
dev->DataBuf[0] = dev->aha.bid;
dev->DataBuf[1] = 0x30;
dev->DataBuf[0] = (dev->chip != CHIP_AHA1640) ? dev->aha.bid : 0x42;
dev->DataBuf[1] = (dev->chip != CHIP_AHA1640) ? 0x30 : 0x42;
dev->DataBuf[2] = dev->aha.fwh;
dev->DataBuf[3] = dev->aha.fwl;
dev->DataReplyLeft = 4;
@@ -2147,7 +2147,38 @@ uint8_t aha_mca_read(int port, void *p)
return dev->pos_regs[port & 7];
}
static uint16_t aha_mca_addr[6] = {0x130, 0x134, 0x230, 0x234, 0x330, 0x334};
uint16_t aha_mca_get_port(uint8_t pos_port)
{
uint16_t addr;
switch (pos_port & 0xC7)
{
case 0x01:
addr = 0x130;
break;
case 0x02:
addr = 0x230;
break;
case 0x03:
addr = 0x330;
break;
case 0x41:
addr = 0x134;
break;
case 0x42:
addr = 0x234;
break;
case 0x43:
addr = 0x334;
break;
}
return addr;
}
void aha_mca_write(int port, uint8_t val, void *p)
{
@@ -2157,17 +2188,20 @@ void aha_mca_write(int port, uint8_t val, void *p)
if (port < 0x102)
return;
addr = aha_mca_addr[dev->pos_regs[4] & 6];
addr = aha_mca_get_port(dev->pos_regs[3]);
io_removehandler(addr, 0x0004, aha_read, aha_readw, NULL, aha_write, aha_writew, NULL, dev);
dev->pos_regs[port & 7] = val;
if (dev->pos_regs[2] & 1)
{
addr = aha_mca_get_port(dev->pos_regs[3]);
io_sethandler(addr, 0x0004, aha_read, aha_readw, NULL, aha_write, aha_writew, NULL, dev);
}
}
dev->Irq = (dev->pos_regs[4] & 0x7) + 8;
dev->DmaChannel = dev->pos_regs[5] & 0xf;
}
void
aha_device_reset(void *p)
@@ -2222,14 +2256,6 @@ aha_init(int chip, int has_bios)
}
}
if (dev->chip == CHIP_AHA1640)
{
pclog("Aha1640 initialized\n");
mca_add(aha_mca_read, aha_mca_write, dev);
dev->pos_regs[0] = 0x1F;
dev->pos_regs[1] = 0x0F;
}
timer_add(aha_reset_poll, &ResetCB, &ResetCB, dev);
timer_add(aha_cmd_cb, &AHA_Callback, &AHA_Callback, dev);
@@ -2262,7 +2288,46 @@ aha_154xCF_init(void)
static void *
aha_1640_init(void)
{
return(aha_init(CHIP_AHA1640, 1));
aha_t *dev;
int i = 0;
int j = 0;
dev = malloc(sizeof(aha_t));
memset(dev, 0x00, sizeof(aha_t));
ResetDev = dev;
dev->chip = CHIP_AHA1640;
pclog("Aha1640 initialized\n");
mca_add(aha_mca_read, aha_mca_write, dev);
dev->pos_regs[0] = 0x1F;
dev->pos_regs[1] = 0x0F;
pclog("Building SCSI hard disk map...\n");
build_scsi_hd_map();
pclog("Building SCSI CD-ROM map...\n");
build_scsi_cdrom_map();
for (i=0; i<16; i++) {
for (j=0; j<8; j++) {
if (scsi_hard_disks[i][j] != 0xff) {
SCSIDevices[i][j].LunType = SCSI_DISK;
}
else if (find_cdrom_for_scsi_id(i, j) != 0xff) {
SCSIDevices[i][j].LunType = SCSI_CDROM;
}
else {
SCSIDevices[i][j].LunType = SCSI_NONE;
}
}
}
timer_add(aha_reset_poll, &ResetCB, &ResetCB, dev);
timer_add(aha_cmd_cb, &AHA_Callback, &AHA_Callback, dev);
aha_reset_ctrl(dev, CTRL_HRST);
return(dev);
}
@@ -2373,78 +2438,6 @@ static device_config_t aha_154XCF_config[] = {
}
};
static device_config_t aha_1640_config[] = {
{
"base", "Address", CONFIG_HEX16, "", 0x330,
{
{
"0x330", 0x330
},
{
"0x334", 0x334
},
{
"0x230", 0x230
},
{
"0x234", 0x234
},
{
"0x130", 0x130
},
{
"0x134", 0x134
},
{
""
}
},
},
{
"irq", "IRQ", CONFIG_SELECTION, "", 10,
{
{
"IRQ 10", 10
},
{
"IRQ 11", 11
},
{
"IRQ 12", 12
},
{
"IRQ 14", 14
},
{
"IRQ 15", 15
},
{
""
}
},
},
{
"dma", "DMA channel", CONFIG_SELECTION, "", 6,
{
{
"DMA 5", 5
},
{
"DMA 6", 6
},
{
"DMA 7", 7
},
{
""
}
},
},
{
"", "", -1
}
};
device_t aha1540b_device = {
"Adaptec AHA-1540B",
0,
@@ -2477,6 +2470,5 @@ device_t aha1640_device = {
NULL,
NULL,
NULL,
NULL,
aha_1640_config
NULL
};