d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtio: move ioport macros

Browse Source 
virtio_pci.c is the only file references macros VIRTIO_READ/WRITE_REG_X.
Move them there.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Tested-by: Qian Xu <qian.q.xu@intel.com>
Reviewed-by: Tetsuya Mukawa <mukawa@igel.co.jp>
Tested-by: Tetsuya Mukawa <mukawa@igel.co.jp>
Acked-by: Huawei Xie <huawei.xie@intel.com>
This commit is contained in:
Yuanhan Liu 2016-02-02 21:48:20 +08:00 committed by Thomas Monjalon
parent 6ba1f63b5a
commit b86af7b1b5
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/virtio/virtio_pci.c
View File

@ -49,6 +49,24 @@
#define PCI_CAPABILITY_LIST 0x34 #define PCI_CAPABILITY_LIST 0x34
#define PCI_CAP_ID_VNDR 0x09 #define PCI_CAP_ID_VNDR 0x09
#define VIRTIO_PCI_REG_ADDR(hw, reg) \
(unsigned short)((hw)->io_base + (reg))
#define VIRTIO_READ_REG_1(hw, reg) \
inb((VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_WRITE_REG_1(hw, reg, value) \
outb_p((unsigned char)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_READ_REG_2(hw, reg) \
inw((VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_WRITE_REG_2(hw, reg, value) \
outw_p((unsigned short)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_READ_REG_4(hw, reg) \
inl((VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_WRITE_REG_4(hw, reg, value) \
outl_p((unsigned int)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
static void static void
legacy_read_dev_config(struct virtio_hw *hw, size_t offset, legacy_read_dev_config(struct virtio_hw *hw, size_t offset,
void *dst, int length) void *dst, int length)

18
drivers/net/virtio/virtio_pci.h
View File

@ -318,24 +318,6 @@ outl_p(unsigned int data, unsigned int port)
} }
#endif #endif
#define VIRTIO_PCI_REG_ADDR(hw, reg) \
(unsigned short)((hw)->io_base + (reg))
#define VIRTIO_READ_REG_1(hw, reg) \
inb((VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_WRITE_REG_1(hw, reg, value) \
outb_p((unsigned char)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_READ_REG_2(hw, reg) \
inw((VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_WRITE_REG_2(hw, reg, value) \
outw_p((unsigned short)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_READ_REG_4(hw, reg) \
inl((VIRTIO_PCI_REG_ADDR((hw), (reg))))
#define VIRTIO_WRITE_REG_4(hw, reg, value) \
outl_p((unsigned int)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
static inline int static inline int
vtpci_with_feature(struct virtio_hw *hw, uint64_t bit) vtpci_with_feature(struct virtio_hw *hw, uint64_t bit)
{ {