From d6fd1e660312f96e6b5ca708b07a58df725ca055 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 1 Sep 2009 22:16:10 +0200 Subject: [PATCH] eepro100: Clean code which sets the PCI device id * Use function pci_config_set_device_id * Use new macro PCI_DEVICE_ID_INTEL_82557 Signed-off-by: Stefan Weil Signed-off-by: Anthony Liguori --- hw/eepro100.c | 15 +++++++-------- hw/pci.h | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 68fec9c..03711a9 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -397,8 +397,7 @@ static void pci_reset(EEPRO100State * s) /* PCI Vendor ID */ pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); - /* PCI Device ID */ - pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82551IT); + /* PCI Device ID depends on device and is set below. */ /* PCI Command */ PCI_CONFIG_16(PCI_COMMAND, 0x0000); /* PCI Status */ @@ -446,29 +445,29 @@ static void pci_reset(EEPRO100State * s) switch (device) { case i82551: - //~ PCI_CONFIG_16(PCI_DEVICE_ID, 0x1209); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82551IT); PCI_CONFIG_8(PCI_REVISION_ID, 0x0f); break; case i82557B: - PCI_CONFIG_16(PCI_DEVICE_ID, 0x1229); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82557); PCI_CONFIG_8(PCI_REVISION_ID, 0x02); break; case i82557C: - PCI_CONFIG_16(PCI_DEVICE_ID, 0x1229); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82557); PCI_CONFIG_8(PCI_REVISION_ID, 0x03); break; case i82558B: - PCI_CONFIG_16(PCI_DEVICE_ID, 0x1229); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82557); PCI_CONFIG_16(PCI_STATUS, 0x2810); PCI_CONFIG_8(PCI_REVISION_ID, 0x05); break; case i82559C: - PCI_CONFIG_16(PCI_DEVICE_ID, 0x1229); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82557); PCI_CONFIG_16(PCI_STATUS, 0x2810); //~ PCI_CONFIG_8(PCI_REVISION_ID, 0x08); break; case i82559ER: - //~ PCI_CONFIG_16(PCI_DEVICE_ID, 0x1209); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82551IT); PCI_CONFIG_16(PCI_STATUS, 0x2810); PCI_CONFIG_8(PCI_REVISION_ID, 0x09); break; diff --git a/hw/pci.h b/hw/pci.h index dee2841..6196b6a 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -59,6 +59,7 @@ extern target_phys_addr_t pci_mem_base; /* Intel (0x8086) */ #define PCI_DEVICE_ID_INTEL_82551IT 0x1209 +#define PCI_DEVICE_ID_INTEL_82557 0x1229 /* Red Hat / Qumranet (for QEMU) -- see pci-ids.txt */ #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 -- 1.7.9.5