ne2000: pass device to ne2000_setup_io, use it as owner
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
42e038fe91
commit
dcb117bfda
|
@ -72,7 +72,7 @@ static void isa_ne2000_realizefn(DeviceState *dev, Error **errp)
|
||||||
ISANE2000State *isa = ISA_NE2000(dev);
|
ISANE2000State *isa = ISA_NE2000(dev);
|
||||||
NE2000State *s = &isa->ne2000;
|
NE2000State *s = &isa->ne2000;
|
||||||
|
|
||||||
ne2000_setup_io(s, 0x20);
|
ne2000_setup_io(s, DEVICE(isadev), 0x20);
|
||||||
isa_register_ioport(isadev, &s->io, isa->iobase);
|
isa_register_ioport(isadev, &s->io, isa->iobase);
|
||||||
|
|
||||||
isa_init_irq(isadev, &s->irq, isa->isairq);
|
isa_init_irq(isadev, &s->irq, isa->isairq);
|
||||||
|
|
|
@ -699,9 +699,9 @@ static const MemoryRegionOps ne2000_ops = {
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
/* PCI NE2000 definitions */
|
/* PCI NE2000 definitions */
|
||||||
|
|
||||||
void ne2000_setup_io(NE2000State *s, unsigned size)
|
void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size)
|
||||||
{
|
{
|
||||||
memory_region_init_io(&s->io, NULL, &ne2000_ops, s, "ne2000", size);
|
memory_region_init_io(&s->io, OBJECT(dev), &ne2000_ops, s, "ne2000", size);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ne2000_cleanup(NetClientState *nc)
|
static void ne2000_cleanup(NetClientState *nc)
|
||||||
|
@ -729,7 +729,7 @@ static int pci_ne2000_init(PCIDevice *pci_dev)
|
||||||
pci_conf[PCI_INTERRUPT_PIN] = 1; /* interrupt pin A */
|
pci_conf[PCI_INTERRUPT_PIN] = 1; /* interrupt pin A */
|
||||||
|
|
||||||
s = &d->ne2000;
|
s = &d->ne2000;
|
||||||
ne2000_setup_io(s, 0x100);
|
ne2000_setup_io(s, DEVICE(pci_dev), 0x100);
|
||||||
pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io);
|
pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io);
|
||||||
s->irq = d->dev.irq[0];
|
s->irq = d->dev.irq[0];
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ typedef struct NE2000State {
|
||||||
uint8_t mem[NE2000_MEM_SIZE];
|
uint8_t mem[NE2000_MEM_SIZE];
|
||||||
} NE2000State;
|
} NE2000State;
|
||||||
|
|
||||||
void ne2000_setup_io(NE2000State *s, unsigned size);
|
void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size);
|
||||||
extern const VMStateDescription vmstate_ne2000;
|
extern const VMStateDescription vmstate_ne2000;
|
||||||
void ne2000_reset(NE2000State *s);
|
void ne2000_reset(NE2000State *s);
|
||||||
int ne2000_can_receive(NetClientState *nc);
|
int ne2000_can_receive(NetClientState *nc);
|
||||||
|
|
Loading…
Reference in a new issue