projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nchip/public_html/qemu into garage-push
[qemu]
/
hw
/
gus.c
diff --git
a/hw/gus.c
b/hw/gus.c
index
070aa99
..
8915d43
100644
(file)
--- a/
hw/gus.c
+++ b/
hw/gus.c
@@
-250,19
+250,14
@@
static int GUS_load (QEMUFile *f, void *opaque, int version_id)
return 0;
}
return 0;
}
-int GUS_init (AudioState *audio, qemu_irq *pic)
+int GUS_init (qemu_irq *pic)
{
GUSState *s;
struct audsettings as;
{
GUSState *s;
struct audsettings as;
- if (!audio) {
- dolog ("No audio state\n");
- return -1;
- }
-
s = qemu_mallocz (sizeof (*s));
s = qemu_mallocz (sizeof (*s));
- AUD_register_card (audio, "gus", &s->card);
+ AUD_register_card ("gus", &s->card);
as.freq = conf.freq;
as.nchannels = 2;
as.freq = conf.freq;
as.nchannels = 2;