diff options
| -rw-r--r-- | hw/cs4231a.c | 10 | ||||
| -rw-r--r-- | hw/gus.c | 11 | ||||
| -rw-r--r-- | hw/sb16.c | 8 |
3 files changed, 14 insertions, 15 deletions
diff --git a/hw/cs4231a.c b/hw/cs4231a.c index e16665e196..a7e03a313c 100644 --- a/hw/cs4231a.c +++ b/hw/cs4231a.c @@ -346,7 +346,7 @@ static void cs_reset_voices (CSState *s, uint32_t val) } } -static uint64_t cs_read(void *opaque, target_phys_addr_t addr, unsigned size) +static uint64_t cs_read (void *opaque, target_phys_addr_t addr, unsigned size) { CSState *s = opaque; uint32_t saddr, iaddr, ret; @@ -383,8 +383,8 @@ static uint64_t cs_read(void *opaque, target_phys_addr_t addr, unsigned size) return ret; } -static void cs_write(void *opaque, target_phys_addr_t addr, - uint64_t val64, unsigned size) +static void cs_write (void *opaque, target_phys_addr_t addr, + uint64_t val64, unsigned size) { CSState *s = opaque; uint32_t saddr, iaddr, val; @@ -647,8 +647,8 @@ static int cs4231a_initfn (ISADevice *dev) isa_init_irq (dev, &s->pic, s->irq); - memory_region_init_io(&s->ioports, &cs_ioport_ops, s, "cs4231a", 4); - isa_register_ioport(dev, &s->ioports, s->port); + memory_region_init_io (&s->ioports, &cs_ioport_ops, s, "cs4231a", 4); + isa_register_ioport (dev, &s->ioports, s->port); DMA_register_channel (s->dma, cs_dma_read, s); @@ -234,7 +234,7 @@ static const VMStateDescription vmstate_gus = { static int gus_initfn (ISADevice *dev) { - GUSState *s = DO_UPCAST(GUSState, dev, dev); + GUSState *s = DO_UPCAST (GUSState, dev, dev); struct audsettings as; AUD_register_card ("gus", &s->card); @@ -264,24 +264,23 @@ static int gus_initfn (ISADevice *dev) register_ioport_write (s->port, 1, 1, gus_writeb, s); register_ioport_write (s->port, 1, 2, gus_writew, s); - isa_init_ioport_range(dev, s->port, 2); + isa_init_ioport_range (dev, s->port, 2); register_ioport_read ((s->port + 0x100) & 0xf00, 1, 1, gus_readb, s); register_ioport_read ((s->port + 0x100) & 0xf00, 1, 2, gus_readw, s); - isa_init_ioport_range(dev, (s->port + 0x100) & 0xf00, 2); + isa_init_ioport_range (dev, (s->port + 0x100) & 0xf00, 2); register_ioport_write (s->port + 6, 10, 1, gus_writeb, s); register_ioport_write (s->port + 6, 10, 2, gus_writew, s); register_ioport_read (s->port + 6, 10, 1, gus_readb, s); register_ioport_read (s->port + 6, 10, 2, gus_readw, s); - isa_init_ioport_range(dev, s->port + 6, 10); - + isa_init_ioport_range (dev, s->port + 6, 10); register_ioport_write (s->port + 0x100, 8, 1, gus_writeb, s); register_ioport_write (s->port + 0x100, 8, 2, gus_writew, s); register_ioport_read (s->port + 0x100, 8, 1, gus_readb, s); register_ioport_read (s->port + 0x100, 8, 2, gus_readw, s); - isa_init_ioport_range(dev, s->port + 0x100, 8); + isa_init_ioport_range (dev, s->port + 0x100, 8); DMA_register_channel (s->emu.gusdma, GUS_read_DMA, s); s->emu.himemaddr = s->himem; @@ -1368,20 +1368,20 @@ static int sb16_initfn (ISADevice *dev) for (i = 0; i < ARRAY_SIZE (dsp_write_ports); i++) { register_ioport_write (s->port + dsp_write_ports[i], 1, 1, dsp_write, s); - isa_init_ioport(dev, s->port + dsp_write_ports[i]); + isa_init_ioport (dev, s->port + dsp_write_ports[i]); } for (i = 0; i < ARRAY_SIZE (dsp_read_ports); i++) { register_ioport_read (s->port + dsp_read_ports[i], 1, 1, dsp_read, s); - isa_init_ioport(dev, s->port + dsp_read_ports[i]); + isa_init_ioport (dev, s->port + dsp_read_ports[i]); } register_ioport_write (s->port + 0x4, 1, 1, mixer_write_indexb, s); register_ioport_write (s->port + 0x4, 1, 2, mixer_write_indexw, s); - isa_init_ioport(dev, s->port + 0x4); + isa_init_ioport (dev, s->port + 0x4); register_ioport_read (s->port + 0x5, 1, 1, mixer_read, s); register_ioport_write (s->port + 0x5, 1, 1, mixer_write_datab, s); - isa_init_ioport(dev, s->port + 0x5); + isa_init_ioport (dev, s->port + 0x5); DMA_register_channel (s->hdma, SB_read_DMA, s); DMA_register_channel (s->dma, SB_read_DMA, s); |