net: reorganize headers

[qemu.git] / hw / milkymist-uart.c

diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c
index f9a229cf685637b83be6c7fbead6d6798c45cf55..aefa8c7f1cf48d015ef3855682bb0feef098e4dd 100644 (file)
--- a/hw/milkymist-uart.c
+++ b/hw/milkymist-uart.c
@@ -78,7 +78,7 @@ static void uart_update_irq(MilkymistUartState *s)
     }
 }
 
     }
 }
 

-static uint64_t uart_read(void *opaque, target_phys_addr_t addr,
+static uint64_t uart_read(void *opaque, hwaddr addr,

                           unsigned size)
 {
     MilkymistUartState *s = opaque;
                           unsigned size)
 {
     MilkymistUartState *s = opaque;


@@ -107,7 +107,7 @@ static uint64_t uart_read(void *opaque, target_phys_addr_t addr,
     return r;
 }
 
     return r;
 }
 

-static void uart_write(void *opaque, target_phys_addr_t addr, uint64_t value,
+static void uart_write(void *opaque, hwaddr addr, uint64_t value,

                        unsigned size)
 {
     MilkymistUartState *s = opaque;
                        unsigned size)
 {
     MilkymistUartState *s = opaque;


@@ -235,9 +235,9 @@ static TypeInfo milkymist_uart_info = {
     .class_init    = milkymist_uart_class_init,
 };
 
     .class_init    = milkymist_uart_class_init,
 };
 

-static void milkymist_uart_register(void)
+static void milkymist_uart_register_types(void)

 {
     type_register_static(&milkymist_uart_info);
 }
 
 {
     type_register_static(&milkymist_uart_info);
 }
 

-device_init(milkymist_uart_register)
+type_init(milkymist_uart_register_types)