diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-27 16:36:10 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-27 16:36:10 +0000 |
| commit | 70c0de96a3ed38d9e9a67bddea0f35a871aac095 (patch) | |
| tree | f744654ac2d82ab4ba9f9ab7a3aabce4892f771c /hw/pcnet.c | |
| parent | 2bc1abb7cd9b1f9a275f57221e76a2cd52ce6168 (diff) | |
| download | qemu-70c0de96a3ed38d9e9a67bddea0f35a871aac095.tar.gz qemu-70c0de96a3ed38d9e9a67bddea0f35a871aac095.tar.bz2 qemu-70c0de96a3ed38d9e9a67bddea0f35a871aac095.zip | |
Use qemu_irqs between dma controllers and esp, lance
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2873 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pcnet.c')
| -rw-r--r-- | hw/pcnet.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/pcnet.c b/hw/pcnet.c index 4c4278ffa3..9c4dd06cf5 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -2018,7 +2018,7 @@ static CPUWriteMemoryFunc *lance_mem_write[3] = { (CPUWriteMemoryFunc *)&pcnet_ioport_writew, }; -void *lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, +void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, qemu_irq irq) { PCNetState *d; @@ -2026,7 +2026,7 @@ void *lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, d = qemu_mallocz(sizeof(PCNetState)); if (!d) - return NULL; + return; lance_io_memory = cpu_register_io_memory(0, lance_mem_read, lance_mem_write, d); @@ -2041,7 +2041,5 @@ void *lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, d->phys_mem_write = ledma_memory_write; pcnet_common_init(d, nd, "lance"); - - return d; } #endif /* TARGET_SPARC */ |