Patchwork [04/20] sb16: remove IO_WRITE_PROTO

login
register
mail settings
Submitter Juan Quintela
Date Oct. 22, 2009, 2:36 p.m.
Message ID <8705124945b3d74f662bc7074e0e3c8cb0803595.1256221008.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/36676/
State New
Headers show

Comments

Juan Quintela - Oct. 22, 2009, 2:36 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/sb16.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
malc - Oct. 22, 2009, 8:32 p.m.
On Thu, 22 Oct 2009, Juan Quintela wrote:

No.

[..snip..]

Patch

diff --git a/hw/sb16.c b/hw/sb16.c
index f4f96d1..e461970 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -40,9 +40,6 @@ 
 #define ldebug(...)
 #endif

-#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.";

 typedef struct SB16State {
@@ -874,7 +871,7 @@  static void reset (SB16State *s)
     legacy_reset (s);
 }

-static IO_WRITE_PROTO (dsp_write)
+static void dsp_write (void *opaque, uint32_t nport, uint32_t val)
 {
     SB16State *s = opaque;
     int iport;
@@ -1058,14 +1055,14 @@  static void reset_mixer (SB16State *s)
     }
 }

-static IO_WRITE_PROTO (mixer_write_indexb)
+static void mixer_write_indexb (void *opaque, uint32_t nport, uint32_t val)
 {
     SB16State *s = opaque;
     (void) nport;
     s->mixer_nreg = val;
 }

-static IO_WRITE_PROTO (mixer_write_datab)
+static void mixer_write_datab (void *opaque, uint32_t nport, uint32_t val)
 {
     SB16State *s = opaque;

@@ -1121,7 +1118,7 @@  static IO_WRITE_PROTO (mixer_write_datab)
     s->mixer_regs[s->mixer_nreg] = val;
 }

-static IO_WRITE_PROTO (mixer_write_indexw)
+static void mixer_write_indexw (void *opaque, uint32_t nport, uint32_t val)
 {
     mixer_write_indexb (opaque, nport, val & 0xff);
     mixer_write_datab (opaque, nport, (val >> 8) & 0xff);