Index: /trunk/src/VBox/Devices/Audio/DevSB16.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 71745)
+++ /trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 71746)
@@ -72,12 +72,4 @@
 #define SB16_SAVE_STATE_VERSION_VBOX_30 1
 
-#define IO_READ_PROTO(name)                                             \
-    DECLCALLBACK(int) name (PPDMDEVINS pDevIns, void *opaque,       \
-                            RTIOPORT nport, uint32_t *pu32, unsigned cb)
-
-#define IO_WRITE_PROTO(name)                                            \
-    DECLCALLBACK(int) name (PPDMDEVINS pDevIns, void *opaque,       \
-                            RTIOPORT nport, uint32_t val, unsigned cb)
-
 
 /*********************************************************************************************************************************
@@ -555,4 +547,7 @@
 }
 
+/**
+ * @callback_method_impl{PFNTMTIMERDEV}
+ */
 static DECLCALLBACK(void) sb16TimerIRQ(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvThis)
 {
@@ -1338,5 +1333,8 @@
 }
 
-static IO_WRITE_PROTO(dsp_write)
+/**
+ * @callback_method_impl{PFNIOMIOPORTOUT}
+ */
+static DECLCALLBACK(int) dsp_write(PPDMDEVINS pDevIns, void *opaque, RTIOPORT nport, uint32_t val, unsigned cb)
 {
     RT_NOREF(pDevIns, cb);
@@ -1435,5 +1433,9 @@
 }
 
-static IO_READ_PROTO(dsp_read)
+
+/**
+ * @callback_method_impl{PFNIOMIOPORTIN}
+ */
+static DECLCALLBACK(int) dsp_read(PPDMDEVINS pDevIns, void *opaque, RTIOPORT nport, uint32_t *pu32, unsigned cb)
 {
     RT_NOREF(pDevIns, cb);
@@ -1720,5 +1722,8 @@
 }
 
-static IO_WRITE_PROTO(mixer_write)
+/**
+ * @callback_method_impl{PFNIOMIOPORTOUT}
+ */
+static DECLCALLBACK(int) mixer_write(PPDMDEVINS pDevIns, void *opaque, RTIOPORT nport, uint32_t val, unsigned cb)
 {
     RT_NOREF(pDevIns);
@@ -1749,5 +1754,8 @@
 }
 
-static IO_READ_PROTO(mixer_read)
+/**
+ * @callback_method_impl{PFNIOMIOPORTIN}
+ */
+static DECLCALLBACK(int) mixer_read(PPDMDEVINS pDevIns, void *opaque, RTIOPORT nport, uint32_t *pu32, unsigned cb)
 {
     RT_NOREF(pDevIns, cb);
@@ -1768,6 +1776,8 @@
 }
 
-static int sb16WriteAudio(PSB16STATE pThis, int nchan, uint32_t dma_pos,
-                          uint32_t dma_len, int len)
+/**
+ * Called by sb16DMARead.
+ */
+static int sb16WriteAudio(PSB16STATE pThis, int nchan, uint32_t dma_pos, uint32_t dma_len, int len)
 {
     uint8_t  tmpbuf[_4K]; /** @todo Have a buffer on the heap. */
@@ -1838,4 +1848,8 @@
 }
 
+/**
+ * @callback_method_impl{FNDMATRANSFERHANDLER,
+ *      Worker callback for both DMA channels.}
+ */
 static DECLCALLBACK(uint32_t) sb16DMARead(PPDMDEVINS pDevIns, void *opaque, unsigned nchan, uint32_t dma_pos, uint32_t dma_len)
 {
@@ -1926,4 +1940,5 @@
 
 #ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
+
 static void sb16TimerMaybeStart(PSB16STATE pThis)
 {
@@ -1980,5 +1995,5 @@
             continue;
 
-#ifdef VBOX_STRICT
+# ifdef VBOX_STRICT
         /*
          * Sanity. Make sure that all streams have the same configuration
@@ -2005,5 +2020,5 @@
             }
         }
-#endif
+# endif
         PPDMIAUDIOCONNECTOR pConn = pDrv->pConnector;
         if (!pConn)
@@ -2066,4 +2081,5 @@
     }
 }
+
 #endif /* !VBOX_WITH_AUDIO_SB16_CALLBACKS */