|
@@ -15,7 +15,6 @@
|
|
|
#include "qemu/osdep.h"
|
|
|
#include "hw/ide/pci.h"
|
|
|
#include "qemu/module.h"
|
|
|
-#include "sysemu/reset.h"
|
|
|
#include "trace.h"
|
|
|
|
|
|
#define TYPE_SII3112_PCI "sii3112"
|
|
@@ -237,9 +236,9 @@ static void sii3112_set_irq(void *opaque, int channel, int level)
|
|
|
sii3112_update_irq(s);
|
|
|
}
|
|
|
|
|
|
-static void sii3112_reset(void *opaque)
|
|
|
+static void sii3112_reset(DeviceState *dev)
|
|
|
{
|
|
|
- SiI3112PCIState *s = opaque;
|
|
|
+ SiI3112PCIState *s = SII3112_PCI(dev);
|
|
|
int i;
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
@@ -290,7 +289,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp)
|
|
|
s->bmdma[i].bus = &s->bus[i];
|
|
|
ide_register_restart_cb(&s->bus[i]);
|
|
|
}
|
|
|
- qemu_register_reset(sii3112_reset, s);
|
|
|
}
|
|
|
|
|
|
static void sii3112_pci_class_init(ObjectClass *klass, void *data)
|
|
@@ -303,6 +301,7 @@ static void sii3112_pci_class_init(ObjectClass *klass, void *data)
|
|
|
pd->class_id = PCI_CLASS_STORAGE_RAID;
|
|
|
pd->revision = 1;
|
|
|
pd->realize = sii3112_pci_realize;
|
|
|
+ dc->reset = sii3112_reset;
|
|
|
dc->desc = "SiI3112A SATA controller";
|
|
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
}
|