Commit d6fd1e66 authored by Stefan Weil's avatar Stefan Weil Committed by Anthony Liguori
Browse files

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: default avatarStefan Weil <weil@mail.berlios.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent c32d766a

hw/eepro100.c

+7 −8
Original line number Diff line number Diff line
@@ -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;

hw/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -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