Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / hw / smc91c111.c

diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index a9904d9..d8a2599 100644 (file)
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -7,7 +7,7 @@
  * This code is licenced under the GPL
  */
 
-#include "hw.h"
+#include "sysbus.h"
 #include "net.h"
 #include "devices.h"
 /* For crc32 */
@@ -17,6 +17,7 @@
 #define NUM_PACKETS 4
 
 typedef struct {
+    SysBusDevice busdev;
     VLANClientState *vc;
     uint16_t tcr;
     uint16_t rcr;
@@ -413,8 +414,7 @@ static void smc91c111_writeb(void *opaque, target_phys_addr_t offset,
         }
         break;
     }
-    cpu_abort (cpu_single_env, "smc91c111_write: Bad reg %d:%x\n",
-               s->bank, (int)offset);
+    hw_error("smc91c111_write: Bad reg %d:%x\n", s->bank, (int)offset);
 }
 
 static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset)
@@ -554,8 +554,7 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset)
         }
         break;
     }
-    cpu_abort (cpu_single_env, "smc91c111_read: Bad reg %d:%x\n",
-               s->bank, (int)offset);
+    hw_error("smc91c111_read: Bad reg %d:%x\n", s->bank, (int)offset);
     return 0;
 }
 
@@ -691,11 +690,6 @@ static CPUWriteMemoryFunc *smc91c111_writefn[] = {
     smc91c111_writel
 };
 
-int smc91c111_iomemtype(void *opaque) {
-    smc91c111_state *s=(smc91c111_state *) opaque;
-    return s->mmio_index;
-}
-
 static void smc91c111_save_state(QEMUFile *f, void *opaque)
 {
     smc91c111_state *s = (smc91c111_state *)opaque;
@@ -771,28 +765,68 @@ static void smc91c111_cleanup(VLANClientState *vc)
     qemu_free(s);
 }
 
-void *smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq, int phys_alloc)
+static void smc91c111_init1(SysBusDevice *dev)
 {
-    smc91c111_state *s;
-
-    qemu_check_nic_model(nd, "smc91c111");
+    smc91c111_state *s = FROM_SYSBUS(smc91c111_state, dev);
 
-    s = (smc91c111_state *)qemu_mallocz(sizeof(smc91c111_state));
     s->mmio_index = cpu_register_io_memory(0, smc91c111_readfn,
                                            smc91c111_writefn, s);
-    if (phys_alloc)
-        cpu_register_physical_memory(base, 16, s->mmio_index);
-    s->irq = irq;
-    memcpy(s->macaddr, nd->macaddr, 6);
+    sysbus_init_mmio(dev, 16, s->mmio_index);
+    sysbus_init_irq(dev, &s->irq);
+    qdev_get_macaddr(&dev->qdev, s->macaddr);
 
     smc91c111_reset(s);
 
-    s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
+    s->vc = qdev_get_vlan_client(&dev->qdev,
                                  smc91c111_receive, smc91c111_can_receive,
                                  smc91c111_cleanup, s);
     qemu_format_nic_info_str(s->vc, s->macaddr);
     /* ??? Save/restore.  */
     register_savevm("smc91c111", -1, 0,
                     smc91c111_save_state, smc91c111_load_state, s);
+    /*return s;*/
+}
+
+static void smc91c111_register_devices(void)
+{
+    sysbus_register_dev("smc91c111", sizeof(smc91c111_state), smc91c111_init1);
+}
+
+/* Legacy helper function.  Should go away when machine config files are
+   implemented.  */
+void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)
+{
+    DeviceState *dev;
+    SysBusDevice *s;
+
+    qemu_check_nic_model(nd, "smc91c111");
+    dev = qdev_create(NULL, "smc91c111");
+    qdev_set_netdev(dev, nd);
+    qdev_init(dev);
+    s = sysbus_from_qdev(dev);
+    sysbus_mmio_map(s, 0, base);
+    sysbus_connect_irq(s, 0, irq);
+}
+
+void *smc91c111_init_lite(NICInfo *nd, qemu_irq irq)
+{
+    DeviceState *dev;
+    SysBusDevice *s;
+    
+    qemu_check_nic_model(nd, "smc91c111");
+    dev = qdev_create(NULL, "smc91c111");
+    qdev_set_netdev(dev, nd);
+    qdev_init(dev);
+    s = sysbus_from_qdev(dev);
+    //sysbus_mmio_map(s, 0, base);
+    sysbus_connect_irq(s, 0, irq);
     return s;
 }
+
+int smc91c111_iomemtype(void *opaque)
+{
+    SysBusDevice *s = (SysBusDevice *)opaque;
+    return (FROM_SYSBUS(smc91c111_state, s))->mmio_index;
+}
+
+device_init(smc91c111_register_devices)