diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2009-12-10 15:57:34 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2009-12-23 16:35:00 +0200 |
| commit | 0b5b3547cd4bf906fa7c9d2aabf09c4df17947a0 (patch) | |
| tree | 348f9b02d6ab61a52774853dae9ad7c58652392e /hw | |
| parent | e6c4cfd50327d730e4c0cfd6ece43e7b59224acd (diff) | |
| download | qemu-0b5b3547cd4bf906fa7c9d2aabf09c4df17947a0.tar.gz | |
rtl: switch to symbolic names for pci registers
No functional changes. I verified that the generated binary
does not change.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>
Acked-by: Glauber Costa <glommer@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/rtl8139.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/hw/rtl8139.c b/hw/rtl8139.c index fcdcd1d557..1f4f585900 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3320,16 +3320,20 @@ static int pci_rtl8139_init(PCIDevice *dev) pci_conf = s->dev.config; pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK); pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_8139); - pci_conf[0x04] = 0x05; /* command = I/O space, Bus Master */ - pci_conf[0x08] = RTL8139_PCI_REVID; /* PCI revision ID; >=0x20 is for 8139C+ */ + /* TODO: value should be 0 at RST#. */ + pci_conf[PCI_COMMAND] = PCI_COMMAND_IO | PCI_COMMAND_MASTER; + pci_conf[PCI_REVISION_ID] = RTL8139_PCI_REVID; /* >=0x20 is for 8139C+ */ pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET); - pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; /* header_type */ - pci_conf[0x3d] = 1; /* interrupt pin 0 */ - pci_conf[0x34] = 0xdc; + pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; + /* TODO: value should be 0 at RST# */ + pci_conf[PCI_INTERRUPT_PIN] = 1; /* interrupt pin 0 */ + /* TODO: start of capability list, but no capability + * list bit in status register, and offset 0xdc seems unused. */ + pci_conf[PCI_CAPABILITY_LIST] = 0xdc; /* I/O handler for memory-mapped I/O */ s->rtl8139_mmio_io_addr = - cpu_register_io_memory(rtl8139_mmio_read, rtl8139_mmio_write, s); + cpu_register_io_memory(rtl8139_mmio_read, rtl8139_mmio_write, s); pci_register_bar(&s->dev, 0, 0x100, PCI_BASE_ADDRESS_SPACE_IO, rtl8139_ioport_map); |