No trace of IO_READ_PROTO and IO_WRITE_PROTO in the patch. Did you mean to send this patch with this subject?
Nutan Shinde <nutanshinde1...@gmail.com> writes: > Signed-off-by: Nutan Shinde <nutanshinde1...@gmail.com> > --- > hw/audio/adlib.c | 28 +++++++++++------------ > hw/audio/es1370.c | 60 +++++++++++++++++++++++++------------------------- > hw/audio/gus.c | 26 +++++++++++----------- > hw/audio/sb16.c | 66 > +++++++++++++++++++++++++++---------------------------- > 4 files changed, 90 insertions(+), 90 deletions(-) > > diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c > index af39920..966c590 100644 > --- a/hw/audio/adlib.c > +++ b/hw/audio/adlib.c > @@ -50,7 +50,7 @@ > > #ifdef HAS_YMF262 > #include "ymf262.h" > -void YMF262UpdateOneQEMU (int which, INT16 *dst, int length); > +void YMF262UpdateOneQEMU(int which, INT16 *dst, int length); > #define SHIFT 2 > #else > #include "fmopl.h" > @@ -86,7 +86,7 @@ typedef struct { > > static AdlibState *glob_adlib; > > -static void adlib_stop_opl_timer (AdlibState *s, size_t n) > +static void adlib_stop_opl_timer(AdlibState *s, size_t n) > { > #ifdef HAS_YMF262 > YMF262TimerOver (0, n); > @@ -96,7 +96,7 @@ static void adlib_stop_opl_timer (AdlibState *s, size_t n) > s->ticking[n] = 0; > } > > -static void adlib_kill_timers (AdlibState *s) > +static void adlib_kill_timers(AdlibState *s) > { > size_t i; > > @@ -119,7 +119,7 @@ static void adlib_kill_timers (AdlibState *s) > } > } > > -static void adlib_write (void *opaque, uint32_t nport, uint32_t val) > +static void adlib_write(void *opaque, uint32_t nport, uint32_t val) > { > AdlibState *s = opaque; > int a = nport & 3; > @@ -136,7 +136,7 @@ static void adlib_write (void *opaque, uint32_t nport, > uint32_t val) > #endif > } > > -static uint32_t adlib_read (void *opaque, uint32_t nport) > +static uint32_t adlib_read(void *opaque, uint32_t nport) > { > AdlibState *s = opaque; > uint8_t data; > @@ -152,7 +152,7 @@ static uint32_t adlib_read (void *opaque, uint32_t nport) > return data; > } > > -static void timer_handler (int c, double interval_Sec) > +static void timer_handler(int c, double interval_Sec) > { > AdlibState *s = glob_adlib; > unsigned n = c & 1; > @@ -177,7 +177,7 @@ static void timer_handler (int c, double interval_Sec) > AUD_init_time_stamp_out (s->voice, &s->ats); > } > > -static int write_audio (AdlibState *s, int samples) > +static int write_audio(AdlibState *s, int samples) > { > int net = 0; > int pos = s->pos; > @@ -208,7 +208,7 @@ static int write_audio (AdlibState *s, int samples) > return net; > } > > -static void adlib_callback (void *opaque, int free) > +static void adlib_callback(void *opaque, int free) > { > AdlibState *s = opaque; > int samples, net = 0, to_play, written; > @@ -259,7 +259,7 @@ static void adlib_callback (void *opaque, int free) > } > } > > -static void Adlib_fini (AdlibState *s) > +static void Adlib_fini(AdlibState *s) > { > #ifdef HAS_YMF262 > YMF262Shutdown (); > @@ -284,7 +284,7 @@ static MemoryRegionPortio adlib_portio_list[] = { > PORTIO_END_OF_LIST(), > }; > > -static void adlib_realizefn (DeviceState *dev, Error **errp) > +static void adlib_realizefn(DeviceState *dev, Error **errp) > { > AdlibState *s = ADLIB(dev); > struct audsettings as; > @@ -337,7 +337,7 @@ static void adlib_realizefn (DeviceState *dev, Error > **errp) > return; > } > > - s->samples = AUD_get_buffer_size_out (s->voice) >> SHIFT; > + s->samples = AUD_get_buffer_size_out(s->voice) >> SHIFT; > s->mixbuf = g_malloc0 (s->samples << SHIFT); > > adlib_portio_list[0].offset = s->port; > @@ -352,7 +352,7 @@ static Property adlib_properties[] = { > DEFINE_PROP_END_OF_LIST (), > }; > > -static void adlib_class_initfn (ObjectClass *klass, void *data) > +static void adlib_class_initfn(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS (klass); > > @@ -369,13 +369,13 @@ static const TypeInfo adlib_info = { > .class_init = adlib_class_initfn, > }; > > -static int Adlib_init (ISABus *bus) > +static int Adlib_init(ISABus *bus) > { > isa_create_simple (bus, TYPE_ADLIB); > return 0; > } > > -static void adlib_register_types (void) > +static void adlib_register_types(void) > { > type_register_static (&adlib_info); > isa_register_soundhw("adlib", ADLIB_DESC, Adlib_init); > diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c > index dfb7c79..edb4864 100644 > --- a/hw/audio/es1370.c > +++ b/hw/audio/es1370.c > @@ -157,15 +157,15 @@ static const unsigned dac1_samplerate[] = { 5512, > 11025, 22050, 44100 }; > #define DAC2_CHANNEL 1 > #define ADC_CHANNEL 2 > > -static void es1370_dac1_callback (void *opaque, int free); > -static void es1370_dac2_callback (void *opaque, int free); > -static void es1370_adc_callback (void *opaque, int avail); > +static void es1370_dac1_callback(void *opaque, int free); > +static void es1370_dac2_callback(void *opaque, int free); > +static void es1370_adc_callback(void *opaque, int avail); > > #ifdef DEBUG_ES1370 > > #define ldebug(...) AUD_log ("es1370", __VA_ARGS__) > > -static void print_ctl (uint32_t val) > +static void print_ctl(uint32_t val) > { > char buf[1024]; > > @@ -196,7 +196,7 @@ static void print_ctl (uint32_t val) > buf); > } > > -static void print_sctl (uint32_t val) > +static void print_sctl(uint32_t val) > { > static const char *fmt_names[] = {"8M", "8S", "16M", "16S"}; > char buf[1024]; > @@ -284,13 +284,13 @@ struct chan_bits { > uint32_t sctl_fmt; > uint32_t sctl_sh_fmt; > uint32_t sctl_loopsel; > - void (*calc_freq) (ES1370State *s, uint32_t ctl, > + void (*calc_freq)(ES1370State *s, uint32_t ctl, > uint32_t *old_freq, uint32_t *new_freq); > }; > > -static void es1370_dac1_calc_freq (ES1370State *s, uint32_t ctl, > +static void es1370_dac1_calc_freq(ES1370State *s, uint32_t ctl, > uint32_t *old_freq, uint32_t *new_freq); > -static void es1370_dac2_and_adc_calc_freq (ES1370State *s, uint32_t ctl, > +static void es1370_dac2_and_adc_calc_freq(ES1370State *s, uint32_t ctl, > uint32_t *old_freq, > uint32_t *new_freq); > > @@ -308,7 +308,7 @@ static const struct chan_bits es1370_chan_bits[] = { > es1370_dac2_and_adc_calc_freq} > }; > > -static void es1370_update_status (ES1370State *s, uint32_t new_status) > +static void es1370_update_status(ES1370State *s, uint32_t new_status) > { > uint32_t level = new_status & (STAT_DAC1 | STAT_DAC2 | STAT_ADC); > > @@ -347,7 +347,7 @@ static void es1370_reset (ES1370State *s) > pci_irq_deassert(&s->dev); > } > > -static void es1370_maybe_lower_irq (ES1370State *s, uint32_t sctl) > +static void es1370_maybe_lower_irq(ES1370State *s, uint32_t sctl) > { > uint32_t new_status = s->status; > > @@ -368,7 +368,7 @@ static void es1370_maybe_lower_irq (ES1370State *s, > uint32_t sctl) > } > } > > -static void es1370_dac1_calc_freq (ES1370State *s, uint32_t ctl, > +static void es1370_dac1_calc_freq(ES1370State *s, uint32_t ctl, > uint32_t *old_freq, uint32_t *new_freq) > > { > @@ -376,7 +376,7 @@ static void es1370_dac1_calc_freq (ES1370State *s, > uint32_t ctl, > *new_freq = dac1_samplerate[(ctl & CTRL_WTSRSEL) >> CTRL_SH_WTSRSEL]; > } > > -static void es1370_dac2_and_adc_calc_freq (ES1370State *s, uint32_t ctl, > +static void es1370_dac2_and_adc_calc_freq(ES1370State *s, uint32_t ctl, > uint32_t *old_freq, > uint32_t *new_freq) > > @@ -389,7 +389,7 @@ static void es1370_dac2_and_adc_calc_freq (ES1370State > *s, uint32_t ctl, > *old_freq = DAC2_DIVTOSR (old_pclkdiv); > } > > -static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t > sctl) > +static void es1370_update_voices(ES1370State *s, uint32_t ctl, uint32_t sctl) > { > size_t i; > uint32_t old_freq, new_freq, old_fmt, new_fmt; > @@ -461,7 +461,7 @@ static void es1370_update_voices (ES1370State *s, > uint32_t ctl, uint32_t sctl) > s->sctl = sctl; > } > > -static inline uint32_t es1370_fixup (ES1370State *s, uint32_t addr) > +static inline uint32_t es1370_fixup(ES1370State *s, uint32_t addr) > { > addr &= 0xff; > if (addr >= 0x30 && addr <= 0x3f) > @@ -469,7 +469,7 @@ static inline uint32_t es1370_fixup (ES1370State *s, > uint32_t addr) > return addr; > } > > -static void es1370_writeb (void *opaque, uint32_t addr, uint32_t val) > +static void es1370_writeb(void *opaque, uint32_t addr, uint32_t val) > { > ES1370State *s = opaque; > uint32_t shift, mask; > @@ -507,7 +507,7 @@ static void es1370_writeb (void *opaque, uint32_t addr, > uint32_t val) > } > } > > -static void es1370_writew (void *opaque, uint32_t addr, uint32_t val) > +static void es1370_writew(void *opaque, uint32_t addr, uint32_t val) > { > ES1370State *s = opaque; > addr = es1370_fixup (s, addr); > @@ -544,7 +544,7 @@ static void es1370_writew (void *opaque, uint32_t addr, > uint32_t val) > } > } > > -static void es1370_writel (void *opaque, uint32_t addr, uint32_t val) > +static void es1370_writel(void *opaque, uint32_t addr, uint32_t val) > { > ES1370State *s = opaque; > struct chan *d = &s->chan[0]; > @@ -610,7 +610,7 @@ static void es1370_writel (void *opaque, uint32_t addr, > uint32_t val) > } > } > > -static uint32_t es1370_readb (void *opaque, uint32_t addr) > +static uint32_t es1370_readb(void *opaque, uint32_t addr) > { > ES1370State *s = opaque; > uint32_t val; > @@ -645,7 +645,7 @@ static uint32_t es1370_readb (void *opaque, uint32_t addr) > return val; > } > > -static uint32_t es1370_readw (void *opaque, uint32_t addr) > +static uint32_t es1370_readw(void *opaque, uint32_t addr) > { > ES1370State *s = opaque; > struct chan *d = &s->chan[0]; > @@ -687,7 +687,7 @@ static uint32_t es1370_readw (void *opaque, uint32_t addr) > return val; > } > > -static uint32_t es1370_readl (void *opaque, uint32_t addr) > +static uint32_t es1370_readl(void *opaque, uint32_t addr) > { > ES1370State *s = opaque; > uint32_t val; > @@ -773,7 +773,7 @@ static uint32_t es1370_readl (void *opaque, uint32_t addr) > return val; > } > > -static void es1370_transfer_audio (ES1370State *s, struct chan *d, int > loop_sel, > +static void es1370_transfer_audio(ES1370State *s, struct chan *d, int > loop_sel, > int max, int *irq) > { > uint8_t tmpbuf[4096]; > @@ -852,7 +852,7 @@ static void es1370_transfer_audio (ES1370State *s, struct > chan *d, int loop_sel, > d->leftover = (transferred + d->leftover) & 3; > } > > -static void es1370_run_channel (ES1370State *s, size_t chan, int > free_or_avail) > +static void es1370_run_channel(ES1370State *s, size_t chan, int > free_or_avail) > { > uint32_t new_status = s->status; > int max_bytes, irq; > @@ -882,21 +882,21 @@ static void es1370_run_channel (ES1370State *s, size_t > chan, int free_or_avail) > } > } > > -static void es1370_dac1_callback (void *opaque, int free) > +static void es1370_dac1_callback(void *opaque, int free) > { > ES1370State *s = opaque; > > es1370_run_channel (s, DAC1_CHANNEL, free); > } > > -static void es1370_dac2_callback (void *opaque, int free) > +static void es1370_dac2_callback(void *opaque, int free) > { > ES1370State *s = opaque; > > es1370_run_channel (s, DAC2_CHANNEL, free); > } > > -static void es1370_adc_callback (void *opaque, int avail) > +static void es1370_adc_callback(void *opaque, int avail) > { > ES1370State *s = opaque; > > @@ -958,7 +958,7 @@ static const VMStateDescription vmstate_es1370_channel = { > } > }; > > -static int es1370_post_load (void *opaque, int version_id) > +static int es1370_post_load(void *opaque, int version_id) > { > uint32_t ctl, sctl; > ES1370State *s = opaque; > @@ -1005,7 +1005,7 @@ static const VMStateDescription vmstate_es1370 = { > } > }; > > -static void es1370_on_reset (void *opaque) > +static void es1370_on_reset(void *opaque) > { > ES1370State *s = opaque; > es1370_reset (s); > @@ -1042,7 +1042,7 @@ static int es1370_init (PCIBus *bus) > return 0; > } > > -static void es1370_class_init (ObjectClass *klass, void *data) > +static void es1370_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS (klass); > PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); > @@ -1065,11 +1065,11 @@ static const TypeInfo es1370_info = { > .class_init = es1370_class_init, > }; > > -static void es1370_register_types (void) > +static void es1370_register_types(void) > { > type_register_static (&es1370_info); > pci_register_soundhw("es1370", "ENSONIQ AudioPCI ES1370", es1370_init); > } > > -type_init (es1370_register_types) > +type_init(es1370_register_types) > > diff --git a/hw/audio/gus.c b/hw/audio/gus.c > index 6ea1e09..5ec7580 100644 > --- a/hw/audio/gus.c > +++ b/hw/audio/gus.c > @@ -59,21 +59,21 @@ typedef struct GUSState { > qemu_irq pic; > } GUSState; > > -static uint32_t gus_readb (void *opaque, uint32_t nport) > +static uint32_t gus_readb(void *opaque, uint32_t nport) > { > GUSState *s = opaque; > > return gus_read (&s->emu, nport, 1); > } > > -static void gus_writeb (void *opaque, uint32_t nport, uint32_t val) > +static void gus_writeb(void *opaque, uint32_t nport, uint32_t val) > { > GUSState *s = opaque; > > gus_write (&s->emu, nport, 1, val); > } > > -static int write_audio (GUSState *s, int samples) > +static int write_audio(GUSState *s, int samples) > { > int net = 0; > int pos = s->pos; > @@ -104,7 +104,7 @@ static int write_audio (GUSState *s, int samples) > return net; > } > > -static void GUS_callback (void *opaque, int free) > +static void GUS_callback(void *opaque, int free) > { > int samples, to_play, net = 0; > GUSState *s = opaque; > @@ -144,7 +144,7 @@ static void GUS_callback (void *opaque, int free) > gus_irqgen (&s->emu, muldiv64 (net, 1000000, s->freq)); > } > > -int GUS_irqrequest (GUSEmuState *emu, int hwirq, int n) > +int GUS_irqrequest(GUSEmuState *emu, int hwirq, int n) > { > GUSState *s = emu->opaque; > /* qemu_irq_lower (s->pic); */ > @@ -154,7 +154,7 @@ int GUS_irqrequest (GUSEmuState *emu, int hwirq, int n) > return n; > } > > -void GUS_irqclear (GUSEmuState *emu, int hwirq) > +void GUS_irqclear(GUSEmuState *emu, int hwirq) > { > GUSState *s = emu->opaque; > ldebug ("irqclear %d %d\n", hwirq, s->irqs); > @@ -167,14 +167,14 @@ void GUS_irqclear (GUSEmuState *emu, int hwirq) > #endif > } > > -void GUS_dmarequest (GUSEmuState *der) > +void GUS_dmarequest(GUSEmuState *der) > { > /* GUSState *s = (GUSState *) der; */ > ldebug ("dma request %d\n", der->gusdma); > DMA_hold_DREQ (der->gusdma); > } > > -static int GUS_read_DMA (void *opaque, int nchan, int dma_pos, int dma_len) > +static int GUS_read_DMA(void *opaque, int nchan, int dma_pos, int dma_len) > { > GUSState *s = opaque; > char tmpbuf[4096]; > @@ -227,7 +227,7 @@ static const MemoryRegionPortio gus_portio_list2[] = { > PORTIO_END_OF_LIST (), > }; > > -static void gus_realizefn (DeviceState *dev, Error **errp) > +static void gus_realizefn(DeviceState *dev, Error **errp) > { > ISADevice *d = ISA_DEVICE(dev); > GUSState *s = GUS (dev); > @@ -272,7 +272,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp) > AUD_set_active_out (s->voice, 1); > } > > -static int GUS_init (ISABus *bus) > +static int GUS_init(ISABus *bus) > { > isa_create_simple (bus, TYPE_GUS); > return 0; > @@ -286,7 +286,7 @@ static Property gus_properties[] = { > DEFINE_PROP_END_OF_LIST (), > }; > > -static void gus_class_initfn (ObjectClass *klass, void *data) > +static void gus_class_initfn(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS (klass); > > @@ -304,10 +304,10 @@ static const TypeInfo gus_info = { > .class_init = gus_class_initfn, > }; > > -static void gus_register_types (void) > +static void gus_register_types(void) > { > type_register_static (&gus_info); > isa_register_soundhw("gus", "Gravis Ultrasound GF1", GUS_init); > } > > -type_init (gus_register_types) > +type_init(gus_register_types) > diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c > index 381ef56..d37cf36 100644 > --- a/hw/audio/sb16.c > +++ b/hw/audio/sb16.c > @@ -105,9 +105,9 @@ typedef struct SB16State { > uint8_t mixer_regs[256]; > } SB16State; > > -static void SB_audio_callback (void *opaque, int free); > +static void SB_audio_callback(void *opaque, int free); > > -static int magic_of_irq (int irq) > +static int magic_of_irq(int irq) > { > switch (irq) { > case 5: > @@ -124,7 +124,7 @@ static int magic_of_irq (int irq) > } > } > > -static int irq_of_magic (int magic) > +static int irq_of_magic(int magic) > { > switch (magic) { > case 1: > @@ -142,7 +142,7 @@ static int irq_of_magic (int magic) > } > > #if 0 > -static void log_dsp (SB16State *dsp) > +static void log_dsp(SB16State *dsp) > { > ldebug ("%s:%s:%d:%s:dmasize=%d:freq=%d:const=%d:speaker=%d\n", > dsp->fmt_stereo ? "Stereo" : "Mono", > @@ -156,13 +156,13 @@ static void log_dsp (SB16State *dsp) > } > #endif > > -static void speaker (SB16State *s, int on) > +static void speaker(SB16State *s, int on) > { > s->speaker = on; > /* AUD_enable (s->voice, on); */ > } > > -static void control (SB16State *s, int hold) > +static void control(SB16State *s, int hold) > { > int dma = s->use_hdma ? s->hdma : s->dma; > s->dma_running = hold; > @@ -179,7 +179,7 @@ static void control (SB16State *s, int hold) > } > } > > -static void aux_timer (void *opaque) > +static void aux_timer(void *opaque) > { > SB16State *s = opaque; > s->can_write = 1; > @@ -189,7 +189,7 @@ static void aux_timer (void *opaque) > #define DMA8_AUTO 1 > #define DMA8_HIGH 2 > > -static void continue_dma8 (SB16State *s) > +static void continue_dma8(SB16State *s) > { > if (s->freq > 0) { > struct audsettings as; > @@ -214,7 +214,7 @@ static void continue_dma8 (SB16State *s) > control (s, 1); > } > > -static void dma_cmd8 (SB16State *s, int mask, int dma_len) > +static void dma_cmd8(SB16State *s, int mask, int dma_len) > { > s->fmt = AUD_FMT_U8; > s->use_hdma = 0; > @@ -265,7 +265,7 @@ static void dma_cmd8 (SB16State *s, int mask, int dma_len) > speaker (s, 1); > } > > -static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t d0, int dma_len) > +static void dma_cmd(SB16State *s, uint8_t cmd, uint8_t d0, int dma_len) > { > s->use_hdma = cmd < 0xc0; > s->fifo = (cmd >> 1) & 1; > @@ -360,7 +360,7 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t > d0, int dma_len) > speaker (s, 1); > } > > -static inline void dsp_out_data (SB16State *s, uint8_t val) > +static inline void dsp_out_data(SB16State *s, uint8_t val) > { > ldebug ("outdata %#x\n", val); > if ((size_t) s->out_data_len < sizeof (s->out_data)) { > @@ -368,7 +368,7 @@ static inline void dsp_out_data (SB16State *s, uint8_t > val) > } > } > > -static inline uint8_t dsp_get_data (SB16State *s) > +static inline uint8_t dsp_get_data(SB16State *s) > { > if (s->in_index) { > return s->in2_data[--s->in_index]; > @@ -379,7 +379,7 @@ static inline uint8_t dsp_get_data (SB16State *s) > } > } > > -static void command (SB16State *s, uint8_t cmd) > +static void command(SB16State *s, uint8_t cmd) > { > ldebug ("command %#x\n", cmd); > > @@ -632,21 +632,21 @@ static void command (SB16State *s, uint8_t cmd) > > } > > -static uint16_t dsp_get_lohi (SB16State *s) > +static uint16_t dsp_get_lohi(SB16State *s) > { > uint8_t hi = dsp_get_data (s); > uint8_t lo = dsp_get_data (s); > return (hi << 8) | lo; > } > > -static uint16_t dsp_get_hilo (SB16State *s) > +static uint16_t dsp_get_hilo(SB16State *s) > { > uint8_t lo = dsp_get_data (s); > uint8_t hi = dsp_get_data (s); > return (hi << 8) | lo; > } > > -static void complete (SB16State *s) > +static void complete(SB16State *s) > { > int d0, d1, d2; > ldebug ("complete command %#x, in_index %d, needed_bytes %d\n", > @@ -823,7 +823,7 @@ static void complete (SB16State *s) > s->cmd = -1; > } > > -static void legacy_reset (SB16State *s) > +static void legacy_reset(SB16State *s) > { > struct audsettings as; > > @@ -850,7 +850,7 @@ static void legacy_reset (SB16State *s) > /* AUD_set_active_out (s->voice, 1); */ > } > > -static void reset (SB16State *s) > +static void reset(SB16State *s) > { > qemu_irq_lower (s->pic); > if (s->dma_auto) { > @@ -876,7 +876,7 @@ static void reset (SB16State *s) > legacy_reset (s); > } > > -static void dsp_write (void *opaque, uint32_t nport, uint32_t val) > +static void dsp_write(void *opaque, uint32_t nport, uint32_t val) > { > SB16State *s = opaque; > int iport; > @@ -954,7 +954,7 @@ static void dsp_write (void *opaque, uint32_t nport, > uint32_t val) > } > } > > -static uint32_t dsp_read (void *opaque, uint32_t nport) > +static uint32_t dsp_read(void *opaque, uint32_t nport) > { > SB16State *s = opaque; > int iport, retval, ack = 0; > @@ -1023,7 +1023,7 @@ static uint32_t dsp_read (void *opaque, uint32_t nport) > return 0xff; > } > > -static void reset_mixer (SB16State *s) > +static void reset_mixer(SB16State *s) > { > int i; > > @@ -1053,14 +1053,14 @@ static void reset_mixer (SB16State *s) > } > } > > -static void mixer_write_indexb (void *opaque, uint32_t nport, uint32_t val) > +static void mixer_write_indexb(void *opaque, uint32_t nport, uint32_t val) > { > SB16State *s = opaque; > (void) nport; > s->mixer_nreg = val; > } > > -static void mixer_write_datab (void *opaque, uint32_t nport, uint32_t val) > +static void mixer_write_datab(void *opaque, uint32_t nport, uint32_t val) > { > SB16State *s = opaque; > > @@ -1116,7 +1116,7 @@ static void mixer_write_datab (void *opaque, uint32_t > nport, uint32_t val) > s->mixer_regs[s->mixer_nreg] = val; > } > > -static uint32_t mixer_read (void *opaque, uint32_t nport) > +static uint32_t mixer_read(void *opaque, uint32_t nport) > { > SB16State *s = opaque; > > @@ -1133,7 +1133,7 @@ static uint32_t mixer_read (void *opaque, uint32_t > nport) > return s->mixer_regs[s->mixer_nreg]; > } > > -static int write_audio (SB16State *s, int nchan, int dma_pos, > +static int write_audio(SB16State *s, int nchan, int dma_pos, > int dma_len, int len) > { > int temp, net; > @@ -1167,7 +1167,7 @@ static int write_audio (SB16State *s, int nchan, int > dma_pos, > return net; > } > > -static int SB_read_DMA (void *opaque, int nchan, int dma_pos, int dma_len) > +static int SB_read_DMA(void *opaque, int nchan, int dma_pos, int dma_len) > { > SB16State *s = opaque; > int till, copy, written, free; > @@ -1232,13 +1232,13 @@ static int SB_read_DMA (void *opaque, int nchan, int > dma_pos, int dma_len) > return dma_pos; > } > > -static void SB_audio_callback (void *opaque, int free) > +static void SB_audio_callback(void *opaque, int free) > { > SB16State *s = opaque; > s->audio_free = free; > } > > -static int sb16_post_load (void *opaque, int version_id) > +static int sb16_post_load(void *opaque, int version_id) > { > SB16State *s = opaque; > > @@ -1343,14 +1343,14 @@ static const MemoryRegionPortio sb16_ioport_list[] = { > }; > > > -static void sb16_initfn (Object *obj) > +static void sb16_initfn(Object *obj) > { > SB16State *s = SB16 (obj); > > s->cmd = -1; > } > > -static void sb16_realizefn (DeviceState *dev, Error **errp) > +static void sb16_realizefn(DeviceState *dev, Error **errp) > { > ISADevice *isadev = ISA_DEVICE (dev); > SB16State *s = SB16 (dev); > @@ -1394,7 +1394,7 @@ static Property sb16_properties[] = { > DEFINE_PROP_END_OF_LIST (), > }; > > -static void sb16_class_initfn (ObjectClass *klass, void *data) > +static void sb16_class_initfn(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS (klass); > > @@ -1413,10 +1413,10 @@ static const TypeInfo sb16_info = { > .class_init = sb16_class_initfn, > }; > > -static void sb16_register_types (void) > +static void sb16_register_types(void) > { > type_register_static (&sb16_info); > isa_register_soundhw("sb16", "Creative Sound Blaster 16", SB16_init); > } > > -type_init (sb16_register_types) > +type_init(sb16_register_types)