Soundblaster 16 support (malc)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@455 c046a42c-6fe2-441c-8c8c-71466251a162

Soundblaster 16 support (malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@455 c046a42c-6fe2-441c-8c8c-71466251a162
bellard
1 parent f115e911
Showing 6 changed files with 1679 additions and 2 deletions
Makefile.target
hw/dma.c
hw/sb16.c
oss.c
vl.c
vl.h
@@ -176,7 +176,7 @@ ifeq ($(ARCH),alpha)
 endif
 # must use static linking to avoid leaving stuff in virtual address space
-VL_OBJS=vl.o block.o ide.o vga.o
+VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o
 ifdef CONFIG_SDL
 VL_OBJS+=sdl.o
 SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm
+/*
+ * QEMU DMA emulation
+ * 
+ * Copyright (c) 2003 Vassili Karpov (malc)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include "vl.h"
+#include "cpu.h"
+
+#define log(...) fprintf (stderr, "dma: " __VA_ARGS__)
+#ifdef DEBUG_DMA
+#define lwarn(...) fprintf (stderr, "dma: " __VA_ARGS__)
+#define linfo(...) fprintf (stderr, "dma: " __VA_ARGS__)
+#define ldebug(...) fprintf (stderr, "dma: " __VA_ARGS__)
+#else
+#define lwarn(...)
+#define linfo(...)
+#define ldebug(...)
+#endif
+
+#define MEM_REAL(addr) ((addr)+(uint32_t)(phys_ram_base))
+#define LENOFA(a) ((int) (sizeof(a)/sizeof(a[0])))
+
+struct dma_regs {
+    int now[2];
+    uint16_t base[2];
+    uint8_t mode;
+    uint8_t page;
+    uint8_t dack;
+    uint8_t eop;
+    DMA_read_handler read_handler;
+    DMA_misc_handler misc_handler;
+};
+
+#define ADDR 0
+#define COUNT 1
+
+static struct dma_cont {
+    uint8_t status;
+    uint8_t command;
+    uint8_t mask;
+    uint8_t flip_flop;
+    struct dma_regs regs[4];
+} dma_controllers[2];
+
+enum {
+  CMD_MEMORY_TO_MEMORY = 0x01,
+  CMD_FIXED_ADDRESS    = 0x02,
+  CMD_BLOCK_CONTROLLER = 0x04,
+  CMD_COMPRESSED_TIME  = 0x08,
+  CMD_CYCLIC_PRIORITY  = 0x10,
+  CMD_EXTENDED_WRITE   = 0x20,
+  CMD_LOW_DREQ         = 0x40,
+  CMD_LOW_DACK         = 0x80,
+  CMD_NOT_SUPPORTED    = CMD_MEMORY_TO_MEMORY | CMD_FIXED_ADDRESS
+  | CMD_COMPRESSED_TIME | CMD_CYCLIC_PRIORITY | CMD_EXTENDED_WRITE
+  | CMD_LOW_DREQ | CMD_LOW_DACK
+
+};
+
+static void write_page (struct CPUX86State *env, uint32_t nport, uint32_t data)
+{
+    int ichan;
+    int ncont;
+    static int channels[8] = {-1, 2, 3, 1, -1, -1, -1, 0};
+
+    ncont = nport > 0x87;
+    ichan = channels[nport - 0x80 - (ncont << 3)];
+
+    if (-1 == ichan) {
+        log ("invalid channel %#x %#x\n", nport, data);
+        return;
+    }
+
+    dma_controllers[ncont].regs[ichan].page = data;
+}
+
+static void init_chan (int ncont, int ichan)
+{
+    struct dma_regs *r;
+
+    r = dma_controllers[ncont].regs + ichan;
+    r->now[ADDR] = r->base[0] << ncont;
+    r->now[COUNT] = 0;
+}
+
+static inline int getff (int ncont)
+{
+    int ff;
+
+    ff = dma_controllers[ncont].flip_flop;
+    dma_controllers[ncont].flip_flop = !ff;
+    return ff;
+}
+
+static uint32_t read_chan (struct CPUX86State *env, uint32_t nport)
+{
+    int ff;
+    int ncont, ichan, nreg;
+    struct dma_regs *r;
+    int val;
+
+    ncont = nport > 7;
+    ichan = (nport >> (1 + ncont)) & 3;
+    nreg = (nport >> ncont) & 1;
+    r = dma_controllers[ncont].regs + ichan;
+
+    ff = getff (ncont);
+
+    if (nreg)
+        val = (r->base[COUNT] << ncont) - r->now[COUNT];
+    else
+        val = r->now[ADDR] + r->now[COUNT];
+
+    return (val >> (ncont + (ff << 3))) & 0xff;
+}
+
+static void write_chan (uint32_t nport, int size, uint32_t data)
+{
+    int ncont, ichan, nreg;
+    struct dma_regs *r;
+
+    ncont = nport > 7;
+    ichan = (nport >> (1 + ncont)) & 3;
+    nreg = (nport >> ncont) & 1;
+    r = dma_controllers[ncont].regs + ichan;
+
+    if (2 == size) {
+        r->base[nreg] = data;
+        init_chan (ncont, ichan);
+    }
+    else {
+        if (getff (ncont)) {
+            r->base[nreg] = (r->base[nreg] & 0xff) | ((data << 8) & 0xff00);
+            init_chan (ncont, ichan);
+        }
+        else {
+            r->base[nreg] = (r->base[nreg] & 0xff00) | (data & 0xff);
+        }
+    }
+}
+static void write_chanb (struct CPUX86State *env, uint32_t nport, uint32_t data)
+{
+    write_chan (nport, 1, data);
+}
+
+static void write_chanw (struct CPUX86State *env, uint32_t nport, uint32_t data)
+{
+    write_chan (nport, 2, data);
+}
+
+static void write_cont (struct CPUX86State *env, uint32_t nport, uint32_t data)
+{
+    int iport, ichan, ncont;
+    struct dma_cont *d;
+
+    ncont = nport > 0xf;
+    ichan = -1;
+
+    d = dma_controllers + ncont;
+    if (ncont) {
+        iport = ((nport - 0xd0) >> 1) + 8;
+    }
+    else {
+        iport = nport;
+    }
+
+    switch (iport) {
+    case 8:                     /* command */
+        if (data && (data | CMD_NOT_SUPPORTED)) {
+            log ("command %#x not supported\n", data);
+            goto error;
+        }
+        d->command = data;
+        break;
+
+    case 9:
+        ichan = data & 3;
+        if (data & 4) {
+            d->status |= 1 << (ichan + 4);
+        }
+        else {
+            d->status &= ~(1 << (ichan + 4));
+        }
+        d->status &= ~(1 << ichan);
+        break;
+
+    case 0xa:                   /* single mask */
+        if (data & 4)
+            d->mask |= 1 << (data & 3);
+        else
+            d->mask &= ~(1 << (data & 3));
+        break;
+
+    case 0xb:                   /* mode */
+        {
+#ifdef DMA_DEBUG
+            int op;
+            int ai;
+            int dir;
+            int opmode;
+
+            ichan = val & 3;
+            op = (val >> 2) & 3;
+            ai = (val >> 4) & 1;
+            dir = (val >> 5) & 1;
+            opmode = (val >> 6) & 3;
+
+            linfo ("ichan %d, op %d, ai %d, dir %d, opmode %d\n",
+                   ichan, op, ai, dir, opmode);
+#endif
+
+            d->regs[ichan].mode = data;
+            break;
+        }
+
+    case 0xc:                   /* clear flip flop */
+        d->flip_flop = 0;
+        break;
+
+    case 0xd:                   /* reset */
+        d->flip_flop = 0;
+        d->mask = ~0;
+        d->status = 0;
+        d->command = 0;
+        break;
+
+    case 0xe:                   /* clear mask for all channels */
+        d->mask = 0;
+        break;
+
+    case 0xf:                   /* write mask for all channels */
+        d->mask = data;
+        break;
+
+    default:
+        log ("dma: unknown iport %#x\n", iport);
+        goto error;
+    }
+
+#ifdef DMA_DEBUG
+    if (0xc != iport) {
+        linfo ("nport %#06x, ncont %d, ichan % 2d, val %#06x\n",
+               nport, d != dma_controllers, ichan, data);
+    }
+#endif
+    return;
+
+ error:
+    abort ();
+}
+
+int DMA_get_channel_mode (int nchan)
+{
+    return dma_controllers[nchan > 3].regs[nchan & 3].mode;
+}
+
+void DMA_hold_DREQ (int nchan)
+{
+    int ncont, ichan;
+
+    ncont = nchan > 3;
+    ichan = nchan & 3;
+    linfo ("held cont=%d chan=%d\n", ncont, ichan);
+    dma_controllers[ncont].status |= 1 << (ichan + 4);
+}
+
+void DMA_release_DREQ (int nchan)
+{
+    int ncont, ichan;
+
+    ncont = nchan > 3;
+    ichan = nchan & 3;
+    linfo ("released cont=%d chan=%d\n", ncont, ichan);
+    dma_controllers[ncont].status &= ~(1 << (ichan + 4));
+}
+
+static void channel_run (int ncont, int ichan)
+{
+    struct dma_regs *r;
+    int n;
+    int irq;
+    uint32_t addr;
+/*     int ai, dir; */
+
+    r = dma_controllers[ncont].regs + ichan;
+/*   ai = r->mode & 16; */
+/*   dir = r->mode & 32 ? -1 : 1; */
+
+    addr = MEM_REAL ((r->page << 16) | r->now[ADDR]);
+
+    irq = -1;
+    n = r->read_handler (addr, (r->base[COUNT] << ncont) + (1 << ncont), &irq);
+    r->now[COUNT] = n;
+
+    ldebug ("dma_pos %d irq %d size %d\n",
+            n, irq, (r->base[1] << ncont) + (1 << ncont));
+
+    if (-1 != irq) {
+        pic_set_irq (irq, 1);
+    }
+}
+
+void DMA_run (void)
+{
+    static int in_dma;
+    struct dma_cont *d;
+    int icont, ichan;
+
+    if (in_dma) {
+        log ("attempt to re-enter dma\n");
+        return;
+    }
+
+    in_dma = 1;
+    d = dma_controllers;
+
+    for (icont = 0; icont < 2; icont++, d++) {
+        for (ichan = 0; ichan < 4; ichan++) {
+            int mask;
+
+            mask = 1 << ichan;
+
+            if ((0 == (d->mask & mask)) && (0 != (d->status & (mask << 4))))
+                channel_run (icont, ichan);
+        }
+    }
+    in_dma = 0;
+}
+
+void DMA_register_channel (int nchan,
+                           DMA_read_handler read_handler,
+                           DMA_misc_handler misc_handler)
+{
+    struct dma_regs *r;
+    int ichan, ncont;
+
+    ncont = nchan > 3;
+    ichan = nchan & 3;
+
+    r = dma_controllers[ncont].regs + ichan;
+    r->read_handler = read_handler;
+    r->misc_handler = misc_handler;
+}
+
+void DMA_init (void)
+{
+    int i;
+    int page_port_list[] = { 0x1, 0x2, 0x3, 0x7 };
+
+    for (i = 0; i < 8; i++) {
+        register_ioport_write (i, 1, write_chanb, 1);
+        register_ioport_write (i, 1, write_chanw, 2);
+
+        register_ioport_write (0xc0 + (i << 1), 1, write_chanb, 1);
+        register_ioport_write (0xc0 + (i << 1), 1, write_chanw, 2);
+
+        register_ioport_read (i, 1, read_chan, 1);
+        register_ioport_read (0xc0 + (i << 1), 1, read_chan, 2);
+    }
+
+    for (i = 0; i < LENOFA (page_port_list); i++) {
+        register_ioport_write (page_port_list[i] + 0x80, 1, write_page, 1);
+        register_ioport_write (page_port_list[i] + 0x88, 1, write_page, 1);
+    }
+
+    for (i = 0; i < 8; i++) {
+        register_ioport_write (i + 8, 1, write_cont, 1);
+        register_ioport_write (0xd0 + (i << 1), 1, write_cont, 1);
+    }
+
+    write_cont (NULL, 0xd, 0);
+    write_cont (NULL, 0xdd, 0);
+}
+/*
+ * QEMU Soundblaster 16 emulation
+ * 
+ * Copyright (c) 2003 Vassili Karpov (malc)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include "vl.h"
+
+#define MIN(a, b) ((a)>(b)?(b):(a))
+#define LENOFA(a) ((int) (sizeof(a)/sizeof(a[0])))
+
+#define DEREF(x) (void)x
+#define log(...) fprintf (stderr, "sb16: " __VA_ARGS__)
+#define Fail(...) do {                          \
+    fprintf (stderr, "sb16: " __VA_ARGS__);     \
+    abort ();                                   \
+} while (0)
+
+#ifdef DEBUG_SB16
+#define lwarn(...) fprintf (stderr, "sb16: " __VA_ARGS__)
+#define linfo(...) fprintf (stderr, "sb16: " __VA_ARGS__)
+#define ldebug(...) fprintf (stderr, "sb16: " __VA_ARGS__)
+#else
+#define lwarn(...)
+#define linfo(...)
+#define ldebug(...)
+#endif
+
+#define IO_READ_PROTO(name) \
+    uint32_t name (struct CPUX86State *env, uint32_t nport)
+#define IO_WRITE_PROTO(name) \
+    void name (struct CPUX86State *env, uint32_t nport, uint32_t val)
+
+static struct {
+    int ver_lo;
+    int ver_hi;
+    int irq;
+    int dma;
+    int hdma;
+    int port;
+    int mix_block;
+} sb = {4, 5, 5, 1, 5, 0x220, -1};
+
+static int mix_block, noirq;
+
+static struct mixer {
+    int nreg;
+    uint8_t regs[0x83];
+} mixer;
+
+static struct dsp {
+    int in_index;
+    int out_data_len;
+    int fmt_stereo;
+    int fmt_signed;
+    int fmt_bits;
+    int dma_auto;
+    int dma_buffer_size;
+    int fifo;
+    int freq;
+    int time_const;
+    int speaker;
+    int needed_bytes;
+    int cmd;
+    int dma_pos;
+    int use_hdma;
+
+    int v2x6;
+
+    uint8_t in_data[10];
+    uint8_t out_data[10];
+
+    int left_till_irq;
+} dsp;
+
+#define nocmd ~0
+
+static void log_dsp (const char *cap)
+{
+    DEREF (cap);
+
+    linfo ("%c:%c:%d:%c:dmabuf=%d:pos=%d:freq=%d:timeconst=%d:speaker=%d\n",
+           dsp.fmt_stereo ? 'S' : 'M',
+           dsp.fmt_signed ? 'S' : 'U',
+           dsp.fmt_bits,
+           dsp.dma_auto ? 'a' : 's',
+           dsp.dma_buffer_size,
+           dsp.dma_pos,
+           dsp.freq,
+           dsp.time_const,
+           dsp.speaker);
+}
+
+static void control (int hold)
+{
+    linfo ("%d high %d\n", hold, dsp.use_hdma);
+    if (hold) {
+        if (dsp.use_hdma)
+            DMA_hold_DREQ (sb.hdma);
+        else
+            DMA_hold_DREQ (sb.dma);
+    }
+    else {
+        if (dsp.use_hdma)
+            DMA_release_DREQ (sb.hdma);
+        else
+            DMA_release_DREQ (sb.dma);
+    }
+}
+
+static void dma_cmd (uint8_t cmd, uint8_t d0, int dma_len)
+{
+    int bps;
+    audfmt_e fmt;
+
+    dsp.use_hdma = cmd < 0xc0;
+    dsp.fifo = (cmd >> 1) & 1;
+    dsp.dma_auto = (cmd >> 2) & 1;
+
+    switch (cmd >> 4) {
+    case 11:
+        dsp.fmt_bits = 16;
+        break;
+
+    case 12:
+        dsp.fmt_bits = 8;
+        break;
+    }
+
+    dsp.fmt_signed = (d0 >> 4) & 1;
+    dsp.fmt_stereo = (d0 >> 5) & 1;
+
+    if (-1 != dsp.time_const) {
+        int tmp;
+
+        tmp = 256 - dsp.time_const;
+        dsp.freq = (1000000 + (tmp / 2)) / tmp;
+    }
+    bps = 1 << (16 == dsp.fmt_bits);
+
+    if (-1 != dma_len)
+        dsp.dma_buffer_size = (dma_len + 1) * bps;
+
+    linfo ("frequency %d, stereo %d, signed %d, bits %d, size %d, auto %d\n",
+           dsp.freq, dsp.fmt_stereo, dsp.fmt_signed, dsp.fmt_bits,
+           dsp.dma_buffer_size, dsp.dma_auto);
+
+    if (16 == dsp.fmt_bits) {
+        if (dsp.fmt_signed) {
+            fmt = AUD_FMT_S16;
+        }
+        else {
+            fmt = AUD_FMT_U16;
+        }
+    }
+    else {
+        if (dsp.fmt_signed) {
+            fmt = AUD_FMT_S8;
+        }
+        else {
+            fmt = AUD_FMT_U8;
+        }
+    }
+
+    dsp.dma_pos = 0;
+    dsp.left_till_irq = dsp.dma_buffer_size;
+
+    if (sb.mix_block) {
+        mix_block = sb.mix_block;
+    }
+    else {
+        int align;
+
+        align = bps << dsp.fmt_stereo;
+        mix_block = ((dsp.freq * align) / 100) & ~(align - 1);
+    }
+
+    AUD_reset (dsp.freq, 1 << dsp.fmt_stereo, fmt);
+    control (1);
+    dsp.speaker = 1;
+}
+
+static void command (uint8_t cmd)
+{
+    char *msg;
+
+    msg = (char *)-1;
+
+    linfo ("%#x\n", cmd);
+
+    if (cmd > 0xaf && cmd < 0xd0) {
+        if (cmd & 8)
+            goto error;
+
+        switch (cmd >> 4) {
+        case 11:
+        case 12:
+            break;
+        default:
+            msg = "wrong bits";
+            goto error;
+        }
+        dsp.needed_bytes = 3;
+    }
+    else {
+        switch (cmd) {
+        case 0x10:
+            dsp.needed_bytes = 1;
+            break;
+
+        case 0x14:
+            dsp.needed_bytes = 2;
+            dsp.dma_buffer_size = 0;
+            break;
+
+        case 0x20:
+            dsp.out_data[dsp.out_data_len++] = 0xff;
+            break;
+
+        case 0x35:
+            lwarn ("MIDI commands not implemented\n");
+            break;
+
+        case 0x40:
+            dsp.freq = -1;
+            dsp.time_const = -1;
+            dsp.needed_bytes = 1;
+            break;
+
+        case 0x41:
+        case 0x42:
+            dsp.freq = -1;
+            dsp.time_const = -1;
+            dsp.needed_bytes = 2;
+            break;
+
+        case 0x47:                /* Continue Auto-Initialize DMA 16bit */
+            break;
+
+        case 0x48:
+            dsp.needed_bytes = 2;
+            break;
+
+        case 0x27:                /* ????????? */
+        case 0x4e:
+            return;
+
+        case 0x80:
+            cmd = nocmd;
+            break;
+
+        case 0x90:
+        case 0x91:
+            {
+                uint8_t d0;
+
+                d0 = 4;
+                if (dsp.fmt_signed) d0 |= 16;
+                if (dsp.fmt_stereo) d0 |= 32;
+                dma_cmd (cmd == 0x90 ? 0xc4 : 0xc0, d0, -1);
+                cmd = nocmd;
+                break;
+            }
+
+        case 0xd0:                /* XXX */
+            control (0);
+            return;
+
+        case 0xd1:
+            dsp.speaker = 1;
+            break;
+
+        case 0xd3:
+            dsp.speaker = 0;
+            return;
+
+        case 0xd4:
+            control (1);
+            break;
+
+        case 0xd5:
+            control (0);
+            break;
+
+        case 0xd6:
+            control (1);
+            break;
+
+        case 0xd9:
+            control (0);
+            dsp.dma_auto = 0;
+            return;
+
+        case 0xda:
+            control (0);
+            dsp.dma_auto = 0;
+            break;
+
+        case 0xe0:
+            dsp.needed_bytes = 1;
+            break;
+
+        case 0xe1:
+            dsp.out_data[dsp.out_data_len++] = sb.ver_lo;
+            dsp.out_data[dsp.out_data_len++] = sb.ver_hi;
+            return;
+
+        case 0xf2:
+            dsp.out_data[dsp.out_data_len++] = 0xaa;
+            mixer.regs[0x82] |= 1;
+            pic_set_irq (sb.irq, 1);
+            return;
+
+        default:
+            msg = "is unknown";
+            goto error;
+        }
+    }
+    dsp.cmd = cmd;
+    return;
+
+ error:
+    Fail ("%#x %s", cmd, msg);
+    return;
+}
+
+static void complete (void)
+{
+    linfo ("complete command %#x, in_index %d, needed_bytes %d\n",
+           dsp.cmd, dsp.in_index, dsp.needed_bytes);
+
+    if (dsp.cmd > 0xaf && dsp.cmd < 0xd0) {
+        int d0, d1, d2;
+
+        d0 = dsp.in_data[0];
+        d1 = dsp.in_data[1];
+        d2 = dsp.in_data[2];
+
+        ldebug ("d0 = %d, d1 = %d, d2 = %d\n",
+                d0, d1, d2);
+        dma_cmd (dsp.cmd, d0, d1 + (d2 << 8));
+    }
+    else {
+        switch (dsp.cmd) {
+
+        case 0x10:
+            break;
+
+        case 0x14:
+            {
+                int d0, d1;
+                int save_left;
+                int save_pos;
+
+                d0 = dsp.in_data[0];
+                d1 = dsp.in_data[1];
+
+                save_left = dsp.left_till_irq;
+                save_pos = dsp.dma_pos;
+                dma_cmd (0xc0, 0, d0 + (d1 << 8));
+                dsp.left_till_irq = save_left;
+                dsp.dma_pos = save_pos;
+
+                linfo ("set buffer size data[%d, %d] %d pos %d\n",
+                       d0, d1, dsp.dma_buffer_size, dsp.dma_pos);
+                break;
+            }
+
+        case 0x40:
+            dsp.time_const = dsp.in_data[0];
+            linfo ("set time const %d\n", dsp.time_const);
+            break;
+
+        case 0x41:
+        case 0x42:
+            dsp.freq = dsp.in_data[1] + (dsp.in_data[0] << 8);
+            linfo ("set freq %#x, %#x = %d\n",
+                   dsp.in_data[1], dsp.in_data[0], dsp.freq);
+            break;
+
+        case 0x48:
+            dsp.dma_buffer_size = dsp.in_data[1] + (dsp.in_data[0] << 8);
+            linfo ("set dma len %#x, %#x = %d\n",
+                   dsp.in_data[1], dsp.in_data[0], dsp.dma_buffer_size);
+            break;
+
+        case 0xe0:
+            dsp.out_data_len = 1;
+            linfo ("data = %#x\n", dsp.in_data[0]);
+            dsp.out_data[0] = dsp.in_data[0] ^ 0xff;
+            break;
+
+        default:
+            goto error;
+        }
+    }
+
+    dsp.cmd = -1;
+    return;
+
+ error:
+    Fail ("unrecognized command %#x", dsp.cmd);
+}
+
+static IO_WRITE_PROTO (dsp_write)
+{
+    int iport;
+
+    iport = nport - sb.port;
+
+    switch (iport) {
+    case 0x6:
+        if (0 == val)
+            dsp.v2x6 = 0;
+        else if ((1 == val) && (0 == dsp.v2x6)) {
+            dsp.v2x6 = 1;
+            dsp.out_data[dsp.out_data_len++] = 0xaa;
+        }
+        else
+            dsp.v2x6 = ~0;
+        break;
+
+    case 0xc:                   /* write data or command | write status */
+        if (0 == dsp.needed_bytes) {
+            command (val);
+            if (0 == dsp.needed_bytes) {
+                log_dsp (__func__);
+            }
+        }
+        else {
+            dsp.in_data[dsp.in_index++] = val;
+            if (dsp.in_index == dsp.needed_bytes) {
+                dsp.needed_bytes = 0;
+                dsp.in_index = 0;
+                complete ();
+                log_dsp (__func__);
+            }
+        }
+        break;
+
+    default:
+        Fail ("(nport=%#x, val=%#x)", nport, val);
+    }
+}
+
+static IO_READ_PROTO (dsp_read)
+{
+    char *msg;
+    int iport, retval;
+
+    msg = (char *) -1;
+    iport = nport - sb.port;
+
+    switch (iport) {
+
+    case 0x6:                   /* reset */
+        return 0;
+
+    case 0xa:                   /* read data */
+        if (dsp.out_data_len) {
+            retval = dsp.out_data[--dsp.out_data_len];
+        }
+        else {
+#if 1
+            lwarn ("empty output buffer\n");
+            retval = 0;
+#else
+            msg = "empty output buffer";
+            goto error;
+#endif
+        }
+        break;
+
+    case 0xc:                   /* 0 can write */
+        retval = 0;
+        break;
+
+    case 0xd:                   /* timer interrupt clear */
+        goto error;
+
+    case 0xe:                   /* data available status | irq 8 ack */
+        retval = (0 == dsp.out_data_len) ? 0 : 0x80;
+        break;
+
+    case 0xf:                   /* irq 16 ack */
+        retval = 0xff;
+        mixer.regs[0x82] &= ~2;
+        ldebug ("16 ack\n");
+        break;
+
+    default:
+        goto error;
+    }
+
+    if ((0xc != iport) && (0xe != iport)) {
+        ldebug ("(nport=%#x, size=%d) iport %#x = %#x\n",
+                nport, size, iport, retval);
+    }
+
+    return retval;
+
+ error:
+    Fail ("(nport=%#x) %s",  nport, msg);
+}
+
+static IO_WRITE_PROTO(mixer_write_indexb)
+{
+    mixer.nreg = val & 0xff;
+}
+
+static IO_WRITE_PROTO(mixer_write_datab)
+{
+    mixer.regs[mixer.nreg] = val;
+}
+
+static IO_WRITE_PROTO(mixer_write_indexw)
+{
+    mixer_write_indexb (env, nport, val & 0xff);
+    mixer_write_datab (env, nport, (val >> 8) & 0xff);
+}
+
+static IO_READ_PROTO(mixer_read)
+{
+    return mixer.regs[mixer.nreg];
+}
+
+void SB16_run (void)
+{
+    if (0 == dsp.speaker)
+        return;
+
+    AUD_run ();
+}
+
+static int write_audio (uint32_t addr, int len, int size)
+{
+    int temp, net;
+
+    temp = size;
+
+    net = 0;
+
+    while (temp) {
+        int left_till_end;
+        int to_copy;
+        int copied;
+
+        left_till_end = len - dsp.dma_pos;
+
+        to_copy = MIN (temp, left_till_end);
+
+        copied = AUD_write ((void *) (addr + dsp.dma_pos), to_copy);
+
+        temp -= copied;
+        dsp.dma_pos += copied;
+
+        if (dsp.dma_pos == len) {
+            dsp.dma_pos = 0;
+        }
+
+        net += copied;
+
+        if (copied != to_copy)
+            return net;
+    }
+
+    return net;
+}
+
+static int SB_read_DMA (uint32_t addr, int size, int *_irq)
+{
+    int free, till, copy, written;
+
+    if (0 == dsp.speaker)
+        return 0;
+
+    if (dsp.left_till_irq < 0) {
+        dsp.left_till_irq += dsp.dma_buffer_size;
+        return dsp.dma_pos;
+    }
+
+    free = AUD_get_free ();
+
+    if ((free <= 0) || (0 == size)) {
+        return dsp.dma_pos;
+    }
+
+    if (mix_block > 0) {
+        copy = MIN (free, mix_block);
+    }
+    else {
+        copy = free;
+    }
+
+    till = dsp.left_till_irq;
+
+    ldebug ("addr:%#010x free:%d till:%d size:%d\n",
+            addr, free, till, size);
+/*   linfo ("pos %d free %d size %d till %d copy %d auto %d noirq %d\n", */
+/*       dsp.dma_pos, free, size, till, copy, dsp.dma_auto, noirq); */
+    if (till <= copy) {
+        if (0 == dsp.dma_auto) {
+            copy = till;
+        }
+    }
+
+    written = write_audio (addr, size, copy);
+    dsp.left_till_irq -= written;
+    AUD_adjust_estimate (free - written);
+
+    if (dsp.left_till_irq <= 0) {
+        mixer.regs[0x82] |= mixer.regs[0x80];
+        if (0 == noirq)
+            *_irq = sb.irq;
+
+        if (0 == dsp.dma_auto) {
+            control (0);
+        }
+    }
+
+    ldebug ("pos %5d free %5d size %5d till % 5d copy %5d dma size %5d\n",
+            dsp.dma_pos, free, size, dsp.left_till_irq, copy,
+            dsp.dma_buffer_size);
+
+    if (dsp.left_till_irq <= 0) {
+        dsp.left_till_irq += dsp.dma_buffer_size;
+    }
+
+    return dsp.dma_pos;
+}
+
+static int dma_misc_handler (int moo)
+{
+    return -1;
+}
+
+static int magic_of_irq (int irq)
+{
+    switch (irq) {
+    case 2:
+        return 1;
+    case 5:
+        return 2;
+    case 7:
+        return 4;
+    case 10:
+        return 8;
+    default:
+        log ("bad irq %d\n", irq);
+        return 2;
+    }
+}
+
+static int irq_of_magic (int magic)
+{
+    switch (magic) {
+    case 1:
+        return 2;
+    case 2:
+        return 5;
+    case 4:
+        return 7;
+    case 8:
+        return 10;
+    default:
+        log ("bad irq magic %d\n", magic);
+        return 2;
+    }
+}
+
+void SB16_init (void)
+{
+    int i;
+    static const uint8_t dsp_write_ports[] = {0x6, 0xc};
+    static const uint8_t dsp_read_ports[] = {0x6, 0xa, 0xc, 0xd, 0xe, 0xf};
+
+    mixer.regs[0x0e] = ~0;
+    mixer.regs[0x80] = magic_of_irq (sb.irq);
+    mixer.regs[0x81] = 0x20 | (sb.dma << 1);
+
+    DEREF (irq_of_magic);
+
+    for (i = 0x30; i < 0x48; i++) {
+        mixer.regs[i] = 0x20;
+    }
+
+    for (i = 0; i < LENOFA (dsp_write_ports); i++) {
+        register_ioport_write (sb.port + dsp_write_ports[i], 1, dsp_write, 1);
+    }
+
+    for (i = 0; i < LENOFA (dsp_read_ports); i++) {
+        register_ioport_read (sb.port + dsp_read_ports[i], 1, dsp_read, 1);
+    }
+
+    register_ioport_write (sb.port + 0x4, 1, mixer_write_indexb, 1);
+    register_ioport_write (sb.port + 0x4, 1, mixer_write_indexw, 2);
+    register_ioport_read (sb.port + 0x5, 1, mixer_read, 1);
+    register_ioport_write (sb.port + 0x5, 1, mixer_write_datab, 1);
+
+    DMA_register_channel (sb.hdma, SB_read_DMA, dma_misc_handler);
+    DMA_register_channel (sb.dma, SB_read_DMA, dma_misc_handler);
+}
+/*
+ * QEMU OSS Audio output driver
+ * 
+ * Copyright (c) 2003 Vassili Karpov (malc)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/soundcard.h>
+
+#include "vl.h"
+
+/* http://www.df.lth.se/~john_e/gems/gem002d.html */
+/* http://www.multi-platforms.com/Tips/PopCount.htm */
+static inline uint32_t popcount (uint32_t u)
+{
+  u = ((u&0x55555555) + ((u>>1)&0x55555555));
+  u = ((u&0x33333333) + ((u>>2)&0x33333333));
+  u = ((u&0x0f0f0f0f) + ((u>>4)&0x0f0f0f0f));
+  u = ((u&0x00ff00ff) + ((u>>8)&0x00ff00ff));
+  u = ( u&0x0000ffff) + (u>>16);
+  return u;
+}
+
+static inline uint32_t lsbindex (uint32_t u)
+{
+  return popcount ((u&-u)-1);
+}
+
+#define MIN(a, b) ((a)>(b)?(b):(a))
+#define MAX(a, b) ((a)<(b)?(b):(a))
+
+#define DEREF(x) (void)x
+#define log(...) fprintf (stderr, "oss: " __VA_ARGS__)
+#define ERRFail(...) do {                                       \
+    int _errno = errno;                                         \
+    fprintf (stderr, "oss: " __VA_ARGS__);                      \
+    fprintf (stderr, "system error: %s\n", strerror (_errno));  \
+    abort ();                                                   \
+} while (0)
+#define Fail(...) do {                          \
+    fprintf (stderr, "oss: " __VA_ARGS__);      \
+    fprintf (stderr, "\n");                     \
+    abort ();                                   \
+} while (0)
+
+#ifdef DEBUG_OSS
+#define lwarn(...) fprintf (stderr, "oss: " __VA_ARGS__)
+#define linfo(...) fprintf (stderr, "oss: " __VA_ARGS__)
+#define ldebug(...) fprintf (stderr, "oss: " __VA_ARGS__)
+#else
+#define lwarn(...)
+#define linfo(...)
+#define ldebug(...)
+#endif
+
+
+#define IOCTL(args) do {                        \
+  int ret = ioctl args;                         \
+  if (-1 == ret) {                              \
+    ERRFail (#args);                            \
+  }                                             \
+  ldebug ("ioctl " #args " = %d\n", ret);       \
+} while (0)
+
+static int audio_fd = -1;
+static int freq;
+static int conf_nfrags = 4;
+static int conf_fragsize;
+static int nfrags;
+static int fragsize;
+static int bufsize;
+static int nchannels;
+static int fmt;
+static int rpos;
+static int wpos;
+static int atom;
+static int live;
+static int leftover;
+static int bytes_per_second;
+static void *buf;
+static enum {DONT, DSP, TID} estimate = TID;
+
+static void (*copy_fn)(void *, void *, int);
+
+static void copy_no_conversion (void *dst, void *src, int size)
+{
+    memcpy (dst, src, size);
+}
+
+static void copy_u16_to_s16 (void *dst, void *src, int size)
+{
+    int i;
+    uint16_t *out, *in;
+
+    out = dst;
+    in = src;
+
+    for (i = 0; i < size / 2; i++) {
+        out[i] = in[i] + 0x8000;
+    }
+}
+
+static void pab (struct audio_buf_info *abinfo)
+{
+    DEREF (abinfo);
+
+    ldebug ("fragments %d, fragstotal %d, fragsize %d, bytes %d\n"
+            "rpos %d, wpos %d, live %d\n",
+            abinfo->fragments,
+            abinfo->fragstotal,
+            abinfo->fragsize,
+            abinfo->bytes,
+            rpos, wpos, live);
+}
+
+void AUD_reset (int rfreq, int rnchannels, audfmt_e rfmt)
+{
+    int fmt_;
+    int bits16;
+
+    if (-1 == audio_fd) {
+        AUD_open (rfreq, rnchannels, rfmt);
+        return;
+    }
+
+    switch (rfmt) {
+    case AUD_FMT_U8:
+        bits16 = 0;
+        fmt_ = AFMT_U8;
+        copy_fn = copy_no_conversion;
+        atom = 1;
+        break;
+
+    case AUD_FMT_S8:
+        Fail ("can not play 8bit signed");
+
+    case AUD_FMT_S16:
+        bits16 = 1;
+        fmt_ = AFMT_S16_LE;
+        copy_fn = copy_no_conversion;
+        atom = 2;
+        break;
+
+    case AUD_FMT_U16:
+        bits16 = 1;
+        fmt_ = AFMT_S16_LE;
+        copy_fn = copy_u16_to_s16;
+        atom = 2;
+        break;
+
+    default:
+        abort ();
+    }
+
+    if ((fmt_ == fmt) && (bits16 + 1 == nchannels) && (rfreq == freq))
+        return;
+    else {
+        AUD_open (rfreq, rnchannels, rfmt);
+    }
+}
+
+void AUD_open (int rfreq, int rnchannels, audfmt_e rfmt)
+{
+    int fmt_;
+    int mmmmssss;
+    struct audio_buf_info abinfo;
+    int _fmt;
+    int _freq;
+    int _nchannels;
+    int bits16;
+
+    bits16 = 0;
+
+    switch (rfmt) {
+    case AUD_FMT_U8:
+        bits16 = 0;
+        fmt_ = AFMT_U8;
+        copy_fn = copy_no_conversion;
+        atom = 1;
+        break;
+
+    case AUD_FMT_S8:
+        Fail ("can not play 8bit signed");
+
+    case AUD_FMT_S16:
+        bits16 = 1;
+        fmt_ = AFMT_S16_LE;
+        copy_fn = copy_no_conversion;
+        atom = 2;
+        break;
+
+    case AUD_FMT_U16:
+        bits16 = 1;
+        fmt_ = AFMT_S16_LE;
+        copy_fn = copy_u16_to_s16;
+        atom = 2;
+        break;
+
+    default:
+        abort ();
+    }
+
+    if (buf) {
+        free (buf);
+        buf = 0;
+    }
+
+    if (-1 != audio_fd)
+        close (audio_fd);
+
+    audio_fd = open ("/dev/dsp", O_WRONLY | O_NONBLOCK);
+    if (-1 == audio_fd) {
+        ERRFail ("can not open /dev/dsp");
+    }
+
+    _fmt = fmt_;
+    _freq = rfreq;
+    _nchannels = rnchannels;
+
+    IOCTL ((audio_fd, SNDCTL_DSP_RESET, 1));
+    IOCTL ((audio_fd, SNDCTL_DSP_SAMPLESIZE, &_fmt));
+    IOCTL ((audio_fd, SNDCTL_DSP_CHANNELS, &_nchannels));
+    IOCTL ((audio_fd, SNDCTL_DSP_SPEED, &_freq));
+    IOCTL ((audio_fd, SNDCTL_DSP_NONBLOCK));
+
+    /* from oss.pdf:
+
+    The argument to this call is an integer encoded as 0xMMMMSSSS (in
+    hex). The 16 least significant bits determine the fragment
+    size. The size is 2^SSSS. For examp le SSSS=0008 gives fragment
+    size of 256 bytes (2^8). The minimum is 16 bytes (SSSS=4) and the
+    maximum is total_buffer_size/2. Some devices or processor
+    architectures may require larger fragments - in this case the
+    requested fragment size is automatically increased.
+
+    So ahem... 4096 = 2^12, and grand total 0x0004000c
+    */
+
+    mmmmssss = (conf_nfrags << 16) | conf_fragsize;
+    IOCTL ((audio_fd, SNDCTL_DSP_SETFRAGMENT, &mmmmssss));
+
+    linfo ("_fmt = %d, fmt = %d\n"
+           "_channels = %d, rnchannels = %d\n"
+           "_freq = %d, freq = %d\n",
+           _fmt, fmt_,
+           _nchannels, rnchannels,
+           _freq, rfreq);
+
+    if (_fmt != fmt_) {
+        Fail ("format %d != %d", _fmt, fmt_);
+    }
+
+    if (_nchannels != rnchannels) {
+        Fail ("channels %d != %d", _nchannels, rnchannels);
+    }
+
+    if (_freq != rfreq) {
+        Fail ("freq %d != %d", _freq, rfreq);
+    }
+
+    IOCTL ((audio_fd, SNDCTL_DSP_GETOSPACE, &abinfo));
+
+    nfrags = abinfo.fragstotal;
+    fragsize = abinfo.fragsize;
+    freq = _freq;
+    fmt = _fmt;
+    nchannels = rnchannels;
+    atom <<= nchannels >>  1;
+    bufsize = nfrags * fragsize;
+
+    bytes_per_second = (freq << (nchannels >> 1)) << bits16;
+
+    linfo ("bytes per second %d\n", bytes_per_second);
+
+    linfo ("fragments %d, fragstotal %d, fragsize %d, bytes %d, bufsize %d\n",
+           abinfo.fragments,
+           abinfo.fragstotal,
+           abinfo.fragsize,
+           abinfo.bytes,
+           bufsize);
+
+    if (NULL == buf) {
+        buf = malloc (bufsize);
+        if (NULL == buf) {
+            abort ();
+        }
+    }
+
+    rpos = 0;
+    wpos = 0;
+    live = 0;
+}
+
+int AUD_write (void *in_buf, int size)
+{
+    int to_copy, temp;
+    uint8_t *in, *out;
+
+    to_copy = MIN (bufsize - live, size);
+
+    temp = to_copy;
+
+    in = in_buf;
+    out = buf;
+
+    while (temp) {
+        int copy;
+
+        copy = MIN (temp, bufsize - wpos);
+        copy_fn (out + wpos, in, copy);
+
+        wpos += copy;
+        if (wpos == bufsize) {
+            wpos = 0;
+        }
+
+        temp -= copy;
+        in += copy;
+        live += copy;
+    }
+
+    return to_copy;
+}
+
+void AUD_run (void)
+{
+    int res;
+    int bytes;
+    struct audio_buf_info abinfo;
+
+    if (0 == live)
+        return;
+
+    res = ioctl (audio_fd, SNDCTL_DSP_GETOSPACE, &abinfo);
+
+    if (-1 == res) {
+        int err;
+
+        err = errno;
+        lwarn ("SNDCTL_DSP_GETOSPACE failed with %s\n", strerror (err));
+    }
+
+    bytes = abinfo.bytes;
+    bytes = MIN (live, bytes);
+#if 0
+    bytes = (bytes / fragsize) * fragsize;
+#endif
+
+    while (bytes) {
+        int left, play, written;
+
+        left = bufsize - rpos;
+        play = MIN (left, bytes);
+        written = write (audio_fd, (void *) ((uint32_t) buf + rpos), play);
+
+        if (-1 == written) {
+            if (EAGAIN == errno || EINTR == errno) {
+                return;
+            }
+            else {
+                ERRFail ("write audio");
+            }
+        }
+
+        play = written;
+        live -= play;
+        rpos += play;
+        bytes -= play;
+
+        if (rpos == bufsize) {
+            rpos = 0;
+        }
+    }
+}
+
+static int get_dsp_bytes (void)
+{
+    int res;
+    struct count_info info;
+
+    res = ioctl (audio_fd, SNDCTL_DSP_GETOPTR, &info);
+    if (-1 == res) {
+        int err;
+
+        err = errno;
+        lwarn ("SNDCTL_DSP_GETOPTR failed with %s\n", strerror (err));
+        return -1;
+    }
+    else {
+        ldebug ("bytes %d\n", info.bytes);
+        return info.bytes;
+    }
+}
+
+void AUD_adjust_estimate (int _leftover)
+{
+    leftover = _leftover;
+}
+
+int AUD_get_free (void)
+{
+    int free, elapsed;
+
+    free = bufsize - live;
+
+    if (0 == free)
+        return 0;
+
+    elapsed = free;
+    switch (estimate) {
+    case DONT:
+        break;
+
+    case DSP:
+        {
+            static int old_bytes;
+            int bytes;
+
+            bytes = get_dsp_bytes ();
+            if (bytes <= 0)
+                return free;
+
+            elapsed = bytes - old_bytes;
+            old_bytes = bytes;
+            ldebug ("dsp elapsed %d bytes\n", elapsed);
+            break;
+        }
+
+    case TID:
+        {
+            static uint64_t old_ticks;
+            uint64_t ticks, delta;
+            uint64_t ua_elapsed;
+            uint64_t al_elapsed;
+
+            ticks = cpu_get_ticks ();
+            delta = ticks - old_ticks;
+            old_ticks = ticks;
+
+            ua_elapsed = (delta * bytes_per_second) / ticks_per_sec;
+            al_elapsed = ua_elapsed & ~3ULL;
+
+            ldebug ("tid elapsed %llu bytes\n", ua_elapsed);
+
+            if (al_elapsed > (uint64_t) INT_MAX)
+                elapsed = INT_MAX;
+            else
+                elapsed = al_elapsed;
+
+            elapsed += leftover;
+        }
+    }
+
+    if (elapsed > free) {
+        lwarn ("audio can not keep up elapsed %d free %d\n", elapsed, free);
+        return free;
+    }
+    else {
+        return elapsed;
+    }
+}
+
+int AUD_get_live (void)
+{
+    return live;
+}
+
+int AUD_get_buffer_size (void)
+{
+    return bufsize;
+}
+
+void AUD_init (void)
+{
+    int fsp;
+    int _fragsize = 4096;
+
+    DEREF (pab);
+
+    fsp = _fragsize;
+    if (0 != (fsp & (fsp - 1))) {
+        Fail ("fragment size %d is not power of 2", fsp);
+    }
+
+    conf_fragsize = lsbindex (fsp);
+}
@@ -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);
@@ -27,6 +27,7 @@
 /* vl.c */
 struct CPUX86State;
 extern int reset_requested;
