Revision 42e4126b hw/pci_host.c

b/hw/pci_host.c
47 47
    return pci_find_device(bus, bus_num, devfn);
48 48
}
49 49

  
50
void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr,
51
                                  uint32_t limit, uint32_t val, uint32_t len)
52
{
53
    assert(len <= 4);
54
    pci_dev->config_write(pci_dev, addr, val, MIN(len, limit - addr));
55
}
56

  
57
uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr,
58
                                     uint32_t limit, uint32_t len)
59
{
60
    assert(len <= 4);
61
    return pci_dev->config_read(pci_dev, addr, MIN(len, limit - addr));
62
}
63

  
50 64
void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
51 65
{
52 66
    PCIDevice *pci_dev = pci_dev_find_by_addr(s, addr);
53 67
    uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
54 68

  
55
    if (!pci_dev)
69
    if (!pci_dev) {
56 70
        return;
71
    }
57 72

  
58 73
    PCI_DPRINTF("%s: %s: addr=%02" PRIx32 " val=%08" PRIx32 " len=%d\n",
59 74
                __func__, pci_dev->name, config_addr, val, len);
60
    pci_dev->config_write(pci_dev, config_addr, val, len);
75
    pci_host_config_write_common(pci_dev, config_addr, PCI_CONFIG_SPACE_SIZE,
76
                                 val, len);
61 77
}
62 78

  
63 79
uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)
......
66 82
    uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
67 83
    uint32_t val;
68 84

  
69
    assert(len == 1 || len == 2 || len == 4);
70 85
    if (!pci_dev) {
71 86
        return ~0x0;
72 87
    }
73 88

  
74
    val = pci_dev->config_read(pci_dev, config_addr, len);
89
    val = pci_host_config_read_common(pci_dev, config_addr,
90
                                      PCI_CONFIG_SPACE_SIZE, len);
75 91
    PCI_DPRINTF("%s: %s: addr=%02"PRIx32" val=%08"PRIx32" len=%d\n",
76 92
                __func__, pci_dev->name, config_addr, val, len);
77 93

  

Also available in: Unified diff