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

pci: rename (pci_/pcie_mmcfg_)addr_to_dev 

This patch renames pci_addr_to_dev(), pcie_mmcfg_addr_to_dev()
to pci_dev_find_by_addr(), pcie_dev_find_by_mmcfg_addr()
as "Michael S. Tsirkin" <mst@redhat.com> suggested.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Isaku Yamahata 2009-11-12 13:17:23 +02:00 committed by Michael S. Tsirkin
parent 7ac901cd18
commit 8d6514f8dd
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/pci_host.c
View File

@ -40,7 +40,7 @@ do { printf("pci_host_data: " fmt , ## __VA_ARGS__); } while (0)
*/ */
/* the helper functio to get a PCIDeice* for a given pci address */ /* the helper functio to get a PCIDeice* for a given pci address */
static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, uint32_t addr) static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)
{ {
uint8_t bus_num = (addr >> 16) & 0xff; uint8_t bus_num = (addr >> 16) & 0xff;
uint8_t devfn = (addr >> 8) & 0xff; uint8_t devfn = (addr >> 8) & 0xff;
@ -49,7 +49,7 @@ static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, uint32_t addr)
void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len) void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
{ {
PCIDevice *pci_dev = pci_addr_to_dev(s, addr); PCIDevice *pci_dev = pci_dev_find_by_addr(s, addr);
uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1); uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
if (!pci_dev) if (!pci_dev)
@ -62,7 +62,7 @@ void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len) uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)
{ {
PCIDevice *pci_dev = pci_addr_to_dev(s, addr); PCIDevice *pci_dev = pci_dev_find_by_addr(s, addr);
uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1); uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
uint32_t val; uint32_t val;

7
hw/pcie_host.c
View File

@ -46,7 +46,8 @@
/* a helper function to get a PCIDevice for a given mmconfig address */ /* a helper function to get a PCIDevice for a given mmconfig address */
static inline PCIDevice *pcie_mmcfg_addr_to_dev(PCIBus *s, uint32_t mmcfg_addr) static inline PCIDevice *pcie_dev_find_by_mmcfg_addr(PCIBus *s,
uint32_t mmcfg_addr)
{ {
return pci_find_device(s, PCIE_MMCFG_BUS(mmcfg_addr), return pci_find_device(s, PCIE_MMCFG_BUS(mmcfg_addr),
PCI_SLOT(PCIE_MMCFG_DEVFN(mmcfg_addr)), PCI_SLOT(PCIE_MMCFG_DEVFN(mmcfg_addr)),
@ -56,7 +57,7 @@ static inline PCIDevice *pcie_mmcfg_addr_to_dev(PCIBus *s, uint32_t mmcfg_addr)
static void pcie_mmcfg_data_write(PCIBus *s, static void pcie_mmcfg_data_write(PCIBus *s,
uint32_t mmcfg_addr, uint32_t val, int len) uint32_t mmcfg_addr, uint32_t val, int len)
{ {
PCIDevice *pci_dev = pcie_mmcfg_addr_to_dev(s, mmcfg_addr); PCIDevice *pci_dev = pcie_dev_find_by_mmcfg_addr(s, mmcfg_addr);
if (!pci_dev) if (!pci_dev)
return; return;
@ -67,7 +68,7 @@ static void pcie_mmcfg_data_write(PCIBus *s,
static uint32_t pcie_mmcfg_data_read(PCIBus *s, uint32_t addr, int len) static uint32_t pcie_mmcfg_data_read(PCIBus *s, uint32_t addr, int len)
{ {
PCIDevice *pci_dev = pcie_mmcfg_addr_to_dev(s, addr); PCIDevice *pci_dev = pcie_dev_find_by_mmcfg_addr(s, addr);
assert(len == 1 || len == 2 || len == 4); assert(len == 1 || len == 2 || len == 4);
if (!pci_dev) { if (!pci_dev) {