Commit 546754dc1d799ebfba1b2654a9a75541e9187674
1 parent
8a40a180
pcm endianness is now explicit (malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1633 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
14 additions
and
8 deletions
hw/adlib.c
| @@ -310,7 +310,8 @@ int Adlib_init (AudioState *audio) | @@ -310,7 +310,8 @@ int Adlib_init (AudioState *audio) | ||
| 310 | "adlib", | 310 | "adlib", |
| 311 | s, | 311 | s, |
| 312 | adlib_callback, | 312 | adlib_callback, |
| 313 | - &as | 313 | + &as, |
| 314 | + 0 /* XXX: little endian? */ | ||
| 314 | ); | 315 | ); |
| 315 | if (!s->voice) { | 316 | if (!s->voice) { |
| 316 | Adlib_fini (s); | 317 | Adlib_fini (s); |
| @@ -321,8 +322,8 @@ int Adlib_init (AudioState *audio) | @@ -321,8 +322,8 @@ int Adlib_init (AudioState *audio) | ||
| 321 | s->mixbuf = qemu_mallocz (s->samples << SHIFT); | 322 | s->mixbuf = qemu_mallocz (s->samples << SHIFT); |
| 322 | 323 | ||
| 323 | if (!s->mixbuf) { | 324 | if (!s->mixbuf) { |
| 324 | - dolog ("not enough memory for adlib mixing buffer (%d)\n", | ||
| 325 | - s->samples << SHIFT); | 325 | + dolog ("Could not allocate mixing buffer, %d samples (each %d bytes)\n", |
| 326 | + s->samples, 1 << SHIFT); | ||
| 326 | Adlib_fini (s); | 327 | Adlib_fini (s); |
| 327 | return -1; | 328 | return -1; |
| 328 | } | 329 | } |
hw/es1370.c
| @@ -432,7 +432,8 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl) | @@ -432,7 +432,8 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl) | ||
| 432 | "es1370.adc", | 432 | "es1370.adc", |
| 433 | s, | 433 | s, |
| 434 | es1370_adc_callback, | 434 | es1370_adc_callback, |
| 435 | - &as | 435 | + &as, |
| 436 | + 0 /* little endian */ | ||
| 436 | ); | 437 | ); |
| 437 | } | 438 | } |
| 438 | else { | 439 | else { |
| @@ -443,7 +444,8 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl) | @@ -443,7 +444,8 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl) | ||
| 443 | i ? "es1370.dac2" : "es1370.dac1", | 444 | i ? "es1370.dac2" : "es1370.dac1", |
| 444 | s, | 445 | s, |
| 445 | i ? es1370_dac2_callback : es1370_dac1_callback, | 446 | i ? es1370_dac2_callback : es1370_dac1_callback, |
| 446 | - &as | 447 | + &as, |
| 448 | + 0 /* litle endian */ | ||
| 447 | ); | 449 | ); |
| 448 | } | 450 | } |
| 449 | } | 451 | } |
hw/sb16.c
| @@ -254,7 +254,8 @@ static void dma_cmd8 (SB16State *s, int mask, int dma_len) | @@ -254,7 +254,8 @@ static void dma_cmd8 (SB16State *s, int mask, int dma_len) | ||
| 254 | "sb16", | 254 | "sb16", |
| 255 | s, | 255 | s, |
| 256 | SB_audio_callback, | 256 | SB_audio_callback, |
| 257 | - &as | 257 | + &as, |
| 258 | + 0 /* little endian */ | ||
| 258 | ); | 259 | ); |
| 259 | } | 260 | } |
| 260 | 261 | ||
| @@ -348,7 +349,8 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t d0, int dma_len) | @@ -348,7 +349,8 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t d0, int dma_len) | ||
| 348 | "sb16", | 349 | "sb16", |
| 349 | s, | 350 | s, |
| 350 | SB_audio_callback, | 351 | SB_audio_callback, |
| 351 | - &as | 352 | + &as, |
| 353 | + 0 /* little endian */ | ||
| 352 | ); | 354 | ); |
| 353 | } | 355 | } |
| 354 | 356 | ||
| @@ -1340,7 +1342,8 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id) | @@ -1340,7 +1342,8 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id) | ||
| 1340 | "sb16", | 1342 | "sb16", |
| 1341 | s, | 1343 | s, |
| 1342 | SB_audio_callback, | 1344 | SB_audio_callback, |
| 1343 | - &as | 1345 | + &as, |
| 1346 | + 0 /* little endian */ | ||
| 1344 | ); | 1347 | ); |
| 1345 | } | 1348 | } |
| 1346 | 1349 |