Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wtf (nw)

Browse source
This commit is contained in:
Miodrag Milanovic 2014-03-21 18:51:51 +00:00
parent b68bbb4381
commit 2ed51f954d
4 changed files with 32 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/emu/sound/ics2115.c
View file

@ -33,8 +33,8 @@ ics2115_device::ics2115_device(const machine_config &mconfig, const char *tag, d
void ics2115_device::device_start()
{
m_rom = *region();
m_timer[0].timer = machine().scheduler().timer_alloc(FUNC(timer_cb_0), this);
m_timer[1].timer = machine().scheduler().timer_alloc(FUNC(timer_cb_1), this);
m_timer[0].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_0),this), this);
m_timer[1].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_1),this), this);
m_stream = machine().sound().stream_alloc(*this, 0, 2, 33075);
//Exact formula as per patent 5809466
@ -761,22 +761,20 @@ void ics2115_device::reg_write(UINT8 data, bool msb) {
}
}
//UINT8 ics2115_device::read (offs_t offset)
READ8_DEVICE_HANDLER(ics2115_device::read)
READ8_MEMBER(ics2115_device::read)
{
ics2115_device *chip = downcast<ics2115_device *>(device);
UINT8 ret = 0;
switch(offset) {
case 0:
//TODO: check this suspect code
if (chip->m_irq_on) {
if (m_irq_on) {
ret |= 0x80;
if (chip->m_irq_enabled && (chip->m_irq_pending & 3))
if (m_irq_enabled && (m_irq_pending & 3))
ret |= 1;
for (int i = 0; i <= chip->m_active_osc; i++) {
if (//chip->m_voice[i].vol_ctrl.irq_pending ||
chip->m_voice[i].osc_conf.irq_pending) {
for (int i = 0; i <= m_active_osc; i++) {
if (//m_voice[i].vol_ctrl.irq_pending ||
m_voice[i].osc_conf.irq_pending) {
ret |= 2;
break;
}
@ -785,13 +783,13 @@ READ8_DEVICE_HANDLER(ics2115_device::read)
break;
case 1:
ret = chip->m_reg_select;
ret = m_reg_select;
break;
case 2:
ret = (UINT8)(chip->reg_read());
ret = (UINT8)(reg_read());
break;
case 3:
ret = chip->reg_read() >> 8;
ret = reg_read() >> 8;
break;
default:
#ifdef ICS2115_DEBUG
@ -802,19 +800,17 @@ READ8_DEVICE_HANDLER(ics2115_device::read)
return ret;
}
//UINT8 ics2115_device::write(offs_t offset, UINT8 data)
WRITE8_DEVICE_HANDLER(ics2115_device::write)
WRITE8_MEMBER(ics2115_device::write)
{
ics2115_device *chip = downcast<ics2115_device *>(device);
switch(offset) {
case 1:
chip->m_reg_select = data;
m_reg_select = data;
break;
case 2:
chip->reg_write(data,0);
reg_write(data,0);
break;
case 3:
chip->reg_write(data,1);
reg_write(data,1);
break;
default:
#ifdef ICS2115_DEBUG
@ -866,18 +862,16 @@ void ics2115_device::recalc_irq()
m_irq_cb(this, irq ? ASSERT_LINE : CLEAR_LINE);
}
TIMER_CALLBACK( ics2115_device::timer_cb_0 )
TIMER_CALLBACK_MEMBER( ics2115_device::timer_cb_0 )
{
ics2115_device *chip = (ics2115_device *)ptr;
chip->m_irq_pending |= 1 << 0;
chip->recalc_irq();
m_irq_pending |= 1 << 0;
recalc_irq();
}
TIMER_CALLBACK( ics2115_device::timer_cb_1 )
TIMER_CALLBACK_MEMBER( ics2115_device::timer_cb_1 )
{
ics2115_device *chip = (ics2115_device *)ptr;
chip->m_irq_pending |= 1 << 1;
chip->recalc_irq();
m_irq_pending |= 1 << 1;
recalc_irq();
}
void ics2115_device::recalc_timer(int timer)

8
src/emu/sound/ics2115.h
View file

@ -98,12 +98,12 @@ public:
// inline configuration helpers
static void static_set_irqf(device_t &device, void (*irqf)(device_t *device, int state));
static DECLARE_READ8_DEVICE_HANDLER(read);
static DECLARE_WRITE8_DEVICE_HANDLER(write);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
//UINT8 read(offs_t offset);
//void write(offs_t offset, UINT8 data);
static TIMER_CALLBACK(timer_cb_0);
static TIMER_CALLBACK(timer_cb_1);
TIMER_CALLBACK_MEMBER(timer_cb_0);
TIMER_CALLBACK_MEMBER(timer_cb_1);
sound_stream *m_stream;

12
src/mame/drivers/igs011.c
View file

@ -2588,9 +2588,9 @@ READ16_MEMBER(igs011_state::ics2115_word_r)
ics2115_device* ics2115 = machine().device<ics2115_device>("ics");
switch(offset)
{
case 0: return ics2115_device::read(ics2115, space, (offs_t)0);
case 1: return ics2115_device::read(ics2115, space, (offs_t)1);
case 2: return (ics2115_device::read(ics2115, space, (offs_t)3) << 8) | ics2115_device::read(ics2115, space, (offs_t)2);
case 0: return ics2115->read(space, (offs_t)0);
case 1: return ics2115->read(space, (offs_t)1);
case 2: return (ics2115->read(space, (offs_t)3) << 8) | ics2115->read(space, (offs_t)2);
}
return 0xff;
}
@ -2601,11 +2601,11 @@ WRITE16_MEMBER(igs011_state::ics2115_word_w)
switch(offset)
{
case 1:
if (ACCESSING_BITS_0_7) ics2115_device::write(ics2115,space, 1,data);
if (ACCESSING_BITS_0_7) ics2115->write(space, 1,data);
break;
case 2:
if (ACCESSING_BITS_0_7) ics2115_device::write(ics2115,space, 2,data);
if (ACCESSING_BITS_8_15) ics2115_device::write(ics2115,space, 3,data>>8);
if (ACCESSING_BITS_0_7) ics2115->write(space, 2,data);
if (ACCESSING_BITS_8_15) ics2115->write(space, 3,data>>8);
break;
}
}

2
src/mame/drivers/pgm.c
View file

@ -302,7 +302,7 @@ ADDRESS_MAP_START( pgm_z80_mem, AS_PROGRAM, 8, pgm_state )
ADDRESS_MAP_END
ADDRESS_MAP_START( pgm_z80_io, AS_IO, 8, pgm_state )
AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE_LEGACY("ics", ics2115_device::read, ics2115_device::write)
AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE("ics", ics2115_device, read, write)
AM_RANGE(0x8100, 0x81ff) AM_READ(soundlatch3_byte_r) AM_WRITE(z80_l3_w)
AM_RANGE(0x8200, 0x82ff) AM_READWRITE(soundlatch_byte_r, soundlatch_byte_w)
AM_RANGE(0x8400, 0x84ff) AM_READWRITE(soundlatch2_byte_r, soundlatch2_byte_w)