+extern int64_t ticks_per_sec;
 typedef void (IOPortWriteFunc)(struct CPUX86State *env, uint32_t address, uint32_t data);
 typedef uint32_t (IOPortReadFunc)(struct CPUX86State *env, uint32_t address);
@@ -35,6 +36,7 @@ void *get_mmap_addr(unsigned long size);
 int register_ioport_read(int start, int length, IOPortReadFunc *func, int size);
 int register_ioport_write(int start, int length, IOPortWriteFunc *func, int size);
 void pic_set_irq(int irq, int level);
+int64_t cpu_get_ticks(void);
 void kbd_put_keycode(int keycode);
@@ -107,4 +109,39 @@ void ide_init(void);
 void ide_set_geometry(int n, int cyls, int heads, int secs);
 void ide_set_cdrom(int n, int is_cdrom);
+/* oss.c */
+typedef enum {
+  AUD_FMT_U8,
+  AUD_FMT_S8,
+  AUD_FMT_U16,
+  AUD_FMT_S16
+} audfmt_e;
+
+void AUD_open (int rfreq, int rnchannels, audfmt_e rfmt);
+void AUD_reset (int rfreq, int rnchannels, audfmt_e rfmt);
+int AUD_write (void *in_buf, int size);
+void AUD_run (void);
+void AUD_adjust_estimate (int _leftover);
+int AUD_get_free (void);
+int AUD_get_live (void);
+int AUD_get_buffer_size (void);
+void AUD_init (void);
+
+/* dma.c */
+typedef int (*DMA_read_handler) (uint32_t addr, int size, int *irq);
+typedef int (*DMA_misc_handler) (int);
+
+int DMA_get_channel_mode (int nchan);
+void DMA_hold_DREQ (int nchan);
+void DMA_release_DREQ (int nchan);
+void DMA_run (void);
+void DMA_init (void);
+void DMA_register_channel (int nchan,
+                           DMA_read_handler read_handler,
+                           DMA_misc_handler misc_handler);
+
+/* sb16.c */
+void SB16_run (void);
+void SB16_init (void);
+ 
 #endif /* VL_H */