diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-06-24 19:59:29 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-07-02 13:18:02 +0200 |
| commit | 57c888664b5eb7edbbce4be98cb1406aa0d85c2b (patch) | |
| tree | 5e91ed5fded1e54c74c24ba14f2ab96e2fec4d2e /hw/ide.h | |
| parent | 7d0d69509a966a5328e4fed7d0a942112d431c35 (diff) | |
| download | qemu-57c888664b5eb7edbbce4be98cb1406aa0d85c2b.zip qemu-57c888664b5eb7edbbce4be98cb1406aa0d85c2b.tar.gz qemu-57c888664b5eb7edbbce4be98cb1406aa0d85c2b.tar.bz2 | |
ide: Make PIIX and ISA IDE init functions return the qdev
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide.h')
| -rw-r--r-- | hw/ide.h | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,17 +1,18 @@ #ifndef HW_IDE_H #define HW_IDE_H -#include "qdev.h" +#include "isa.h" +#include "pci.h" /* ide-isa.c */ -int isa_ide_init(int iobase, int iobase2, int isairq, - DriveInfo *hd0, DriveInfo *hd1); +ISADevice *isa_ide_init(int iobase, int iobase2, int isairq, + DriveInfo *hd0, DriveInfo *hd1); /* ide-pci.c */ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, int secondary_ide_enabled); -void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); -void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); +PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); +PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); void vt82c686b_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); /* ide-macio.c */ |