aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-20 16:20:39 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-20 16:20:39 +0000
commit546754dc1d799ebfba1b2654a9a75541e9187674 (patch)
treeab6371d304cda5df86480998ba9f588df84a4ed7
parent8a40a180d39ec535b16a9456965a59722950cee2 (diff)
pcm endianness is now explicit (malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1633 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/adlib.c7
-rw-r--r--hw/es1370.c6
-rw-r--r--hw/sb16.c9
3 files changed, 14 insertions, 8 deletions
diff --git a/hw/adlib.c b/hw/adlib.c
index fa2a03dffc..f482d1fa84 100644
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -310,7 +310,8 @@ int Adlib_init (AudioState *audio)
"adlib",
s,
adlib_callback,
- &as
+ &as,
+ 0 /* XXX: little endian? */
);
if (!s->voice) {
Adlib_fini (s);
@@ -321,8 +322,8 @@ int Adlib_init (AudioState *audio)
s->mixbuf = qemu_mallocz (s->samples << SHIFT);
if (!s->mixbuf) {
- dolog ("not enough memory for adlib mixing buffer (%d)\n",
- s->samples << SHIFT);
+ dolog ("Could not allocate mixing buffer, %d samples (each %d bytes)\n",
+ s->samples, 1 << SHIFT);
Adlib_fini (s);
return -1;
}
diff --git a/hw/es1370.c b/hw/es1370.c
index 217fd30b53..9fddd9d8b3 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -432,7 +432,8 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
"es1370.adc",
s,
es1370_adc_callback,
- &as
+ &as,
+ 0 /* little endian */
);
}
else {
@@ -443,7 +444,8 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
i ? "es1370.dac2" : "es1370.dac1",
s,
i ? es1370_dac2_callback : es1370_dac1_callback,
- &as
+ &as,
+ 0 /* litle endian */
);
}
}
diff --git a/hw/sb16.c b/hw/sb16.c
index 8c633c3104..f7b12e6116 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -254,7 +254,8 @@ static void dma_cmd8 (SB16State *s, int mask, int dma_len)
"sb16",
s,
SB_audio_callback,
- &as
+ &as,
+ 0 /* little endian */
);
}
@@ -348,7 +349,8 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t d0, int dma_len)
"sb16",
s,
SB_audio_callback,
- &as
+ &as,
+ 0 /* little endian */
);
}
@@ -1340,7 +1342,8 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id)
"sb16",
s,
SB_audio_callback,
- &as
+ &as,
+ 0 /* little endian */
);
}