summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-11-13 01:46:15 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-11-13 01:46:15 +0000
commit275033239681346347766ac3712e3af792a0304f (patch)
tree5b5a392ab0c2d472577a297186ff7f74487e29b5 /vl.c
parentf115e911d70dedbbab90efe589b267bf53178f10 (diff)
downloadqemu-275033239681346347766ac3712e3af792a0304f.tar.gz
Soundblaster 16 support (malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@455 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index ff7ff89b9d..9363f1e746 100644
--- a/vl.c
+++ b/vl.c
@@ -2095,6 +2095,9 @@ void kbd_write_command(CPUX86State *env, uint32_t addr, uint32_t val)
reset_requested = 1;
cpu_x86_interrupt(global_env, CPU_INTERRUPT_EXIT);
break;
+ case 0xff:
+ /* ignore that - I don't know what is its use */
+ break;
default:
fprintf(stderr, "qemu: unsupported keyboard cmd=0x%02x\n", val);
break;
@@ -2598,6 +2601,10 @@ static void host_alarm_handler(int host_signum, siginfo_t *info,
gui_refresh_pending = 1;
}
+ /* XXX: seems dangerous to run that here. */
+ DMA_run();
+ SB16_run();
+
if (gui_refresh_pending || timer_irq_pending) {
/* just exit from the cpu to have a chance to handle timers */
cpu_x86_interrupt(global_env, CPU_INTERRUPT_EXIT);
@@ -2746,7 +2753,7 @@ void help(void)
"-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n"
"-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n"
"-cdrom file use 'file' as IDE cdrom 2 image\n"
- "-boot [c|d] boot on hard disk or CD-ROM\n"
+ "-boot [c|d] boot on hard disk (c) or CD-ROM (d)\n"
"-snapshot write to temporary files instead of disk image files\n"
"-m megs set virtual RAM size to megs MB\n"
"-n script set network init script [default=%s]\n"
@@ -3148,6 +3155,9 @@ int main(int argc, char **argv)
ne2000_init();
ide_init();
kbd_init();
+ AUD_init();
+ DMA_init();
+ SB16_init();
/* setup cpu signal handlers for MMU / self modifying code handling */
sigfillset(&act.sa_mask);