Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Improved fdc hookup

Browse Source
This commit is contained in:
Angelo Salese 2014-04-11 20:28:15 +00:00
parent 48f45f780a
commit 1e0afe617e
2 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/mame/machine/archimds.c
View File

@ -685,9 +685,19 @@ READ32_MEMBER(archimedes_state::archimedes_ioc_r)
{ {
case 0: return ioc_ctrl_r(space,offset,mem_mask); case 0: return ioc_ctrl_r(space,offset,mem_mask);
case 1: case 1:
if (m_fdc) { if (m_fdc)
logerror("17XX: R @ addr %x mask %08x\n", offset*4, mem_mask); {
return m_fdc->data_r(space, offset&0xf); //printf("17XX: R @ addr %x mask %08x\n", offset*4, mem_mask);
switch(ioc_addr & 0xc)
{
case 0x00: return m_fdc->status_r();
case 0x04: return m_fdc->track_r();
case 0x08: return m_fdc->sector_r();
case 0x0c: return m_fdc->data_r();
}
return 0;
} else { } else {
logerror("Read from FDC device?\n"); logerror("Read from FDC device?\n");
return 0; return 0;
@ -702,14 +712,21 @@ READ32_MEMBER(archimedes_state::archimedes_ioc_r)
logerror("IOC: Internal Podule Read\n"); logerror("IOC: Internal Podule Read\n");
return 0xffff; return 0xffff;
case 5: case 5:
if (m_fdc) { if (m_fdc)
{
switch(ioc_addr & 0xfffc) switch(ioc_addr & 0xfffc)
{ {
case 0x18: return 0xff; // FDC latch B
case 0x40: return 0xff; // FDC latch A
case 0x50: return 0; //fdc type, new model returns 5 here case 0x50: return 0; //fdc type, new model returns 5 here
case 0x70: return 0x0F;
case 0x74: return 0xFF; // unknown
// case 0x78: /* joystick */
// case 0x7c:
} }
} }
logerror("IOC: Internal Latches Read %08x\n",ioc_addr); //printf("IOC: Internal Latches Read %08x\n",ioc_addr);
return 0xffff; return 0xffff;
} }
@ -740,10 +757,30 @@ WRITE32_MEMBER(archimedes_state::archimedes_ioc_w)
{ {
case 0: ioc_ctrl_w(space,offset,data,mem_mask); return; case 0: ioc_ctrl_w(space,offset,data,mem_mask); return;
case 1: case 1:
if (m_fdc) { if (m_fdc)
logerror("17XX: %x to addr %x mask %08x\n", data, offset*4, mem_mask); {
m_fdc->data_w(space, offset&0xf, data&0xff); //printf("17XX: %x to addr %x mask %08x\n", data, offset*4, mem_mask);
} else { switch(ioc_addr & 0xc)
{
case 0x00:
m_fdc->cmd_w(data);
return;
case 0x04:
m_fdc->track_w(data);
return;
case 0x08:
m_fdc->sector_w(data);
return;
case 0x0c:
m_fdc->data_w(data);
return;
}
}
else
{
logerror("Write to FDC device?\n"); logerror("Write to FDC device?\n");
} }
return; return;
@ -757,11 +794,12 @@ WRITE32_MEMBER(archimedes_state::archimedes_ioc_w)
logerror("IOC: Internal Podule Write\n"); logerror("IOC: Internal Podule Write\n");
return; return;
case 5: case 5:
if (m_fdc) { if (m_fdc)
{
switch(ioc_addr & 0xfffc) switch(ioc_addr & 0xfffc)
{ {
case 0x18: // latch B case 0x18: // latch B
m_fdc->dden_w(BIT(data, 1)); m_fdc->dden_w(!(BIT(data, 1)));
return; return;
case 0x40: // latch A case 0x40: // latch A
@ -769,19 +807,21 @@ WRITE32_MEMBER(archimedes_state::archimedes_ioc_w)
if (data & 1) { floppy = m_floppy0->get_device(); } if (data & 1) { floppy = m_floppy0->get_device(); }
if (data & 2) { floppy = m_floppy1->get_device(); } if (data & 2) { floppy = m_floppy1->get_device(); }
//if (data & 4) { m_fdc->set_drive(2); } if (data & 4) { floppy = NULL; } // floppy 2
//if (data & 8) { m_fdc->set_drive(3); } if (data & 8) { floppy = NULL; } // floppy 3
m_fdc->set_floppy(floppy); m_fdc->set_floppy(floppy);
if(floppy) if(floppy)
{ {
floppy->mon_w(BIT(data, 5)); floppy->mon_w(BIT(data, 5));
m_fdc->dden_w(BIT(data, 4)); floppy->ss_w(BIT(data, 4));
} }
//bit 5 is motor on //bit 5 is motor on
return; return;
} }
//printf("%08x\n",ioc_addr);
} }
break; break;
} }

2
src/mess/drivers/a310.c
View File

@ -360,6 +360,8 @@ static MACHINE_CONFIG_START( a310, a310_state )
MCFG_RAM_EXTRA_OPTIONS("512K, 1M, 4M, 8M, 16M") MCFG_RAM_EXTRA_OPTIONS("512K, 1M, 4M, 8M, 16M")
MCFG_WD1772x_ADD("fdc", 8000000 / 2) MCFG_WD1772x_ADD("fdc", 8000000 / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE( a310_state, a310_wd177x_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a310_state, a310_wd177x_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", a310_floppies, "35dd", a310_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:0", a310_floppies, "35dd", a310_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", a310_floppies, "35dd", a310_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", a310_floppies, "35dd", a310_state::floppy_formats)