summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Felipe CorrĂȘa da Silva Sanches <fsanches@metamaquina.com.br>2015-06-13 10:42:53 -0300
committer Felipe CorrĂȘa da Silva Sanches <fsanches@metamaquina.com.br>2015-06-16 15:17:20 -0300
commit9a27b57c07a23509f4f7fc3b93e3f5c2679e293c (patch)
tree7686f19cd4a8c1ddede96422b53ecb05c696ccb9 /src/emu
parente3fdd3f0335fc6ba632b792c448d941f2bd514e9 (diff)
uzebox: adding sound emulation (It works but with terrible performance. Uzebox's DrMario song is recognizable even though the sound is choppy, full of noise).
When running with -wavwrite the resulting file plays nicely on a music player. The sound is much better, but still contains a high frequency noisy sort of hiss.
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/avr8/avr8.c37
-rw-r--r--src/emu/cpu/avr8/avr8.h1
2 files changed, 22 insertions, 16 deletions
diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c
index 976b2ff8856..4f45b51e0ea 100644
--- a/src/emu/cpu/avr8/avr8.c
+++ b/src/emu/cpu/avr8/avr8.c
@@ -869,6 +869,7 @@ void avr8_device::device_reset()
m_timer_prescale_count[t] = 0;
}
+ m_ocr2_not_reached_yet = true;
m_interrupt_pending = false;
m_elapsed_cycles = 0;
}
@@ -1553,22 +1554,26 @@ void avr8_device::timer2_tick()
switch(wgm2)
{
case WGM02_FAST_PWM:
- if(count == ocr2[reg])
- {
- if (reg == 0)
- {
- m_r[AVR8_REGIDX_TIFR2] |= AVR8_TIFR2_TOV2_MASK;
- count = 0;
- increment = 0;
- }
-
- m_r[AVR8_REGIDX_TIFR2] |= ocf2[reg];
- }
- else if(count == 0)
+ if (reg==0)
{
- if (reg == 0)
+ if (count >= m_r[AVR8_REGIDX_OCR2A])
{
- m_r[AVR8_REGIDX_TIFR2] &= ~AVR8_TIFR2_TOV2_MASK;
+ if (count >= 0xFF)
+ {
+ //Turn on
+ m_io->write_byte(AVR8_IO_PORTD, m_io->read_byte(AVR8_IO_PORTD) | (1 << 7));
+ m_r[AVR8_REGIDX_TCNT2] = 0;
+ m_ocr2_not_reached_yet = true;
+ }
+ else
+ {
+ if (m_ocr2_not_reached_yet)
+ {
+ //Turn off
+ m_io->write_byte(AVR8_IO_PORTD, m_io->read_byte(AVR8_IO_PORTD) & ~(1 << 7));
+ m_ocr2_not_reached_yet = false;
+ }
+ }
}
}
break;
@@ -1585,7 +1590,7 @@ void avr8_device::timer2_tick()
m_r[AVR8_REGIDX_TIFR2] |= ocf2[reg];
}
- else if(count == 0)
+ else if (count == 0)
{
if (reg == 0)
{
@@ -1616,7 +1621,7 @@ void avr8_device::timer2_tick()
*/
}
- m_r[AVR8_REGIDX_TCNT2] = count + increment;
+ m_r[AVR8_REGIDX_TCNT2] += increment;
update_interrupt(AVR8_INTIDX_OCF2A);
update_interrupt(AVR8_INTIDX_OCF2B);
diff --git a/src/emu/cpu/avr8/avr8.h b/src/emu/cpu/avr8/avr8.h
index 2384c585804..5708a571023 100644
--- a/src/emu/cpu/avr8/avr8.h
+++ b/src/emu/cpu/avr8/avr8.h
@@ -162,6 +162,7 @@ protected:
UINT8 m_timer_increment[6];
UINT16 m_timer_prescale[6];
UINT16 m_timer_prescale_count[6];
+ bool m_ocr2_not_reached_yet;
// SPI
bool m_spi_active;