Commit fabbd691 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180202-pull-request' into staging 



audio: two small fixes.

# gpg: Signature made Fri 02 Feb 2018 07:49:20 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/audio-20180202-pull-request:
  hw/audio/sb16.c: change dolog() to qemu_log_mask()
  hw/audio/wm8750: move WM8750 declarations from i2c/i2c.h to audio/wm8750.h

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6a95e258 8ec660b8

hw/arm/musicpal.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "hw/block/flash.h"

#include "ui/console.h"

#include "hw/i2c/i2c.h"

#include "hw/audio/wm8750.h"

#include "sysemu/block-backend.h"

#include "exec/address-spaces.h"

#include "ui/pixel_ops.h"
@@ -1691,7 +1692,7 @@ static void musicpal_init(MachineState *machine) 
        qdev_connect_gpio_out(key_dev, i, qdev_get_gpio_in(dev, i + 15));

    }



    wm8750_dev = i2c_create_slave(i2c, "wm8750", MP_WM_ADDR);

    wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR);

    dev = qdev_create(NULL, "mv88w8618_audio");

    s = SYS_BUS_DEVICE(dev);

    qdev_prop_set_ptr(dev, "wm8750", wm8750_dev);

hw/arm/spitz.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "hw/devices.h"

#include "hw/arm/sharpsl.h"

#include "ui/console.h"

#include "hw/audio/wm8750.h"

#include "audio/audio.h"

#include "hw/boards.h"

