net: reorganize headers

[qemu.git] / hw / pl181.c

diff --git a/hw/pl181.c b/hw/pl181.c
index 973d3fcf0e3b7422987247e2b8855f7ab6c89a1b..8a2895ce1ba532dbdae6ac9ea3967d1523e9a3ad 100644 (file)
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -285,7 +285,7 @@ static void pl181_fifo_run(pl181_state *s)
     }
 }
 
     }
 }
 

-static uint64_t pl181_read(void *opaque, target_phys_addr_t offset,
+static uint64_t pl181_read(void *opaque, hwaddr offset,

                            unsigned size)
 {
     pl181_state *s = (pl181_state *)opaque;
                            unsigned size)
 {
     pl181_state *s = (pl181_state *)opaque;


@@ -352,7 +352,7 @@ static uint64_t pl181_read(void *opaque, target_phys_addr_t offset,
     case 0xa0: case 0xa4: case 0xa8: case 0xac:
     case 0xb0: case 0xb4: case 0xb8: case 0xbc:
         if (s->fifo_len == 0) {
     case 0xa0: case 0xa4: case 0xa8: case 0xac:
     case 0xb0: case 0xb4: case 0xb8: case 0xbc:
         if (s->fifo_len == 0) {

-            fprintf(stderr, "pl181: Unexpected FIFO read\n");
+            qemu_log_mask(LOG_GUEST_ERROR, "pl181: Unexpected FIFO read\n");

             return 0;
         } else {
             uint32_t value;
             return 0;
         } else {
             uint32_t value;


@@ -363,12 +363,13 @@ static uint64_t pl181_read(void *opaque, target_phys_addr_t offset,
             return value;
         }
     default:
             return value;
         }
     default:

-        hw_error("pl181_read: Bad offset %x\n", (int)offset);
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "pl181_read: Bad offset %x\n", (int)offset);

         return 0;
     }
 }
 
         return 0;
     }
 }
 

-static void pl181_write(void *opaque, target_phys_addr_t offset,
+static void pl181_write(void *opaque, hwaddr offset,

                         uint64_t value, unsigned size)
 {
     pl181_state *s = (pl181_state *)opaque;
                         uint64_t value, unsigned size)
 {
     pl181_state *s = (pl181_state *)opaque;


@@ -387,11 +388,11 @@ static void pl181_write(void *opaque, target_phys_addr_t offset,
         s->cmd = value;
         if (s->cmd & PL181_CMD_ENABLE) {
             if (s->cmd & PL181_CMD_INTERRUPT) {
         s->cmd = value;
         if (s->cmd & PL181_CMD_ENABLE) {
             if (s->cmd & PL181_CMD_INTERRUPT) {

-                fprintf(stderr, "pl181: Interrupt mode not implemented\n");
-                abort();
+                qemu_log_mask(LOG_UNIMP,
+                              "pl181: Interrupt mode not implemented\n");

             } if (s->cmd & PL181_CMD_PENDING) {
             } if (s->cmd & PL181_CMD_PENDING) {

-                fprintf(stderr, "pl181: Pending commands not implemented\n");
-                abort();
+                qemu_log_mask(LOG_UNIMP,
+                              "pl181: Pending commands not implemented\n");

             } else {
                 pl181_send_command(s);
                 pl181_fifo_run(s);
             } else {
                 pl181_send_command(s);
                 pl181_fifo_run(s);


@@ -427,14 +428,15 @@ static void pl181_write(void *opaque, target_phys_addr_t offset,
     case 0xa0: case 0xa4: case 0xa8: case 0xac:
     case 0xb0: case 0xb4: case 0xb8: case 0xbc:
         if (s->datacnt == 0) {
     case 0xa0: case 0xa4: case 0xa8: case 0xac:
     case 0xb0: case 0xb4: case 0xb8: case 0xbc:
         if (s->datacnt == 0) {

-            fprintf(stderr, "pl181: Unexpected FIFO write\n");
+            qemu_log_mask(LOG_GUEST_ERROR, "pl181: Unexpected FIFO write\n");

         } else {
             pl181_fifo_push(s, value);
             pl181_fifo_run(s);
         }
         break;
     default:
         } else {
             pl181_fifo_push(s, value);
             pl181_fifo_run(s);
         }
         break;
     default:

-        hw_error("pl181_write: Bad offset %x\n", (int)offset);
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "pl181_write: Bad offset %x\n", (int)offset);

     }
     pl181_update(s);
 }
     }
     pl181_update(s);
 }


@@ -490,22 +492,24 @@ static int pl181_init(SysBusDevice *dev)
 static void pl181_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
 static void pl181_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);

+    DeviceClass *k = DEVICE_CLASS(klass);

 
     sdc->init = pl181_init;
 
     sdc->init = pl181_init;

+    k->vmsd = &vmstate_pl181;
+    k->reset = pl181_reset;
+    k->no_user = 1;

 }
 
 }
 

-static DeviceInfo pl181_info = {
-    .name = "pl181",
-    .size = sizeof(pl181_state),
-    .class_init = pl181_class_init,
-    .vmsd = &vmstate_pl181,
-    .reset = pl181_reset,
-    .no_user = 1,
+static TypeInfo pl181_info = {
+    .name          = "pl181",
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(pl181_state),
+    .class_init    = pl181_class_init,

 };
 
 };
 

-static void pl181_register_devices(void)
+static void pl181_register_types(void)

 {
 {

-    sysbus_qdev_register(&pl181_info);
+    type_register_static(&pl181_info);

 }
 
 }
 

-device_init(pl181_register_devices)
+type_init(pl181_register_types)