ne2000 savevm support (Johannes Schindelin)

[qemu] / hw / sb16.c

diff --git a/hw/sb16.c b/hw/sb16.c
index b2d20de..260718c 100644 (file)
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -26,8 +26,10 @@
 #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 log(...) do {                           \
+    fprintf (stderr, "sb16: " __VA_ARGS__);     \
+    fputc ('\n', stderr);                       \
+} while (0)
 
 /* #define DEBUG_SB16 */
 #ifdef DEBUG_SB16
@@ -45,6 +47,8 @@
 #define IO_WRITE_PROTO(name) \
     void name (void *opaque, uint32_t nport, uint32_t val)
 
+static const char e3[] = "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992.";
+
 static struct {
     int ver_lo;
     int ver_hi;
@@ -77,13 +81,13 @@ typedef struct SB16State {
     int v2x6;
 
     uint8_t in_data[10];
-    uint8_t out_data[10];
+    uint8_t out_data[50];
 
     int left_till_irq;
 
     /* mixer state */
     int mixer_nreg;
-    uint8_t mixer_regs[0x83];
+    uint8_t mixer_regs[256];
 } SB16State;
 
 /* XXX: suppress that and use a context */
@@ -192,6 +196,12 @@ static void dma_cmd (uint8_t cmd, uint8_t d0, int dma_len)
     dsp.speaker = 1;
 }
 
