[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/14] ES1370: QOMify
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 09/14] ES1370: QOMify |
Date: |
Thu, 11 Feb 2016 15:18:58 +0300 |
From: Cao jin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/audio/es1370.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 96acbc6..8449b5f 100644
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -289,6 +289,10 @@ struct chan_bits {
uint32_t *old_freq, uint32_t *new_freq);
};
+#define TYPE_ES1370 "ES1370"
+#define ES1370(obj) \
+ OBJECT_CHECK(ES1370State, (obj), TYPE_ES1370)
+
static void es1370_dac1_calc_freq (ES1370State *s, uint32_t ctl,
uint32_t *old_freq, uint32_t *new_freq);
static void es1370_dac2_and_adc_calc_freq (ES1370State *s, uint32_t ctl,
@@ -1014,7 +1018,7 @@ static void es1370_on_reset (void *opaque)
static void es1370_realize(PCIDevice *dev, Error **errp)
{
- ES1370State *s = DO_UPCAST (ES1370State, dev, dev);
+ ES1370State *s = ES1370(dev);
uint8_t *c = s->dev.config;
c[PCI_STATUS + 1] = PCI_STATUS_DEVSEL_SLOW >> 8;
@@ -1039,7 +1043,7 @@ static void es1370_realize(PCIDevice *dev, Error **errp)
static int es1370_init (PCIBus *bus)
{
- pci_create_simple (bus, -1, "ES1370");
+ pci_create_simple (bus, -1, TYPE_ES1370);
return 0;
}
@@ -1060,7 +1064,7 @@ static void es1370_class_init (ObjectClass *klass, void
*data)
}
static const TypeInfo es1370_info = {
- .name = "ES1370",
+ .name = TYPE_ES1370,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof (ES1370State),
.class_init = es1370_class_init,
--
2.1.4
- [Qemu-devel] [PULL 12/14] s390x: remove s390-zipl.rom, (continued)
- [Qemu-devel] [PULL 12/14] s390x: remove s390-zipl.rom, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 08/14] char: fix parameter name / type in BSD codepath, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 02/14] man: virtfs-proxy-helper: Rework awkward sentence, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 13/14] Adds keycode 86 to the hid_usage_keys translation table., Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 14/14] w32: include winsock2.h before windows.h, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 05/14] qemu-sockets: simplify error handling, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 06/14] rdma: remove check on time_spent when calculating mbs, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 10/14] Emulated CCID card: QOMify, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 04/14] cpu: cpu_save/cpu_load is no more, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 01/14] remove libtool support, Michael Tokarev, 2016/02/11
- [Qemu-devel] [PULL 09/14] ES1370: QOMify,
Michael Tokarev <=
- Re: [Qemu-devel] [PULL 00/14] Trivial patches for 2016-02-11, Peter Maydell, 2016/02/11