Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[qemu.git] / hw / usb / dev-audio.c

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index c5420eb057b372a1a4fc5e48d0e507f41cdafb14..c46d5eeb79a397d9156d170c4c9a8d16abf87422 100644 (file)
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -29,9 +29,10 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

+#include "qemu/osdep.h"

 #include "qemu-common.h"
 #include "hw/usb.h"
 #include "qemu-common.h"
 #include "hw/usb.h"

-#include "hw/usb/desc.h"
+#include "desc.h"

 #include "hw/hw.h"
 #include "audio/audio.h"
 
 #include "hw/hw.h"
 #include "audio/audio.h"
 


@@ -224,7 +225,7 @@ static const USBDescDevice desc_device = {
             .bNumInterfaces        = 2,
             .bConfigurationValue   = DEV_CONFIG_VALUE,
             .iConfiguration        = STRING_CONFIG,
             .bNumInterfaces        = 2,
             .bConfigurationValue   = DEV_CONFIG_VALUE,
             .iConfiguration        = STRING_CONFIG,

-            .bmAttributes          = 0xc0,
+            .bmAttributes          = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER,

             .bMaxPower             = 0x32,
             .nif = ARRAY_SIZE(desc_iface),
             .ifs = desc_iface,
             .bMaxPower             = 0x32,
             .nif = ARRAY_SIZE(desc_iface),
             .ifs = desc_iface,


@@ -320,6 +321,9 @@ static int streambuf_put(struct streambuf *buf, USBPacket *p)
     if (!free) {
         return 0;
     }
     if (!free) {
         return 0;
     }

+    if (p->iov.size != USBAUDIO_PACKET_SIZE) {
+        return 0;
+    }

     assert(free >= USBAUDIO_PACKET_SIZE);
     usb_packet_copy(p, buf->data + (buf->prod % buf->size),
                     USBAUDIO_PACKET_SIZE);
     assert(free >= USBAUDIO_PACKET_SIZE);
     usb_packet_copy(p, buf->data + (buf->prod % buf->size),
                     USBAUDIO_PACKET_SIZE);


@@ -361,6 +365,9 @@ typedef struct USBAudioState {
     uint32_t buffer;
 } 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;
 static void output_callback(void *opaque, int avail)
 {
     USBAudioState *s = opaque;


@@ -371,7 +378,7 @@ static void output_callback(void *opaque, int avail)
             return;
         }
         data = streambuf_get(&s->out.buf);
             return;
         }
         data = streambuf_get(&s->out.buf);

-        if (NULL == data) {
+        if (!data) {

             return;
         }
         AUD_write(s->out.voice, data, USBAUDIO_PACKET_SIZE);
             return;
         }
         AUD_write(s->out.voice, data, USBAUDIO_PACKET_SIZE);


@@ -506,7 +513,7 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p,
                                     int request, int value, int index,
                                     int length, uint8_t *data)
 {
                                     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) {
     int ret = 0;
 
     if (s->debug) {


@@ -565,7 +572,7 @@ fail:
 static void usb_audio_set_interface(USBDevice *dev, int iface,
                                     int old, int value)
 {
 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);
 
     if (iface == 1) {
         usb_audio_set_output_altset(s, value);


@@ -574,7 +581,7 @@ static void usb_audio_set_interface(USBDevice *dev, int iface,
 
 static void usb_audio_handle_reset(USBDevice *dev)
 {
 
 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");
 
     if (s->debug) {
         fprintf(stderr, "usb-audio: reset\n");


@@ -613,9 +620,9 @@ static void usb_audio_handle_data(USBDevice *dev, USBPacket *p)
     }
 }
 
     }
 }
 

-static void usb_audio_handle_destroy(USBDevice *dev)
+static void usb_audio_unrealize(USBDevice *dev, Error **errp)

 {
 {

-    USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);
+    USBAudioState *s = USB_AUDIO(dev);

 
     if (s->debug) {
         fprintf(stderr, "usb-audio: destroy\n");
 
     if (s->debug) {
         fprintf(stderr, "usb-audio: destroy\n");


@@ -628,14 +635,14 @@ static void usb_audio_handle_destroy(USBDevice *dev)
     streambuf_fini(&s->out.buf);
 }
 
     streambuf_fini(&s->out.buf);
 }
 

-static int usb_audio_initfn(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;
 
     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;
 
     s->out.altset        = ALTSET_OFF;
     s->out.mute          = false;


@@ -643,26 +650,25 @@ static int usb_audio_initfn(USBDevice *dev)
     s->out.vol[1]        = 240; /* 0 dB */
     s->out.as.freq       = USBAUDIO_SAMPLE_RATE;
     s->out.as.nchannels  = 2;
     s->out.vol[1]        = 240; /* 0 dB */
     s->out.as.freq       = USBAUDIO_SAMPLE_RATE;
     s->out.as.nchannels  = 2;

-    s->out.as.fmt        = AUD_FMT_S16;
+    s->out.as.fmt        = AUDIO_FORMAT_S16;

     s->out.as.endianness = 0;
     streambuf_init(&s->out.buf, s->buffer);
 
     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);
                                 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);

-    return 0;

 }
 
 static const VMStateDescription vmstate_usb_audio = {
 }
 
 static const VMStateDescription vmstate_usb_audio = {

-    .name = "usb-audio",
+    .name = TYPE_USB_AUDIO,

     .unmigratable = 1,
 };
 
 static Property usb_audio_properties[] = {
     DEFINE_PROP_UINT32("debug", USBAudioState, debug, 0),
     DEFINE_PROP_UINT32("buffer", USBAudioState, buffer,
     .unmigratable = 1,
 };
 
 static Property usb_audio_properties[] = {
     DEFINE_PROP_UINT32("debug", USBAudioState, debug, 0),
     DEFINE_PROP_UINT32("buffer", USBAudioState, buffer,

-                       8 * USBAUDIO_PACKET_SIZE),
+                       32 * USBAUDIO_PACKET_SIZE),

     DEFINE_PROP_END_OF_LIST(),
 };
 
     DEFINE_PROP_END_OF_LIST(),
 };
 


@@ -676,16 +682,16 @@ static void usb_audio_class_init(ObjectClass *klass, void *data)
     set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
     k->product_desc   = "QEMU USB Audio Interface";
     k->usb_desc       = &desc_audio;
     set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
     k->product_desc   = "QEMU USB Audio Interface";
     k->usb_desc       = &desc_audio;

-    k->init           = usb_audio_initfn;
+    k->realize        = usb_audio_realize;

     k->handle_reset   = usb_audio_handle_reset;
     k->handle_control = usb_audio_handle_control;
     k->handle_data    = usb_audio_handle_data;
     k->handle_reset   = usb_audio_handle_reset;
     k->handle_control = usb_audio_handle_control;
     k->handle_data    = usb_audio_handle_data;

-    k->handle_destroy = usb_audio_handle_destroy;
+    k->unrealize      = usb_audio_unrealize;

     k->set_interface  = usb_audio_set_interface;
 }
 
 static const TypeInfo usb_audio_info = {
     k->set_interface  = usb_audio_set_interface;
 }
 
 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,
     .parent        = TYPE_USB_DEVICE,
     .instance_size = sizeof(USBAudioState),
     .class_init    = usb_audio_class_init,


@@ -694,7 +700,7 @@ static const TypeInfo usb_audio_info = {
 static void usb_audio_register_types(void)
 {
     type_register_static(&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)
 }
 
 type_init(usb_audio_register_types)