← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to hw/adlib.c

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/adlib.c
22
22
 * THE SOFTWARE.
23
23
 */
24
24
 
25
 
#include <assert.h>
26
25
#include "hw.h"
27
26
#include "audiodev.h"
28
27
#include "audio/audio.h"
277
276
    AUD_remove_card (&s->card);
278
277
}
279
278
 
280
 
int Adlib_init (AudioState *audio, qemu_irq *pic)
 
279
int Adlib_init (qemu_irq *pic)
281
280
{
282
281
    AdlibState *s = &glob_adlib;
283
282
    struct audsettings as;
284
283
 
285
 
    if (!audio) {
286
 
        dolog ("No audio state\n");
287
 
        return -1;
288
 
    }
289
 
 
290
284
#ifdef HAS_YMF262
291
285
    if (YMF262Init (1, 14318180, conf.freq)) {
292
286
        dolog ("YMF262Init %d failed\n", conf.freq);
313
307
    as.fmt = AUD_FMT_S16;
314
308
    as.endianness = AUDIO_HOST_ENDIANNESS;
315
309
 
316
 
    AUD_register_card (audio, "adlib", &s->card);
 
310
    AUD_register_card ("adlib", &s->card);
317
311
 
318
312
    s->voice = AUD_open_out (
319
313
        &s->card,