Fix formatting, get rid of conf and fix description
This commit is contained in:
parent
41875be5b4
commit
a5e8e46bfb
11
hw/gus.c
11
hw/gus.c
@ -46,13 +46,6 @@
|
||||
#define IO_WRITE_PROTO(name) \
|
||||
static void name (void *opaque, uint32_t nport, uint32_t val)
|
||||
|
||||
static struct {
|
||||
int port;
|
||||
int irq;
|
||||
int dma;
|
||||
int freq;
|
||||
} conf = {0x240, 7, 3, 44100};
|
||||
|
||||
typedef struct GUSState {
|
||||
ISADevice dev;
|
||||
GUSEmuState emu;
|
||||
@ -300,7 +293,7 @@ static int gus_initfn (ISADevice *dev)
|
||||
register_ioport_read (s->port + 0x100, 8, 1, gus_readb, s);
|
||||
register_ioport_read (s->port + 0x100, 8, 2, gus_readw, s);
|
||||
|
||||
DMA_register_channel (conf.dma, GUS_read_DMA, s);
|
||||
DMA_register_channel (s->emu.gusdma, GUS_read_DMA, s);
|
||||
s->emu.himemaddr = s->himem;
|
||||
s->emu.gusdatapos = s->emu.himemaddr + 1024 * 1024 + 32;
|
||||
s->emu.opaque = s;
|
||||
@ -320,7 +313,7 @@ int GUS_init (qemu_irq *pic)
|
||||
|
||||
static ISADeviceInfo gus_info = {
|
||||
.qdev.name = "gus",
|
||||
.qdev.desc = "Creative Sound Blaster 16",
|
||||
.qdev.desc = "Gravis Ultrasound GF1",
|
||||
.qdev.size = sizeof (GUSState),
|
||||
.init = gus_initfn,
|
||||
.qdev.props = (Property[]) {
|
||||
|
Loading…
Reference in New Issue
Block a user