Changeset 71745 in vbox for trunk/src/VBox/Devices/Audio/DevSB16.cpp

Timestamp:

Apr 7, 2018 10:40:33 PM (7 years ago)

Author:

vboxsync

Message:

DevSB16: mixer_write_datab & mixer_write_indexb are works for I/O port callbacks and doesn't need the elaborate parameter list and declaration.

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -1546 +1546 @@
 }
 
-static IO_WRITE_PROTO(mixer_write_indexb)
-{
-    RT_NOREF(pDevIns, cb);
-    PSB16STATE pThis = (PSB16STATE)opaque;
-    (void) nport;
+static int mixer_write_indexb(PSB16STATE pThis, uint32_t val)
+{
     pThis->mixer_nreg = val;
-
     return VINF_SUCCESS;
 }
@@ -1594 +1590 @@
 }
 
-static IO_WRITE_PROTO(mixer_write_datab)
-{
-    RT_NOREF(pDevIns, cb);
-    PSB16STATE  pThis = (PSB16STATE)opaque;
+
+static int mixer_write_datab(PSB16STATE pThis, uint8_t val)
+{
     bool        fUpdateMaster = false;
     bool        fUpdateStream = false;
 
-    (void) nport;
     LogFlowFunc(("mixer_write [%#x] <- %#x\n", pThis->mixer_nreg, val));
 
@@ -1728 +1722 @@
 static IO_WRITE_PROTO(mixer_write)
 {
+    RT_NOREF(pDevIns);
     PSB16STATE pThis = (PSB16STATE)opaque;
     int iport = nport - pThis->port;
@@ -1736 +1731 @@
             {
                 case 4:
-                    mixer_write_indexb (pDevIns, opaque, nport, val, 1);
+                    mixer_write_indexb(pThis, val);
                     break;
                 case 5:
-                    mixer_write_datab (pDevIns, opaque, nport, val, 1);
+                    mixer_write_datab(pThis, val);
                     break;
             }
             break;
         case 2:
-            mixer_write_indexb (pDevIns, opaque, nport, val & 0xff, 1);
-            mixer_write_datab (pDevIns, opaque, nport, (val >> 8) & 0xff, 1);
+            mixer_write_indexb(pThis, val & 0xff);
+            mixer_write_datab(pThis, (val >> 8) & 0xff);
             break;
         default:
@@ -2582 +2577 @@
         AssertMsgFailedReturn(("Error creating IRQ timer, rc=%Rrc\n", rc), rc);
 
-    rc = PDMDevHlpIOPortRegister(pDevIns, pThis->port + 0x04,  2, pThis,
-                                 mixer_write, mixer_read, NULL, NULL, "SB16");
+    rc = PDMDevHlpIOPortRegister(pDevIns, pThis->port + 0x04,  2, pThis, mixer_write, mixer_read, NULL, NULL, "SB16");
     if (RT_FAILURE(rc))
         return rc;
-    rc = PDMDevHlpIOPortRegister(pDevIns, pThis->port + 0x06, 10, pThis,
-                                 dsp_write, dsp_read, NULL, NULL, "SB16");
+    rc = PDMDevHlpIOPortRegister(pDevIns, pThis->port + 0x06, 10, pThis, dsp_write,   dsp_read,   NULL, NULL, "SB16");
     if (RT_FAILURE(rc))
         return rc;