github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-21 00:38:28 +00:00
Code Issues Projects Releases Wiki Activity

hv:Rename port/mmio read and write APIs

Browse Source 
mmio_write_long --> mmio_write32
mmio_write_word --> mmio_write16
mmio_write_byte --> mmio_write8
mmio_read_long  --> mmio_read32
mmio_read_word  --> mmio_read16
mmio_read_byte  --> mmio_read8

io_write_long --> pio_write32
io_write_word --> pio_write16
io_write_byte --> pio_write8
io_read_long  --> pio_read32
io_read_word  --> pio_read16
io_read_byte  --> pio_read8
io_write      --> pio_write
io_read       --> pio_read

setl --> set32
setw --> set16
setb --> set8

igned-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
This commit is contained in:
Mingqiang Chi
2018-08-01 18:19:08 +08:00
committed by lijinxia
parent 7db4c0aac9
commit 61782d7430
12 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
hypervisor/include/arch/x86/io.h
View File

@@ -10,13 +10,13 @@
#include <types.h>
/* Write 1 byte to specified I/O port */
static inline void io_write_byte(uint8_t value, uint16_t port)
static inline void pio_write8(uint8_t value, uint16_t port)
{
asm volatile ("outb %0,%1"::"a" (value), "dN"(port));
}
/* Read 1 byte from specified I/O port */
static inline uint8_t io_read_byte(uint16_t port)
static inline uint8_t pio_read8(uint16_t port)
{
uint8_t value;
@@ -25,13 +25,13 @@ static inline uint8_t io_read_byte(uint16_t port)
}
/* Write 2 bytes to specified I/O port */
static inline void io_write_word(uint16_t value, uint16_t port)
static inline void pio_write16(uint16_t value, uint16_t port)
{
asm volatile ("outw %0,%1"::"a" (value), "dN"(port));
}
/* Read 2 bytes from specified I/O port */
static inline uint16_t io_read_word(uint16_t port)
static inline uint16_t pio_read16(uint16_t port)
{
uint16_t value;
@@ -40,13 +40,13 @@ static inline uint16_t io_read_word(uint16_t port)
}
/* Write 4 bytes to specified I/O port */
static inline void io_write_long(uint32_t value, uint16_t port)
static inline void pio_write32(uint32_t value, uint16_t port)
{
asm volatile ("outl %0,%1"::"a" (value), "dN"(port));
}
/* Read 4 bytes from specified I/O port */
static inline uint32_t io_read_long(uint16_t port)
static inline uint32_t pio_read32(uint16_t port)
{
uint32_t value;
@@ -54,26 +54,26 @@ static inline uint32_t io_read_long(uint16_t port)
return value;
}
static inline void io_write(uint32_t v, uint16_t addr, size_t sz)
static inline void pio_write(uint32_t v, uint16_t addr, size_t sz)
{
if (sz == 1U) {
io_write_byte((uint8_t)v, addr);
pio_write8((uint8_t)v, addr);
} else if (sz == 2U) {
io_write_word((uint16_t)v, addr);
pio_write16((uint16_t)v, addr);
} else {
io_write_long(v, addr);
pio_write32(v, addr);
}
}
static inline uint32_t io_read(uint16_t addr, size_t sz)
static inline uint32_t pio_read(uint16_t addr, size_t sz)
{
if (sz == 1U) {
return io_read_byte(addr);
return pio_read8(addr);
}
if (sz == 2U) {
return io_read_word(addr);
return pio_read16(addr);
}
return io_read_long(addr);
return pio_read32(addr);
}
/** Writes a 32 bit value to a memory mapped IO device.
@@ -81,7 +81,7 @@ static inline uint32_t io_read(uint16_t addr, size_t sz)
* @param value The 32 bit value to write.
* @param addr The memory address to write to.
*/
static inline void mmio_write_long(uint32_t value, void *addr)
static inline void mmio_write32(uint32_t value, void *addr)
{
volatile uint32_t *addr32 = (volatile uint32_t *)addr;
*addr32 = value;
@@ -92,7 +92,7 @@ static inline void mmio_write_long(uint32_t value, void *addr)
* @param value The 16 bit value to write.
* @param addr The memory address to write to.
*/
static inline void mmio_write_word(uint16_t value, void *addr)
static inline void mmio_write16(uint16_t value, void *addr)
{
volatile uint16_t *addr16 = (volatile uint16_t *)addr;
*addr16 = value;
@@ -103,7 +103,7 @@ static inline void mmio_write_word(uint16_t value, void *addr)
* @param value The 8 bit value to write.
* @param addr The memory address to write to.
*/
static inline void mmio_write_byte(uint8_t value, void *addr)
static inline void mmio_write8(uint8_t value, void *addr)
{
volatile uint8_t *addr8 = (volatile uint8_t *)addr;
*addr8 = value;
@@ -115,7 +115,7 @@ static inline void mmio_write_byte(uint8_t value, void *addr)
*
* @return The 32 bit value read from the given address.
*/
static inline uint32_t mmio_read_long(void *addr)
static inline uint32_t mmio_read32(void *addr)
{
return *((volatile uint32_t *)addr);
}
@@ -126,7 +126,7 @@ static inline uint32_t mmio_read_long(void *addr)
*
* @return The 16 bit value read from the given address.
*/
static inline uint16_t mmio_read_word(void *addr)
static inline uint16_t mmio_read16(void *addr)
{
return *((volatile uint16_t *)addr);
}
@@ -137,7 +137,7 @@ static inline uint16_t mmio_read_word(void *addr)
*
* @return The 8 bit value read from the given address.
*/
static inline uint8_t mmio_read_byte(void *addr)
static inline uint8_t mmio_read8(void *addr)
{
return *((volatile uint8_t *)addr);
}
@@ -150,9 +150,9 @@ static inline uint8_t mmio_read_byte(void *addr)
* @param mask The mask to apply to the value read.
* @param value The 32 bit value to write.
*/
static inline void setl(void *addr, uint32_t mask, uint32_t value)
static inline void set32(void *addr, uint32_t mask, uint32_t value)
{
mmio_write_long((mmio_read_long(addr) & ~mask) | value, addr);
mmio_write32((mmio_read32(addr) & ~mask) | value, addr);
}
/** Reads a 16 Bit memory mapped IO register, mask it and write it back into
@@ -162,9 +162,9 @@ static inline void setl(void *addr, uint32_t mask, uint32_t value)
* @param mask The mask to apply to the value read.
* @param value The 16 bit value to write.
*/
static inline void setw(void *addr, uint16_t mask, uint16_t value)
static inline void set16(void *addr, uint16_t mask, uint16_t value)
{
mmio_write_word((mmio_read_word(addr) & ~mask) | value, addr);
mmio_write16((mmio_read16(addr) & ~mask) | value, addr);
}
/** Reads a 8 Bit memory mapped IO register, mask it and write it back into
@@ -174,9 +174,9 @@ static inline void setw(void *addr, uint16_t mask, uint16_t value)
* @param mask The mask to apply to the value read.
* @param value The 8 bit value to write.
*/
static inline void setb(void *addr, uint8_t mask, uint8_t value)
static inline void set8(void *addr, uint8_t mask, uint8_t value)
{
mmio_write_byte((mmio_read_byte(addr) & ~mask) | value, addr);
mmio_write8((mmio_read8(addr) & ~mask) | value, addr);
}
#endif /* _IO_H defined */