github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 17:58:30 +00:00
Code Issues Projects Releases Wiki Activity

refine: remove redundant data type definition

Browse Source 
remove data defination of mmio_addr_t, vaddr_t, paddr_t,
and ioport_t.

Signed-off-by: Zheng, Gen <gen.zheng@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
Signed-off-by: Zheng, Gen <gen.zheng@intel.com>
This commit is contained in:
Zheng, Gen
2018-04-13 14:51:25 +08:00
committed by Jack Ren
parent f80c706d8d
commit c92da5295b
14 changed files with 68 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debug/console.c
View File

@@ -171,7 +171,7 @@ void console_dump_bytes(const void *p, unsigned int len)
/* dump all bytes */
while (x < e) {
/* write the address of the first byte in the row */
printf("%08x: ", (vaddr_t) x);
printf("%08x: ", (uint64_t) x);
/* print one row (16 bytes) as hexadecimal values */
for (i = 0; i < 16; i++)
printf("%02x ", x[i]);

2
debug/serial_internal.h
View File

@@ -153,7 +153,7 @@ struct uart_config {
*/
struct tgt_uart {
char uart_id[SERIAL_ID_MAX_LENGTH];
mmio_addr_t base_address;
uint64_t base_address;
uint32_t clock_frequency;
uint32_t buffer_size;
unsigned int open_count;

16
debug/uart16550.c
View File

@@ -88,26 +88,22 @@ enum UART_REG_IDX{
#define UART_CLOCK_RATE CPU_OSC_CLOCK
#define UART_BUFFER_SIZE 2048
static inline uint32_t uart16550_read_reg(uint32_t base, uint32_t reg_idx)
static inline uint32_t uart16550_read_reg(uint64_t base, uint32_t reg_idx)
{
if (serial_port_mapped) {
return io_read_byte((ioport_t)
((uint8_t *)(uint64_t)base + reg_idx));
return io_read_byte((uint16_t)base + reg_idx);
} else {
return mmio_read_long((mmio_addr_t)
((uint32_t *)(uint64_t)base + reg_idx));
return mmio_read_long((uint64_t)((uint32_t*)base + reg_idx));
}
}
static inline void uart16550_write_reg(uint32_t base,
static inline void uart16550_write_reg(uint64_t base,
uint32_t val, uint32_t reg_idx)
{
if (serial_port_mapped) {
io_write_byte(val, (ioport_t)
((uint8_t *)(uint64_t)base + reg_idx));
io_write_byte(val, (uint16_t)base + reg_idx);
} else {
mmio_write_long(val, (mmio_addr_t)
((uint32_t *)(uint64_t)base + reg_idx));
mmio_write_long(val, (uint64_t)((uint32_t*)base + reg_idx));
}
}

4
debug/vuart.c
View File

@@ -153,7 +153,7 @@ static void uart_toggle_intr(struct vuart *vu)
}
static void uart_write(__unused struct vm_io_handler *hdlr,
struct vm *vm, ioport_t offset,
struct vm *vm, uint16_t offset,
__unused size_t width, uint32_t value)
{
struct vuart *vu = vm_vuart(vm);
@@ -231,7 +231,7 @@ done:
}
static uint32_t uart_read(__unused struct vm_io_handler *hdlr,
struct vm *vm, ioport_t offset,
struct vm *vm, uint16_t offset,
__unused size_t width)
{
char iir, intr_reason, reg;