#include "sysemu/block-backend.h"
@@ -745,7 +746,7 @@ static void spitz_i2c_setup(PXA2xxState *cpu) 
    DeviceState *wm;



    /* Attach a WM8750 to the bus */

    wm = i2c_create_slave(bus, "wm8750", 0);

    wm = i2c_create_slave(bus, TYPE_WM8750, 0);



    spitz_wm8750_addr(wm, 0, 0);

    qdev_connect_gpio_out(cpu->gpio, SPITZ_GPIO_WM,

hw/arm/z2.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "hw/block/flash.h"

#include "sysemu/block-backend.h"

#include "ui/console.h"

#include "hw/audio/wm8750.h"

#include "audio/audio.h"

#include "exec/address-spaces.h"

#include "sysemu/qtest.h"
@@ -346,7 +347,7 @@ static void z2_init(MachineState *machine) 
    z2_lcd = ssi_create_slave(mpu->ssp[1], "zipit-lcd");

    bus = pxa2xx_i2c_bus(mpu->i2c[0]);

    i2c_create_slave(bus, TYPE_AER915, 0x55);

    wm = i2c_create_slave(bus, "wm8750", 0x1b);

    wm = i2c_create_slave(bus, TYPE_WM8750, 0x1b);

    mpu->i2s->opaque = wm;

    mpu->i2s->codec_out = wm8750_dac_dat;

    mpu->i2s->codec_in = wm8750_adc_dat;

hw/audio/marvell_88w8618.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "hw/sysbus.h"

#include "hw/hw.h"

#include "hw/i2c/i2c.h"

#include "hw/audio/wm8750.h"

#include "audio/audio.h"



#define MP_AUDIO_SIZE           0x00001000

hw/audio/sb16.c

+43 −36
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include "hw/qdev.h"

#include "qemu/timer.h"

#include "qemu/host-utils.h"

#include "qemu/log.h"

#include "qapi/error.h"



#define dolog(...) AUD_log ("sb16", __VA_ARGS__)
@@ -123,7 +125,7 @@ static int magic_of_irq (int irq) 
    case 10:

        return 8;

    default:

        dolog ("bad irq %d\n", irq);

        qemu_log_mask(LOG_GUEST_ERROR, "bad irq %d\n", irq);

        return 2;

    }

}
@@ -140,7 +142,7 @@ static int irq_of_magic (int magic) 
    case 8:

        return 10;

    default:

        dolog ("bad irq magic %d\n", magic);

        qemu_log_mask(LOG_GUEST_ERROR, "bad irq magic %d\n", magic);

        return -1;

    }

}
@@ -258,8 +260,8 @@ static void dma_cmd8 (SB16State *s, int mask, int dma_len) 
    s->align = (1 << s->fmt_stereo) - 1;



    if (s->block_size & s->align) {

        dolog ("warning: misaligned block size %d, alignment %d\n",

               s->block_size, s->align + 1);

        qemu_log_mask(LOG_GUEST_ERROR, "warning: misaligned block size %d,"

                      " alignment %d\n", s->block_size, s->align + 1);

    }



    ldebug ("freq %d, stereo %d, sign %d, bits %d, "
@@ -338,8 +340,8 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t d0, int dma_len) 
    s->highspeed = 0;

    s->align = (1 << (s->fmt_stereo + (s->fmt_bits == 16))) - 1;

    if (s->block_size & s->align) {

        dolog ("warning: misaligned block size %d, alignment %d\n",

               s->block_size, s->align + 1);

        qemu_log_mask(LOG_GUEST_ERROR, "warning: misaligned block size %d,"

                      " alignment %d\n", s->block_size, s->align + 1);

    }



    if (s->freq) {
@@ -391,7 +393,8 @@ static void command (SB16State *s, uint8_t cmd) 


    if (cmd > 0xaf && cmd < 0xd0) {

        if (cmd & 8) {

            dolog ("ADC not yet supported (command %#x)\n", cmd);

            qemu_log_mask(LOG_UNIMP, "ADC not yet supported (command %#x)\n",

                          cmd);

        }



        switch (cmd >> 4) {
@@ -399,7 +402,7 @@ static void command (SB16State *s, uint8_t cmd) 
        case 12:

            break;

        default:

            dolog ("%#x wrong bits\n", cmd);

            qemu_log_mask(LOG_GUEST_ERROR, "%#x wrong bits\n", cmd);

        }

        s->needed_bytes = 3;

    }
@@ -453,7 +456,7 @@ static void command (SB16State *s, uint8_t cmd) 
            goto warn;



        case 0x35:

            dolog ("0x35 - MIDI command not implemented\n");

            qemu_log_mask(LOG_UNIMP, "0x35 - MIDI command not implemented\n");

            break;



        case 0x40:
@@ -487,34 +490,38 @@ static void command (SB16State *s, uint8_t cmd) 


        case 0x74:

            s->needed_bytes = 2; /* DMA DAC, 4-bit ADPCM */

            dolog ("0x75 - DMA DAC, 4-bit ADPCM not implemented\n");

            qemu_log_mask(LOG_UNIMP, "0x75 - DMA DAC, 4-bit ADPCM not"

                          " implemented\n");

            break;



        case 0x75:              /* DMA DAC, 4-bit ADPCM Reference */

            s->needed_bytes = 2;

            dolog ("0x74 - DMA DAC, 4-bit ADPCM Reference not implemented\n");

            qemu_log_mask(LOG_UNIMP, "0x74 - DMA DAC, 4-bit ADPCM Reference not"

                          " implemented\n");

            break;



        case 0x76:              /* DMA DAC, 2.6-bit ADPCM */

            s->needed_bytes = 2;

            dolog ("0x74 - DMA DAC, 2.6-bit ADPCM not implemented\n");

            qemu_log_mask(LOG_UNIMP, "0x74 - DMA DAC, 2.6-bit ADPCM not"

                          " implemented\n");

            break;



        case 0x77:              /* DMA DAC, 2.6-bit ADPCM Reference */

            s->needed_bytes = 2;

            dolog ("0x74 - DMA DAC, 2.6-bit ADPCM Reference not implemented\n");

            qemu_log_mask(LOG_UNIMP, "0x74 - DMA DAC, 2.6-bit ADPCM Reference"

                          " not implemented\n");

            break;



        case 0x7d:

            dolog ("0x7d - Autio-Initialize DMA DAC, 4-bit ADPCM Reference\n");

            dolog ("not implemented\n");

            qemu_log_mask(LOG_UNIMP, "0x7d - Autio-Initialize DMA DAC, 4-bit"

                          " ADPCM Reference\n");

            qemu_log_mask(LOG_UNIMP, "not implemented\n");

            break;



        case 0x7f:

            dolog (

                "0x7d - Autio-Initialize DMA DAC, 2.6-bit ADPCM Reference\n"

                );

            dolog ("not implemented\n");

            qemu_log_mask(LOG_UNIMP, "0x7d - Autio-Initialize DMA DAC, 2.6-bit"

                          " ADPCM Reference\n");

            qemu_log_mask(LOG_UNIMP, "not implemented\n");

            break;



        case 0x80:
@@ -586,7 +593,7 @@ static void command (SB16State *s, uint8_t cmd) 
            break;



        case 0xe7:

            dolog ("Attempt to probe for ESS (0xe7)?\n");

            qemu_log_mask(LOG_UNIMP, "Attempt to probe for ESS (0xe7)?\n");

            break;



        case 0xe8:              /* read test reg */
@@ -613,7 +620,7 @@ static void command (SB16State *s, uint8_t cmd) 
            goto warn;



        default:

            dolog ("Unrecognized command %#x\n", cmd);

            qemu_log_mask(LOG_UNIMP, "Unrecognized command %#x\n", cmd);

            break;

        }

    }
