[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/19] usb: usb-audio QOMify
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 06/19] usb: usb-audio QOMify |
Date: |
Fri, 8 May 2015 13:45:40 +0200 |
From: Gonglei <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-audio.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 67deffe..f092bb8 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -361,6 +361,9 @@ typedef struct USBAudioState {
uint32_t buffer;
} USBAudioState;
+#define TYPE_USB_AUDIO "usb-audio"
+#define USB_AUDIO(obj) OBJECT_CHECK(USBAudioState, (obj), TYPE_USB_AUDIO)
+
static void output_callback(void *opaque, int avail)
{
USBAudioState *s = opaque;
@@ -506,7 +509,7 @@ static void usb_audio_handle_control(USBDevice *dev,
USBPacket *p,
int request, int value, int index,
int length, uint8_t *data)
{
- USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);
+ USBAudioState *s = USB_AUDIO(dev);
int ret = 0;
if (s->debug) {
@@ -565,7 +568,7 @@ fail:
static void usb_audio_set_interface(USBDevice *dev, int iface,
int old, int value)
{
- USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);
+ USBAudioState *s = USB_AUDIO(dev);
if (iface == 1) {
usb_audio_set_output_altset(s, value);
@@ -574,7 +577,7 @@ static void usb_audio_set_interface(USBDevice *dev, int
iface,
static void usb_audio_handle_reset(USBDevice *dev)
{
- USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);
+ USBAudioState *s = USB_AUDIO(dev);
if (s->debug) {
fprintf(stderr, "usb-audio: reset\n");
@@ -615,7 +618,7 @@ static void usb_audio_handle_data(USBDevice *dev, USBPacket
*p)
static void usb_audio_handle_destroy(USBDevice *dev)
{
- USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);
+ USBAudioState *s = USB_AUDIO(dev);
if (s->debug) {
fprintf(stderr, "usb-audio: destroy\n");
@@ -630,12 +633,12 @@ static void usb_audio_handle_destroy(USBDevice *dev)
static void usb_audio_realize(USBDevice *dev, Error **errp)
{
- USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);
+ USBAudioState *s = USB_AUDIO(dev);
usb_desc_create_serial(dev);
usb_desc_init(dev);
s->dev.opaque = s;
- AUD_register_card("usb-audio", &s->card);
+ AUD_register_card(TYPE_USB_AUDIO, &s->card);
s->out.altset = ALTSET_OFF;
s->out.mute = false;
@@ -647,14 +650,14 @@ static void usb_audio_realize(USBDevice *dev, Error
**errp)
s->out.as.endianness = 0;
streambuf_init(&s->out.buf, s->buffer);
- s->out.voice = AUD_open_out(&s->card, s->out.voice, "usb-audio",
+ s->out.voice = AUD_open_out(&s->card, s->out.voice, TYPE_USB_AUDIO,
s, output_callback, &s->out.as);
AUD_set_volume_out(s->out.voice, s->out.mute, s->out.vol[0],
s->out.vol[1]);
AUD_set_active_out(s->out.voice, 0);
}
static const VMStateDescription vmstate_usb_audio = {
- .name = "usb-audio",
+ .name = TYPE_USB_AUDIO,
.unmigratable = 1,
};
@@ -684,7 +687,7 @@ static void usb_audio_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo usb_audio_info = {
- .name = "usb-audio",
+ .name = TYPE_USB_AUDIO,
.parent = TYPE_USB_DEVICE,
.instance_size = sizeof(USBAudioState),
.class_init = usb_audio_class_init,
@@ -693,7 +696,7 @@ static const TypeInfo usb_audio_info = {
static void usb_audio_register_types(void)
{
type_register_static(&usb_audio_info);
- usb_legacy_register("usb-audio", "audio", NULL);
+ usb_legacy_register(TYPE_USB_AUDIO, "audio", NULL);
}
type_init(usb_audio_register_types)
--
1.8.3.1
- [Qemu-devel] [PULL 00/19] usb: qomify, bugfixes for xhci & uhci., Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 03/19] Revert "xhci: generate a Transfer Event for each Transfer TRB with the IOC bit set", Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 07/19] usb: usb-bt QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 09/19] usb: usb-hub QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 19/19] uhci: controller is halted after reset, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 12/19] usb: usb-net QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 05/19] uhci: QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 08/19] usb: usb-hid QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 04/19] xhci: fix events for setup trb., Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 10/19] usb: usb-mtp QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 06/19] usb: usb-audio QOMify,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 02/19] xhci: set timer to retry xfers, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 01/19] usb: fix usb-net segfault, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 16/19] usb: usb-wacom-tablet QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 15/19] usb: usb-uas QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 14/19] usb: usb-storage QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 17/19] usb: usb-redir QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 11/19] usb-mtp: fix segmentation fault, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 18/19] usb: usb-serial QOMify, Gerd Hoffmann, 2015/05/08
- [Qemu-devel] [PULL 13/19] usb: usb-ccid QOMify, Gerd Hoffmann, 2015/05/08