[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/20] qdev: convert ac97.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 12/20] qdev: convert ac97. |
Date: |
Mon, 29 Jun 2009 14:46:13 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/ac97.c | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/hw/ac97.c b/hw/ac97.c
index b911308..d25ba71 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -1308,29 +1308,13 @@ static void ac97_on_reset (void *opaque)
mixer_reset (s);
}
-int ac97_init (PCIBus *bus)
+static void ac97_initfn(PCIDevice *dev)
{
- PCIAC97LinkState *d;
- AC97LinkState *s;
- uint8_t *c;
-
- if (!bus) {
- AUD_log ("ac97", "No PCI bus\n");
- return -1;
- }
-
- d = (PCIAC97LinkState *) pci_register_device (bus, "AC97",
- sizeof (PCIAC97LinkState),
- -1, NULL, NULL);
-
- if (!d) {
- AUD_log ("ac97", "Failed to register PCI device\n");
- return -1;
- }
+ PCIAC97LinkState *d = DO_UPCAST(PCIAC97LinkState, dev, dev);
+ AC97LinkState *s = &d->ac97;
+ uint8_t *c = d->dev.config;
- s = &d->ac97;
s->pci_dev = &d->dev;
- c = d->dev.config;
pci_config_set_vendor_id (c, PCI_VENDOR_ID_INTEL); /* ro */
pci_config_set_device_id (c, PCI_DEVICE_ID_INTEL_82801AA_5); /* ro */
@@ -1372,5 +1356,23 @@ int ac97_init (PCIBus *bus)
qemu_register_reset (ac97_on_reset, 0, s);
AUD_register_card ("ac97", &s->card);
ac97_on_reset (s);
+}
+
+int ac97_init (PCIBus *bus)
+{
+ pci_create_simple(bus, -1, "AC97");
return 0;
}
+
+static PCIDeviceInfo ac97_info = {
+ .qdev.name = "AC97",
+ .qdev.size = sizeof(PCIAC97LinkState),
+ .init = ac97_initfn,
+};
+
+static void ac97_register(void)
+{
+ pci_qdev_register(&ac97_info);
+}
+device_init(ac97_register);
+
--
1.6.2.5
- [Qemu-devel] [PATCH 03/20] qdev: remove DeviceType, (continued)
- [Qemu-devel] [PATCH 03/20] qdev: remove DeviceType, Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 05/20] qdev/core: add monitor command to list all drivers, Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 04/20] qdev/core: bus list, Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 01/20] qdev: update pci device registration., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 06/20] qdev/pci: misc fixes., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 02/20] qdev: replace bus_type enum with bus_info struct., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 09/20] qdev: convert piix acpi., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 08/20] qdev: convert piix-ide., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 07/20] qdev/pci: hook up i440fx., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 11/20] qdev: convert es1370., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 12/20] qdev: convert ac97.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 17/20] qdev: convert ohci., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 16/20] qdev/usb: print usb dev info, Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 10/20] qdev: convert all vga, Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 13/20] qdev: convert uhci., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 15/20] qdev/usb: make qemu aware of usb busses., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 14/20] qdev/usb: add usb bus support to qdev, convert drivers., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 19/20] debug/test patch: add ohci controller to pc, Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 18/20] qdev/scsi: add scsi bus support to qdev, convert drivers., Gerd Hoffmann, 2009/06/29
- [Qemu-devel] [PATCH 20/20] debug/test patch: allow specify busnr for -usbdevice, Gerd Hoffmann, 2009/06/29
- Re: [Qemu-devel] [PATCH 0/20] qdev patches., Anthony Liguori, 2009/06/29