From 9212136735acf8cefeb6740136603a1a779f5bb4 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Mon, 8 Feb 2016 01:33:58 -0800 Subject: [PATCH] timer clear too --- hw/ultrasnd/test.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/ultrasnd/test.c b/hw/ultrasnd/test.c index b39f89b21..8808bc198 100644 --- a/hw/ultrasnd/test.c +++ b/hw/ultrasnd/test.c @@ -559,11 +559,11 @@ static void do_play_voice() { vga_moveto(box.x+2,box.y+5); vga_write_color(0x1F); - vga_write("6=8/16-bit "); + vga_write("6=8/16 "); vga_write_color((gus_ignore_irq & 0x60) ? 0x1E : 0x1F); - vga_write("I=ignorevoiceIRQ "); + vga_write("I=ignVocIRQ "); vga_write_color(0x1F); - vga_write("S=read2X6 V=clearVoiceIRQ D=clrDMAIRQ c/C=FCadj"); + vga_write("S=read2X6 V=clrVocIRQ D=clrDMAIRQ T=clrTimerIRQ c/C=FCadj"); vga_moveto(box.x+2,box.y+6); vga_write_color(0x1F); @@ -745,6 +745,12 @@ static void do_play_voice() { ultrasnd_select_read(gus,0x41); // to clear stuck DMA IRQs _sti(); } + else if (c == 'T') { + _cli(); + ultrasnd_select_write(gus,0x45,0x00); + ultrasnd_select_write(gus,0x45,gus_timer_ctl); /* enable timer 1 IRQ */ + _sti(); + } } }