Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-12 00:58:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fmtowns: Preliminary implementation of the CD-ROM controller's software mode. Enough to get the CD-ROM working under Win95. [Barry Rodewald]

Browse Source
This commit is contained in:
mahlemiut 2013-02-13 06:59:14 +00:00
parent 3625f3b550
commit 0d3810d01f
2 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/mess/drivers/fmtowns.c
View File

@ -1449,6 +1449,41 @@ TIMER_CALLBACK_MEMBER(towns_state::towns_cdrom_read_byte)
} }
} }
UINT8 towns_state::towns_cdrom_read_byte_software()
{
UINT8 ret;
if(m_towns_cd.buffer_ptr < 0) // transfer has ended
return 0x00;
ret = m_towns_cd.buffer[m_towns_cd.buffer_ptr++];
if(m_towns_cd.buffer_ptr >= 2048)
{ // end of transfer
m_towns_cd.status &= ~0x10; // no longer transferring by DMA
m_towns_cd.status &= ~0x20; // no longer transferring by software
logerror("CD: end of software transfer (LBA=%08x)\n",m_towns_cd.lba_current);
if(m_towns_cd.lba_current >= m_towns_cd.lba_last)
{
m_towns_cd.extra_status = 0;
towns_cd_set_status(machine(),0x06,0x00,0x00,0x00);
towns_cdrom_set_irq(machine(),TOWNS_CD_IRQ_DMA,1);
m_towns_cd.buffer_ptr = -1;
m_towns_cd.status |= 0x01; // ready
}
else
{
cdrom_read_data(m_cdrom->get_cdrom_file(),++m_towns_cd.lba_current,m_towns_cd.buffer,CD_TRACK_MODE1);
m_towns_cd.extra_status = 0;
towns_cd_set_status(machine(),0x21,0x00,0x00,0x00);
towns_cdrom_set_irq(machine(),TOWNS_CD_IRQ_DMA,1);
m_towns_cd.status &= ~0x10;
m_towns_cd.status |= 0x20;
m_towns_cd.buffer_ptr = -1;
}
}
return ret;
}
static void towns_cdrom_read(cdrom_image_device* device) static void towns_cdrom_read(cdrom_image_device* device)
{ {
// MODE 1 read // MODE 1 read
@ -1492,8 +1527,16 @@ static void towns_cdrom_read(cdrom_image_device* device)
else else
{ {
cdrom_read_data(device->get_cdrom_file(),state->m_towns_cd.lba_current,state->m_towns_cd.buffer,CD_TRACK_MODE1); cdrom_read_data(device->get_cdrom_file(),state->m_towns_cd.lba_current,state->m_towns_cd.buffer,CD_TRACK_MODE1);
state->m_towns_cd.status |= 0x10; // DMA transfer begin if(state->m_towns_cd.software_tx)
state->m_towns_cd.status &= ~0x20; // not a software transfer {
state->m_towns_cd.status &= ~0x10; // not a DMA transfer
state->m_towns_cd.status |= 0x20; // software transfer
}
else
{
state->m_towns_cd.status |= 0x10; // DMA transfer begin
state->m_towns_cd.status &= ~0x20; // not a software transfer
}
// state->m_towns_cd.buffer_ptr = 0; // state->m_towns_cd.buffer_ptr = 0;
// state->m_towns_cd.read_timer->adjust(attotime::from_hz(300000),1); // state->m_towns_cd.read_timer->adjust(attotime::from_hz(300000),1);
if(state->m_towns_cd.command & 0x20) if(state->m_towns_cd.command & 0x20)
@ -1504,7 +1547,10 @@ static void towns_cdrom_read(cdrom_image_device* device)
else else
{ {
state->m_towns_cd.extra_status = 0; state->m_towns_cd.extra_status = 0;
towns_cd_set_status(device->machine(),0x22,0x00,0x00,0x00); if(state->m_towns_cd.software_tx)
towns_cd_set_status(device->machine(),0x21,0x00,0x00,0x00);
else
towns_cd_set_status(device->machine(),0x22,0x00,0x00,0x00);
} }
} }
} }
@ -1802,6 +1848,11 @@ READ8_MEMBER(towns_state::towns_cdrom_r)
}*/ }*/
} }
return ret; return ret;
case 0x02: // data transfer (used in software transfers)
if(m_towns_cd.software_tx)
{
return towns_cdrom_read_byte_software();
}
default: default:
return 0x00; return 0x00;
} }
@ -1839,11 +1890,18 @@ WRITE8_MEMBER(towns_state::towns_cdrom_w)
logerror("CD: parameter %02x added\n",data); logerror("CD: parameter %02x added\n",data);
break; break;
case 0x03: case 0x03:
// TODO: software transfer mode (bit 3) if(data & 0x08) // software transfer
{
m_towns_cd.status &= ~0x10; // no DMA transfer
m_towns_cd.status |= 0x20;
m_towns_cd.software_tx = true;
m_towns_cd.buffer_ptr = 0;
}
if(data & 0x10) if(data & 0x10)
{ {
m_towns_cd.status |= 0x10; // DMA transfer begin m_towns_cd.status |= 0x10; // DMA transfer begin
m_towns_cd.status &= ~0x20; // not a software transfer m_towns_cd.status &= ~0x20; // not a software transfer
m_towns_cd.software_tx = false;
if(m_towns_cd.buffer_ptr < 0) if(m_towns_cd.buffer_ptr < 0)
{ {
m_towns_cd.buffer_ptr = 0; m_towns_cd.buffer_ptr = 0;
@ -2798,7 +2856,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( townssj, towns ) static MACHINE_CONFIG_DERIVED( townssj, towns )
MCFG_CPU_REPLACE("maincpu",I486, 66000000) MCFG_CPU_REPLACE("maincpu",PENTIUM, 66000000)
MCFG_CPU_PROGRAM_MAP(towns_mem) MCFG_CPU_PROGRAM_MAP(towns_mem)
MCFG_CPU_IO_MAP(towns_io) MCFG_CPU_IO_MAP(towns_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq) MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)

4
src/mess/includes/fmtowns.h
View File

@ -37,6 +37,7 @@ struct towns_cdrom_controller
UINT32 lba_last; UINT32 lba_last;
UINT32 cdda_current; UINT32 cdda_current;
UINT32 cdda_length; UINT32 cdda_length;
bool software_tx;
emu_timer* read_timer; emu_timer* read_timer;
}; };
@ -238,8 +239,9 @@ class towns_state : public driver_device
UINT8 speaker_get_spk(); UINT8 speaker_get_spk();
void speaker_set_spkrdata(UINT8 data); void speaker_set_spkrdata(UINT8 data);
void speaker_set_input(UINT8 data); void speaker_set_input(UINT8 data);
UINT8 towns_cdrom_read_byte_software();
private: private:
static const device_timer_id TIMER_RTC = 0; static const device_timer_id TIMER_RTC = 0;
static const device_timer_id TIMER_FREERUN = 1; static const device_timer_id TIMER_FREERUN = 1;
static const device_timer_id TIMER_INTERVAL2 = 2; static const device_timer_id TIMER_INTERVAL2 = 2;