+static inline void dsp_out_data(SB16State *dsp, int val)
+{
+    if (dsp->out_data_len < sizeof(dsp->out_data))
+        dsp->out_data[dsp->out_data_len++] = val;
+}
+
 static void command (SB16State *dsp, uint8_t cmd)
 {
     linfo ("%#x\n", cmd);
@@ -218,6 +228,20 @@ static void command (SB16State *dsp, uint8_t cmd)
             /* IMS uses those when probing for sound devices */
             return;
 
+        case 0x04:
+            dsp->needed_bytes = 1;
+            break;
+
+        case 0x05:
+        case 0x0e:
+            dsp->needed_bytes = 2;
+            break;
+
+        case 0x0f:
+            dsp->needed_bytes = 1;
+            dsp_out_data (dsp, 0);
+            break;
+
         case 0x10:
             dsp->needed_bytes = 1;
             break;
@@ -228,7 +252,7 @@ static void command (SB16State *dsp, uint8_t cmd)
             break;
 
         case 0x20:
-            dsp->out_data[dsp->out_data_len++] = 0xff;
+            dsp_out_data(dsp, 0xff);
             break;
 
         case 0x35:
@@ -269,8 +293,8 @@ static void command (SB16State *dsp, uint8_t cmd)
                 uint8_t d0;
 
                 d0 = 4;
-                if (dsp->fmt_signed) d0 |= 16;
-                if (dsp->fmt_stereo) d0 |= 32;
+                /* if (dsp->fmt_signed) d0 |= 16; */
+                /* if (dsp->fmt_stereo) d0 |= 32; */
                 dma_cmd (cmd == 0x90 ? 0xc4 : 0xc0, d0, -1);
                 cmd = -1;
                 break;
@@ -315,12 +339,20 @@ static void command (SB16State *dsp, uint8_t cmd)
             break;
 
         case 0xe1:
-            dsp->out_data[dsp->out_data_len++] = sb.ver_lo;
-            dsp->out_data[dsp->out_data_len++] = sb.ver_hi;
+            dsp_out_data(dsp, sb.ver_lo);
+            dsp_out_data(dsp, sb.ver_hi);
             return;
 
+        case 0xe3:
+            {
+                int i;
+                for (i = sizeof (e3) - 1; i >= 0; --i)
+                    dsp_out_data (dsp, e3[i]);
+                return;
+            }
+
         case 0xf2:
-            dsp->out_data[dsp->out_data_len++] = 0xaa;
+            dsp_out_data(dsp, 0xaa);
             dsp->mixer_regs[0x82] |= dsp->mixer_regs[0x80];
             pic_set_irq (sb.irq, 1);
             return;
@@ -355,6 +387,11 @@ static void complete (SB16State *dsp)
     }
     else {
         switch (dsp->cmd) {
+        case 0x05:
+        case 0x04:
+        case 0x0e:
+        case 0x0f:
+            break;
 
         case 0x10:
             break;
@@ -398,9 +435,9 @@ static void complete (SB16State *dsp)
             break;
 
         case 0xe0:
-            dsp->out_data_len = 1;
+            dsp->out_data_len = 0;
             linfo ("data = %#x\n", dsp->in_data[0]);
-            dsp->out_data[0] = dsp->in_data[0] ^ 0xff;
+            dsp_out_data(dsp, dsp->in_data[0] ^ 0xff);
             break;
 
         default:
@@ -420,13 +457,15 @@ static IO_WRITE_PROTO (dsp_write)
 
     iport = nport - sb.port;
 
+    ldebug ("write %#x %#x\n", nport, iport);
     switch (iport) {
     case 0x6:
+        control (0);
         if (0 == val)
             dsp->v2x6 = 0;
         else if ((1 == val) && (0 == dsp->v2x6)) {
             dsp->v2x6 = 1;
-            dsp->out_data[dsp->out_data_len++] = 0xaa;
+            dsp_out_data(dsp, 0xaa);
         }
         else
             dsp->v2x6 = ~0;
@@ -472,7 +511,7 @@ static IO_READ_PROTO (dsp_read)
         if (dsp->out_data_len) {
             retval = dsp->out_data[--dsp->out_data_len];
         } else {
-            log("empty output buffer\n");
+            log("empty output buffer");
             goto error;
         }
         break;
@@ -482,7 +521,7 @@ static IO_READ_PROTO (dsp_read)
         break;
 
     case 0xd:                   /* timer interrupt clear */
-        log("timer interrupt clear\n");
+        log("timer interrupt clear");
         goto error;
 
     case 0xe:                   /* data available status | irq 8 ack */
@@ -519,12 +558,15 @@ static IO_READ_PROTO (dsp_read)
 static IO_WRITE_PROTO(mixer_write_indexb)
 {
     SB16State *dsp = opaque;
-    dsp->mixer_nreg = val & 0xff;
+    dsp->mixer_nreg = val;
 }
 
 static IO_WRITE_PROTO(mixer_write_datab)
 {
     SB16State *dsp = opaque;
+
+    if (dsp->mixer_nreg > 0x83)
+        return;
     dsp->mixer_regs[dsp->mixer_nreg] = val;
 }
 
@@ -661,11 +703,12 @@ static int magic_of_irq (int irq)
     case 10:
         return 8;
     default:
-        log ("bad irq %d\n", irq);
+        log ("bad irq %d", irq);
         return 2;
     }
 }
 
+#if 0
 static int irq_of_magic (int magic)
 {
     switch (magic) {
@@ -678,10 +721,11 @@ static int irq_of_magic (int magic)
     case 8:
         return 10;
     default:
-        log ("bad irq magic %d\n", magic);
+        log ("bad irq magic %d", magic);
         return 2;
     }
 }
+#endif
 
 void SB16_init (void)
 {
@@ -690,12 +734,12 @@ void SB16_init (void)
     static const uint8_t dsp_write_ports[] = {0x6, 0xc};
     static const uint8_t dsp_read_ports[] = {0x6, 0xa, 0xc, 0xd, 0xe, 0xf};
 
+    memset(s->mixer_regs, 0xff, sizeof(s->mixer_regs));
+
     s->mixer_regs[0x0e] = ~0;
     s->mixer_regs[0x80] = magic_of_irq (sb.irq);
     s->mixer_regs[0x81] = 0x20 | (sb.dma << 1);
 
-    DEREF (irq_of_magic);
-
     for (i = 0x30; i < 0x48; i++) {
         s->mixer_regs[i] = 0x20;
     }