@@ -632,8 +639,8 @@ static void command (SB16State *s, uint8_t cmd) 
    return;



 warn:

    dolog ("warning: command %#x,%d is not truly understood yet\n",

           cmd, s->needed_bytes);

    qemu_log_mask(LOG_UNIMP, "warning: command %#x,%d is not truly understood"

                  " yet\n", cmd, s->needed_bytes);

    goto exit;



}
@@ -735,9 +742,8 @@ static void complete (SB16State *s) 
            break;



        case 0x42:              /* FT2 sets output freq with this, go figure */

#if 0

            dolog ("cmd 0x42 might not do what it think it should\n");

#endif

            qemu_log_mask(LOG_UNIMP, "cmd 0x42 might not do what it think it"

                          " should\n");

        case 0x41:

            s->freq = dsp_get_hilo (s);

            ldebug ("set freq %d\n", s->freq);
@@ -820,7 +826,8 @@ static void complete (SB16State *s) 
            break;



        default:

            dolog ("complete: unrecognized command %#x\n", s->cmd);

            qemu_log_mask(LOG_UNIMP, "complete: unrecognized command %#x\n",

                          s->cmd);

            return;

        }

    }
@@ -1095,10 +1102,9 @@ static void mixer_write_datab(void *opaque, uint32_t nport, uint32_t val) 
            dma = ctz32 (val & 0xf);

            hdma = ctz32 (val & 0xf0);

            if (dma != s->dma || hdma != s->hdma) {

                dolog (

                    "attempt to change DMA "

                    "8bit %d(%d), 16bit %d(%d) (val=%#x)\n",

                    dma, s->dma, hdma, s->hdma, val);

                qemu_log_mask(LOG_GUEST_ERROR, "attempt to change DMA 8bit"

                              " %d(%d), 16bit %d(%d) (val=%#x)\n", dma, s->dma,

                              hdma, s->hdma, val);

            }

#if 0

            s->dma = dma;
@@ -1108,8 +1114,8 @@ static void mixer_write_datab(void *opaque, uint32_t nport, uint32_t val) 
        break;



    case 0x82:

        dolog ("attempt to write into IRQ status register (val=%#x)\n",

               val);

        qemu_log_mask(LOG_GUEST_ERROR, "attempt to write into IRQ status"

                      " register (val=%#x)\n", val);

        return;



    default:
@@ -1181,8 +1187,9 @@ static int SB_read_DMA (void *opaque, int nchan, int dma_pos, int dma_len) 
    int till, copy, written, free;



    if (s->block_size <= 0) {

        dolog ("invalid block size=%d nchan=%d dma_pos=%d dma_len=%d\n",

               s->block_size, nchan, dma_pos, dma_len);

        qemu_log_mask(LOG_GUEST_ERROR, "invalid block size=%d nchan=%d"

                      " dma_pos=%d dma_len=%d\n", s->block_size, nchan,

                      dma_pos, dma_len);

        return dma_pos;

    }
@@ -1376,7 +1383,7 @@ static void sb16_realizefn (DeviceState *dev, Error **errp) 
    reset_mixer (s);

    s->aux_ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, aux_timer, s);

    if (!s->aux_ts) {

        dolog ("warning: Could not create auxiliary timer\n");

        error_setg(errp, "warning: Could not create auxiliary timer");

    }



    isa_register_portio_list(isadev, &s->portio_list, s->port,