Revision a8170e5e hw/omap_uart.c
b/hw/omap_uart.c | ||
---|---|---|
26 | 26 |
/* UARTs */ |
27 | 27 |
struct omap_uart_s { |
28 | 28 |
MemoryRegion iomem; |
29 |
target_phys_addr_t base;
|
|
29 |
hwaddr base;
|
|
30 | 30 |
SerialState *serial; /* TODO */ |
31 | 31 |
struct omap_target_agent_s *ta; |
32 | 32 |
omap_clk fclk; |
... | ... | |
50 | 50 |
s->clksel = 0; |
51 | 51 |
} |
52 | 52 |
|
53 |
struct omap_uart_s *omap_uart_init(target_phys_addr_t base,
|
|
53 |
struct omap_uart_s *omap_uart_init(hwaddr base,
|
|
54 | 54 |
qemu_irq irq, omap_clk fclk, omap_clk iclk, |
55 | 55 |
qemu_irq txdma, qemu_irq rxdma, |
56 | 56 |
const char *label, CharDriverState *chr) |
... | ... | |
68 | 68 |
return s; |
69 | 69 |
} |
70 | 70 |
|
71 |
static uint64_t omap_uart_read(void *opaque, target_phys_addr_t addr,
|
|
71 |
static uint64_t omap_uart_read(void *opaque, hwaddr addr,
|
|
72 | 72 |
unsigned size) |
73 | 73 |
{ |
74 | 74 |
struct omap_uart_s *s = (struct omap_uart_s *) opaque; |
... | ... | |
106 | 106 |
return 0; |
107 | 107 |
} |
108 | 108 |
|
109 |
static void omap_uart_write(void *opaque, target_phys_addr_t addr,
|
|
109 |
static void omap_uart_write(void *opaque, hwaddr addr,
|
|
110 | 110 |
uint64_t value, unsigned size) |
111 | 111 |
{ |
112 | 112 |
struct omap_uart_s *s = (struct omap_uart_s *) opaque; |
... | ... | |
164 | 164 |
qemu_irq txdma, qemu_irq rxdma, |
165 | 165 |
const char *label, CharDriverState *chr) |
166 | 166 |
{ |
167 |
target_phys_addr_t base = omap_l4_attach(ta, 0, NULL);
|
|
167 |
hwaddr base = omap_l4_attach(ta, 0, NULL);
|
|
168 | 168 |
struct omap_uart_s *s = omap_uart_init(base, irq, |
169 | 169 |
fclk, iclk, txdma, rxdma, label, chr); |
170 | 170 |
|
Also available in: Unified diff