ne2000_isa: refactor device creation

Turn isa_ne2000_init into an inline function.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2011-02-05 15:39:57 +00:00
parent 7353153891
commit 60a14ad31e
2 changed files with 11 additions and 14 deletions

View File

@ -92,19 +92,6 @@ static int isa_ne2000_initfn(ISADevice *dev)
return 0;
}
void isa_ne2000_init(int base, int irq, NICInfo *nd)
{
ISADevice *dev;
qemu_check_nic_model(nd, "ne2k_isa");
dev = isa_create("ne2k_isa");
qdev_prop_set_uint32(&dev->qdev, "iobase", base);
qdev_prop_set_uint32(&dev->qdev, "irq", irq);
qdev_set_nic_properties(&dev->qdev, nd);
qdev_init_nofail(&dev->qdev);
}
static ISADeviceInfo ne2000_isa_info = {
.qdev.name = "ne2k_isa",
.qdev.size = sizeof(ISANE2000State),

12
hw/pc.h
View File

@ -176,8 +176,18 @@ void pci_cirrus_vga_init(PCIBus *bus);
void isa_cirrus_vga_init(void);
/* ne2000.c */
static inline void isa_ne2000_init(int base, int irq, NICInfo *nd)
{
ISADevice *dev;
void isa_ne2000_init(int base, int irq, NICInfo *nd);
qemu_check_nic_model(nd, "ne2k_isa");
dev = isa_create("ne2k_isa");
qdev_prop_set_uint32(&dev->qdev, "iobase", base);
qdev_prop_set_uint32(&dev->qdev, "irq", irq);
qdev_set_nic_properties(&dev->qdev, nd);
qdev_init_nofail(&dev->qdev);
}
/* e820 types */
#define E820_RAM 1