ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eepro100: convert to new capability API 

Using new pci_add_capability_at_offset makes
eepro100 code cleaner.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Stefan Weil <weil@mail.berlios.de>
This commit is contained in:
Michael S. Tsirkin 2010-04-07 10:55:47 +03:00
parent 1db5a3aad3
commit 8bbd1ce236
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/eepro100.c
View File

@ -539,21 +539,17 @@ static void e100_pci_reset(EEPRO100State * s, E100PCIDeviceInfo *e100_device)
if (e100_device->power_management) { if (e100_device->power_management) {
/* Power Management Capabilities */ /* Power Management Capabilities */
int cfg_offset; int cfg_offset = 0xdc;
pci_reserve_capability(&s->dev, PCI_CONFIG_HEADER_SIZE, int r = pci_add_capability_at_offset(&s->dev, PCI_CAP_ID_PM,
0xdc - PCI_CONFIG_HEADER_SIZE); cfg_offset, PCI_PM_SIZEOF);
cfg_offset = pci_add_capability(&s->dev, PCI_CAP_ID_PM, PCI_PM_SIZEOF); assert(r >= 0);
assert(cfg_offset == 0xdc); pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21);
if (cfg_offset > 0) {
/* Power Management Capabilities */
pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21);
#if 0 /* TODO: replace dummy code for power management emulation. */ #if 0 /* TODO: replace dummy code for power management emulation. */
/* TODO: Power Management Control / Status. */ /* TODO: Power Management Control / Status. */
pci_set_word(pci_conf + cfg_offset + PCI_PM_CTRL, 0x0000); pci_set_word(pci_conf + cfg_offset + PCI_PM_CTRL, 0x0000);
/* TODO: Ethernet Power Consumption Registers (i82559 and later). */ /* TODO: Ethernet Power Consumption Registers (i82559 and later). */
pci_set_byte(pci_conf + cfg_offset + PCI_PM_PPB_EXTENSIONS, 0x0000); pci_set_byte(pci_conf + cfg_offset + PCI_PM_PPB_EXTENSIONS, 0x0000);
#endif #endif
}
} }
#if EEPROM_SIZE > 0 #if EEPROM_SIZE > 0