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

sound/nes_apu.cpp: Implemented frame counter interrupt . (#10715)

Browse Source 
Fixes MT06186, MT07625 and MT07658.

Software list items promoted to working (nes.xml)
---------------------------------------
Akagawa Jirou no Yuurei Ressha (Japan) [kmg]
Castelian (Europe) [kmg]
Door Door (Japan) [kmg]
Door Door (FMG pirate) [kmg]
Dragon Quest (Japan) [kmg]
Dragon Quest II - Akuryou no Kamigami (Japan) [kmg]
GeGeGe no Kitarou - Youkai Daimakyou (Japan) [kmg]
GeGeGe no Kitarou - Youkai Daimakyou (Japan, prototype) [kmg]
GeGeGe no Kitarou - Youkai Daimakyou (FMG pirate) [kmg]
The Guardian Legend (Europe) [kmg]
The Guardian Legend (USA) [kmg]
Guardic Gaiden (Japan) [kmg]
Jesus - Kyoufu no Bio Monster (Japan) [kmg]
Mahjong Taikai (Japan) [kmg]
Ninja Jajamaru - Ginga Daisakusen (Japan) [kmg]
Ninja Jajamaru - Ginga Daisakusen (Japan, prototype) [kmg]
Ninja Kid (USA) [kmg]
Mendel Palace (USA) [kmg]
The Mutant Virus (USA) [kmg]
Qix (USA) [kmg]
Quinty (Japan) [kmg]
Portopia Renzoku Satsujin Jiken (Japan) [kmg]
Squashed (USA, prototype) [kmg]
WWF WrestleMania (Europe) [kmg]
WWF WrestleMania (USA) [kmg]
This commit is contained in:
0kmg 2022-12-21 00:29:31 -08:00 committed by GitHub
parent c72f10361e
commit 0daa43b832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 112 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
hash/nes.xml
View File

@ -1186,8 +1186,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Game has no sound. Could this be related to sound issue in early Enix games? --> <software name="ajyureir">
<software name="ajyureir" supported="no">
<description>Akagawa Jirou no Yuurei Ressha (Japan)</description> <description>Akagawa Jirou no Yuurei Ressha (Japan)</description>
<year>1991</year> <year>1991</year>
<publisher>King Records</publisher> <publisher>King Records</publisher>
@ -3800,7 +3799,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="btoadsdd"> <!-- Same issue as US release -->
<software name="btoadsdd" supported="no">
<description>Battletoads &amp; Double Dragon - The Ultimate Team (Europe)</description> <description>Battletoads &amp; Double Dragon - The Ultimate Team (Europe)</description>
<year>1993</year> <year>1993</year>
<publisher>Tradewest</publisher> <publisher>Tradewest</publisher>
@ -3818,7 +3818,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="btoadsddu" cloneof="btoadsdd"> <!-- Crashes at level 1-2 Abobo. Code falls off the rails at D2B2: jmp ($0021). Apparently game depends on an open bus read from $6xxx some time before that. -->
<software name="btoadsddu" cloneof="btoadsdd" supported="no">
<description>Battletoads &amp; Double Dragon - The Ultimate Team (USA)</description> <description>Battletoads &amp; Double Dragon - The Ultimate Team (USA)</description>
<year>1993</year> <year>1993</year>
<publisher>Tradewest</publisher> <publisher>Tradewest</publisher>
@ -5941,7 +5942,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="castelnu" cloneof="casteln"> <!-- no background music in game -->
<software name="castelnu" cloneof="casteln" supported="partial">
<description>Castelian (USA)</description> <description>Castelian (USA)</description>
<year>1991</year> <year>1991</year>
<publisher>Triffix</publisher> <publisher>Triffix</publisher>
@ -5961,7 +5963,7 @@ license:CC0
</software> </software>
<!-- a proto has been found too, containing the same data, with labels "CASTELIAN 2/4/92 CHK$985A" --> <!-- a proto has been found too, containing the same data, with labels "CASTELIAN 2/4/92 CHK$985A" -->
<software name="casteln" supported="no"> <!-- freezes when you start game --> <software name="casteln" supported="partial"> <!-- buzz instead of music -->
<description>Castelian (Europe)</description> <description>Castelian (Europe)</description>
<year>1992</year> <year>1992</year>
<publisher>Storm</publisher> <publisher>Storm</publisher>
@ -6153,7 +6155,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="cvania3u" cloneof="cvania3"> <!-- Graphics corrupt on parts of attract mode film reel. Once those have been viewed, in-game graphics flicker (wild nametable flipping) when picking up weapon upgrades, going through doors, etc. -->
<software name="cvania3u" cloneof="cvania3" supported="partial">
<description>Castlevania III - Dracula's Curse (USA)</description> <description>Castlevania III - Dracula's Curse (USA)</description>
<year>1990</year> <year>1990</year>
<publisher>Konami</publisher> <publisher>Konami</publisher>
@ -6179,7 +6182,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="cvania3"> <!-- Crashes if you watch the attract mode film roll reel -->
<software name="cvania3" supported="partial">
<description>Castlevania III - Dracula's Curse (Europe)</description> <description>Castlevania III - Dracula's Curse (Europe)</description>
<year>1992</year> <year>1992</year>
<publisher>Palcom</publisher> <publisher>Palcom</publisher>
@ -9100,8 +9104,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Game has no sound and freezes as soon as you get killed by any enemy --> <software name="doordoor">
<software name="doordoor" supported="no">
<description>Door Door (Japan)</description> <description>Door Door (Japan)</description>
<year>1985</year> <year>1985</year>
<publisher>Enix</publisher> <publisher>Enix</publisher>
@ -10081,8 +10084,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Game has no sound and freezes once you win any battle --> <software name="dquest" cloneof="dwarr">
<software name="dquest" cloneof="dwarr" supported="no">
<description>Dragon Quest (Japan)</description> <description>Dragon Quest (Japan)</description>
<year>1986</year> <year>1986</year>
<publisher>Enix</publisher> <publisher>Enix</publisher>
@ -10102,8 +10104,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Game has no sound. Will this freeze up at some point like the other early Enix games? --> <software name="dquest2" cloneof="dwarr2">
<software name="dquest2" cloneof="dwarr2" supported="no">
<description>Dragon Quest II - Akuryou no Kamigami (Japan)</description> <description>Dragon Quest II - Akuryou no Kamigami (Japan)</description>
<year>1987</year> <year>1987</year>
<publisher>Enix</publisher> <publisher>Enix</publisher>
@ -14361,7 +14362,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="gegege" cloneof="ninjakid" supported="no"> <software name="gegege" cloneof="ninjakid">
<description>GeGeGe no Kitarou - Youkai Daimakyou (Japan)</description> <description>GeGeGe no Kitarou - Youkai Daimakyou (Japan)</description>
<year>1986</year> <year>1986</year>
<publisher>Bandai</publisher> <publisher>Bandai</publisher>
@ -15676,7 +15677,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="guardlgnu" cloneof="guardlgn" supported="no"> <!-- intermittent major status bar flickering (DMC IRQ timing issue?) -->
<software name="guardlgnu" cloneof="guardlgn" supported="partial">
<description>The Guardian Legend (USA)</description> <description>The Guardian Legend (USA)</description>
<year>1989</year> <year>1989</year>
<publisher>Brøderbund</publisher> <publisher>Brøderbund</publisher>
@ -15695,7 +15697,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="guardlgn" supported="no"> <!-- intermittent major status bar flickering (DMC IRQ timing issue?) -->
<software name="guardlgn" supported="partial">
<description>The Guardian Legend (Europe)</description> <description>The Guardian Legend (Europe)</description>
<year>1992</year> <year>1992</year>
<publisher>Nintendo</publisher> <publisher>Nintendo</publisher>
@ -15714,7 +15717,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="guardic" cloneof="guardlgn" supported="no"> <!-- intermittent major status bar flickering (DMC IRQ timing issue?) -->
<software name="guardic" cloneof="guardlgn" supported="partial">
<description>Guardic Gaiden (Japan)</description> <description>Guardic Gaiden (Japan)</description>
<year>1987</year> <year>1987</year>
<publisher>Irem</publisher> <publisher>Irem</publisher>
@ -19111,7 +19115,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="jesus" supported="no"> <software name="jesus">
<description>Jesus - Kyoufu no Bio Monster (Japan)</description> <description>Jesus - Kyoufu no Bio Monster (Japan)</description>
<year>1989</year> <year>1989</year>
<publisher>King Records</publisher> <publisher>King Records</publisher>
@ -23214,7 +23218,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="mjtaikai" supported="no"> <software name="mjtaikai">
<description>Mahjong Taikai (Japan)</description> <description>Mahjong Taikai (Japan)</description>
<year>1989</year> <year>1989</year>
<publisher>Koei</publisher> <publisher>Koei</publisher>
@ -24475,7 +24479,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="mendel" supported="no"> <software name="mendel">
<description>Mendel Palace (USA)</description> <description>Mendel Palace (USA)</description>
<year>1990</year> <year>1990</year>
<publisher>Hudson Soft</publisher> <publisher>Hudson Soft</publisher>
@ -26292,7 +26296,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="mutantv" supported="no"> <software name="mutantv">
<description>The Mutant Virus (USA)</description> <description>The Mutant Virus (USA)</description>
<year>1992</year> <year>1992</year>
<publisher>American Softworks</publisher> <publisher>American Softworks</publisher>
@ -27162,8 +27166,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Missing sprites --> <software name="ninjajag" cloneof="squashed">
<software name="ninjajag" cloneof="squashed" supported="no">
<description>Ninja Jajamaru - Ginga Daisakusen (Japan)</description> <description>Ninja Jajamaru - Ginga Daisakusen (Japan)</description>
<year>1991</year> <year>1991</year>
<publisher>Jaleco</publisher> <publisher>Jaleco</publisher>
@ -27182,7 +27185,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="ninjakid" supported="no"> <software name="ninjakid">
<description>Ninja Kid (USA)</description> <description>Ninja Kid (USA)</description>
<year>1986</year> <year>1986</year>
<publisher>Bandai</publisher> <publisher>Bandai</publisher>
@ -27221,6 +27224,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Unlike the other clones this plays the entire intro song to a black screen THEN plays the intro story scenes sans music -->
<software name="nryuken2" cloneof="shadwar2" supported="partial"> <software name="nryuken2" cloneof="shadwar2" supported="partial">
<description>Ninja Ryukenden II - Ankoku no Jashinken (Japan)</description> <description>Ninja Ryukenden II - Ankoku no Jashinken (Japan)</description>
<year>1990</year> <year>1990</year>
@ -29404,8 +29408,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Game has no sound and freezes when you dial a phone number --> <software name="portopia">
<software name="portopia" supported="no">
<description>Portopia Renzoku Satsujin Jiken (Japan)</description> <description>Portopia Renzoku Satsujin Jiken (Japan)</description>
<year>1985</year> <year>1985</year>
<publisher>Enix</publisher> <publisher>Enix</publisher>
@ -30137,7 +30140,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="qix" supported="no"> <software name="qix">
<description>Qix (USA)</description> <description>Qix (USA)</description>
<year>1991</year> <year>1991</year>
<publisher>Taito</publisher> <publisher>Taito</publisher>
@ -30255,7 +30258,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="quinty" cloneof="mendel" supported="no"> <software name="quinty" cloneof="mendel">
<description>Quinty (Japan)</description> <description>Quinty (Japan)</description>
<year>1989</year> <year>1989</year>
<publisher>Namcot</publisher> <publisher>Namcot</publisher>
@ -32181,7 +32184,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="romancia" supported="no"> <!-- frozen on black screen at power on --> <!-- severe status bar flickering (DMC IRQ timing issue?) -->
<software name="romancia" supported="no">
<description>Romancia (Japan)</description> <description>Romancia (Japan)</description>
<year>1987</year> <year>1987</year>
<publisher>Tokyo Shoseki</publisher> <publisher>Tokyo Shoseki</publisher>
@ -33971,6 +33975,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Among the many issues the entire screen oddly and incessantly scrolls down no matter what's on it -->
<software name="shin4num" supported="no"> <software name="shin4num" supported="no">
<description>Shin 4-nin Uchi Mahjong - Yakuman Tengoku (Japan)</description> <description>Shin 4-nin Uchi Mahjong - Yakuman Tengoku (Japan)</description>
<year>1991</year> <year>1991</year>
@ -35869,8 +35874,7 @@ license:CC0
</part> </part>
</software> </software>
<!-- Missing sprites --> <software name="squashed">
<software name="squashed" supported="no">
<description>Squashed (USA, prototype)</description> <description>Squashed (USA, prototype)</description>
<year>1991</year> <year>1991</year>
<publisher>Jaleco</publisher> <publisher>Jaleco</publisher>
@ -39812,7 +39816,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="timelordu" cloneof="timelord"> <!-- intermittent major status bar flickering (DMC IRQ timing issue?) -->
<software name="timelordu" cloneof="timelord" supported="partial">
<description>Time Lord (USA)</description> <description>Time Lord (USA)</description>
<year>1990</year> <year>1990</year>
<publisher>Milton Bradley</publisher> <publisher>Milton Bradley</publisher>
@ -39830,7 +39835,8 @@ license:CC0
</part> </part>
</software> </software>
<software name="timelord"> <!-- intermittent major status bar flickering (DMC IRQ timing issue?) -->
<software name="timelord" supported="partial">
<description>Time Lord (Europe)</description> <description>Time Lord (Europe)</description>
<year>1991</year> <year>1991</year>
<publisher>Milton Bradley</publisher> <publisher>Milton Bradley</publisher>
@ -42092,7 +42098,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="wmaniau" cloneof="wmania" supported="no"> <software name="wmaniau" cloneof="wmania">
<description>WWF WrestleMania (USA)</description> <description>WWF WrestleMania (USA)</description>
<year>1989</year> <year>1989</year>
<publisher>Acclaim Entertainment</publisher> <publisher>Acclaim Entertainment</publisher>
@ -42118,7 +42124,7 @@ license:CC0
</part> </part>
</software> </software>
<software name="wmania" supported="no"> <software name="wmania">
<description>WWF WrestleMania (Europe)</description> <description>WWF WrestleMania (Europe)</description>
<year>1992</year> <year>1992</year>
<publisher>Acclaim Entertainment</publisher> <publisher>Acclaim Entertainment</publisher>
@ -47509,7 +47515,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part> </part>
</software> </software>
<software name="gegegep" cloneof="ninjakid" supported="no"> <software name="gegegep" cloneof="ninjakid">
<description>GeGeGe no Kitarou - Youkai Daimakyou (Japan, prototype)</description> <description>GeGeGe no Kitarou - Youkai Daimakyou (Japan, prototype)</description>
<year>1986</year> <year>1986</year>
<publisher>Bandai</publisher> <publisher>Bandai</publisher>
@ -48646,7 +48652,8 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part> </part>
</software> </software>
<software name="kyorolnd" cloneof="casteln"> <!-- has buzz instead of background music in game -->
<software name="kyorolnd" cloneof="casteln" supported="partial">
<description>Kyoro-chan Land (Japan)</description> <description>Kyoro-chan Land (Japan)</description>
<year>1992</year> <year>1992</year>
<publisher>Hiro</publisher> <publisher>Hiro</publisher>
@ -49867,8 +49874,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part> </part>
</software> </software>
<!-- Missing sprites --> <software name="ninjajagp" cloneof="squashed">
<software name="ninjajagp" cloneof="squashed" supported="no">
<description>Ninja Jajamaru - Ginga Daisakusen (Japan, prototype)</description> <description>Ninja Jajamaru - Ginga Daisakusen (Japan, prototype)</description>
<year>1991</year> <year>1991</year>
<publisher>Jaleco</publisher> <publisher>Jaleco</publisher>
@ -71486,8 +71492,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t
</part> </part>
</software> </software>
<!-- Game has no sound and freezes as soon as you get killed by any enemy --> <software name="doordoorh" cloneof="doordoor">
<software name="doordoorh" cloneof="doordoor" supported="no">
<description>Door Door (FMG pirate)</description> <description>Door Door (FMG pirate)</description>
<year>1987</year> <year>1987</year>
<publisher>FMG</publisher> <publisher>FMG</publisher>
@ -71786,7 +71791,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t
</part> </part>
</software> </software>
<software name="gegegeh" cloneof="ninjakid" supported="no"> <software name="gegegeh" cloneof="ninjakid">
<description>GeGeGe no Kitarou - Youkai Daimakyou (FMG pirate)</description> <description>GeGeGe no Kitarou - Youkai Daimakyou (FMG pirate)</description>
<year>1987</year> <year>1987</year>
<publisher>FMG</publisher> <publisher>FMG</publisher>
@ -75792,7 +75797,7 @@ Other
</software> </software>
<!-- is the following also hacked?!? --> <!-- is the following also hacked?!? -->
<software name="btoadsddh" cloneof="btoadsdd"> <software name="btoadsddh" cloneof="btoadsdd" supported="no"> <!-- Same issue as US release -->
<description>Battletoads &amp; Double Dragon - The Ultimate Team (pirate)</description> <description>Battletoads &amp; Double Dragon - The Ultimate Team (pirate)</description>
<year>19??</year> <year>19??</year>
<publisher>&lt;pirate&gt;</publisher> <publisher>&lt;pirate&gt;</publisher>
@ -78731,7 +78736,8 @@ We include them here as reference if they should coincide with later revisions o
</part> </part>
</software> </software>
<software name="cvania3kc" cloneof="cvania3"> <!-- Same issue as US release -->
<software name="cvania3kc" cloneof="cvania3" supported="partial">
<description>Castlevania III - Dracula's Curse (ripped from PC Konami Classics)</description> <description>Castlevania III - Dracula's Curse (ripped from PC Konami Classics)</description>
<year>200?</year> <year>200?</year>
<publisher>Konami</publisher> <publisher>Konami</publisher>

55
src/devices/sound/nes_apu.cpp
View File

@ -56,6 +56,7 @@ nesapu_device::nesapu_device(const machine_config &mconfig, device_type type, co
, m_stream(nullptr) , m_stream(nullptr)
, m_irq_handler(*this) , m_irq_handler(*this)
, m_mem_read_cb(*this) , m_mem_read_cb(*this)
, m_frame_timer(nullptr)
{ {
} }
@ -73,6 +74,10 @@ apu2a03_device::apu2a03_device(const machine_config& mconfig, const char* tag, d
void nesapu_device::device_reset() void nesapu_device::device_reset()
{ {
write(0x15, 0x00); write(0x15, 0x00);
m_APU.tri.adder = 0;
if (m_APU.frame_irq_enabled)
m_frame_timer->adjust(m_frame_period, 0, m_frame_period);
} }
void nesapu_device::device_clock_changed() void nesapu_device::device_clock_changed()
@ -83,7 +88,7 @@ void nesapu_device::device_clock_changed()
void nesapu_device::calculate_rates() void nesapu_device::calculate_rates()
{ {
m_samps_per_sync = 89490 / 12; // Is there a different PAL value? m_samps_per_sync = m_frame_clocks / 4; // FIXME: tables are 4-step mode ONLY
// initialize sample times in terms of vsyncs // initialize sample times in terms of vsyncs
for (int i = 0; i < SYNCS_MAX1; i++) for (int i = 0; i < SYNCS_MAX1; i++)
@ -113,6 +118,12 @@ void nesapu_device::device_start()
m_irq_handler.resolve_safe(); m_irq_handler.resolve_safe();
m_mem_read_cb.resolve_safe(0x00); m_mem_read_cb.resolve_safe(0x00);
m_frame_timer = timer_alloc(FUNC(nesapu_device::frame_timer_cb), this);
m_frame_clocks = m_is_pal ? 33254 : 29830;
m_frame_period = clocks_to_attotime(m_frame_clocks);
m_APU.step_mode = 4;
m_APU.frame_irq_enabled = true;
calculate_rates(); calculate_rates();
// calculate mixer output // calculate mixer output
@ -204,8 +215,23 @@ void nesapu_device::device_start()
save_item(NAME(m_APU.dpcm.output)); save_item(NAME(m_APU.dpcm.output));
save_item(NAME(m_APU.step_mode)); save_item(NAME(m_APU.step_mode));
save_item(NAME(m_APU.frame_irq_enabled));
save_item(NAME(m_APU.frame_irq_occurred));
} }
TIMER_CALLBACK_MEMBER(nesapu_device::frame_timer_cb)
{
m_stream->update();
if (m_APU.step_mode == 4 && m_APU.frame_irq_enabled)
{
m_APU.frame_irq_occurred = true;
m_irq_handler(true);
}
}
/* TODO: sound channels should *ALL* have DC volume decay */ /* TODO: sound channels should *ALL* have DC volume decay */
/* OUTPUT SQUARE WAVE SAMPLE (VALUES FROM 0 to +15) */ /* OUTPUT SQUARE WAVE SAMPLE (VALUES FROM 0 to +15) */
@ -608,8 +634,9 @@ void nesapu_device::write(offs_t offset, u8 value)
case apu_t::WRE0: case apu_t::WRE0:
m_APU.dpcm.regs[0] = value; m_APU.dpcm.regs[0] = value;
if (!(value & 0x80)) { if (!(value & 0x80)) {
m_irq_handler(false);
m_APU.dpcm.irq_occurred = false; m_APU.dpcm.irq_occurred = false;
if (!m_APU.frame_irq_occurred)
m_irq_handler(false);
} }
break; break;
@ -632,6 +659,20 @@ void nesapu_device::write(offs_t offset, u8 value)
m_APU.step_mode = 5; m_APU.step_mode = 5;
else else
m_APU.step_mode = 4; m_APU.step_mode = 4;
m_APU.frame_irq_enabled = !BIT(value, 6);
if (m_APU.frame_irq_enabled)
{
m_frame_timer->adjust(m_frame_period, 0, m_frame_period);
}
else
{
m_APU.frame_irq_occurred = false;
if (!m_APU.dpcm.irq_occurred)
m_irq_handler(false);
m_frame_timer->reset();
}
break; break;
case apu_t::SMASK: case apu_t::SMASK:
@ -682,8 +723,9 @@ void nesapu_device::write(offs_t offset, u8 value)
else else
m_APU.dpcm.enabled = false; m_APU.dpcm.enabled = false;
//m_irq_handler(false);
m_APU.dpcm.irq_occurred = false; m_APU.dpcm.irq_occurred = false;
if (!m_APU.frame_irq_occurred)
m_irq_handler(false);
break; break;
default: default:
@ -715,9 +757,16 @@ u8 nesapu_device::status_r()
if (m_APU.dpcm.enabled) if (m_APU.dpcm.enabled)
readval |= 0x10; readval |= 0x10;
if (m_APU.frame_irq_occurred)
readval |= 0x40;
if (m_APU.dpcm.irq_occurred) if (m_APU.dpcm.irq_occurred)
readval |= 0x80; readval |= 0x80;
m_APU.frame_irq_occurred = false;
if (!m_APU.dpcm.irq_occurred)
m_irq_handler(false);
return readval; return readval;
} }

7
src/devices/sound/nes_apu.h
View File

@ -75,7 +75,7 @@ private:
// internal state // internal state
apu_t m_APU; /* Actual APUs */ apu_t m_APU; /* Actual APUs */
int m_is_pal; u8 m_is_pal;
u32 m_samps_per_sync; /* Number of samples per vsync */ u32 m_samps_per_sync; /* Number of samples per vsync */
u32 m_vbl_times[SYNCS_MAX1]; /* VBL durations in samples */ u32 m_vbl_times[SYNCS_MAX1]; /* VBL durations in samples */
u32 m_sync_times1[SYNCS_MAX1]; /* Samples per sync table */ u32 m_sync_times1[SYNCS_MAX1]; /* Samples per sync table */
@ -87,6 +87,11 @@ private:
devcb_write_line m_irq_handler; devcb_write_line m_irq_handler;
devcb_read8 m_mem_read_cb; devcb_read8 m_mem_read_cb;
emu_timer *m_frame_timer;
attotime m_frame_period;
u16 m_frame_clocks;
TIMER_CALLBACK_MEMBER(frame_timer_cb);
void calculate_rates(); void calculate_rates();
void apu_square(apu_t::square_t *chan); void apu_square(apu_t::square_t *chan);
void apu_triangle(apu_t::triangle_t *chan); void apu_triangle(apu_t::triangle_t *chan);

4
src/devices/sound/nes_defs.h
View File

@ -145,7 +145,9 @@ struct apu_t
noise_t noi; noise_t noi;
dpcm_t dpcm; dpcm_t dpcm;
int step_mode = 0; u8 step_mode = 0;
bool frame_irq_enabled = false;
bool frame_irq_occurred = false;
}; };
/* CONSTANTS */ /* CONSTANTS */