gwj / at91sam9263 · Commits

Commit 4c9b53e3ff97dba4336fdf18451add801385d364

Authored by malc
1 parent 6b419964

More flexible audio card selection 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6258 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 12 additions and 3 deletions
configure
  View file @4c9b53e
... ... @@ -27,7 +27,8 @@ static="no"
27 27 cross_prefix=""
28 28 cc="gcc"
29 29 audio_drv_list=""
30   -audio_card_list=""
  30 +audio_card_list="ac97 es1370 sb16"
  31 +audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
31 32 host_cc="gcc"
32 33 ar="ar"
33 34 make="make"
... ... @@ -519,8 +520,8 @@ echo " --disable-sdl disable SDL"
519 520 echo " --enable-cocoa enable COCOA (Mac OS X only)"
520 521 echo " --audio-drv-list=LIST set audio drivers list:"
521 522 echo " Available drivers: $audio_possible_drivers"
522   -echo " --audio-card-list=LIST set list of additional emulated audio cards"
523   -echo " Available cards: ac97 adlib cs4231a gus"
  523 +echo " --audio-card-list=LIST set list of emulated audio cards [$audio_card_list]"
  524 +echo " Available cards: $audio_possible_cards"
524 525 echo " --enable-mixemu enable mixer emulation"
525 526 echo " --disable-brlapi disable BrlAPI"
526 527 echo " --disable-vnc-tls disable TLS encryption for VNC server"
... ...
... ... @@ -4266,6 +4266,8 @@ struct soundhw soundhw[] = {
4266 4266 { .init_isa = pcspk_audio_init }
4267 4267 },
4268 4268 #endif
  4269 +
  4270 +#ifdef CONFIG_SB16
4269 4271 {
4270 4272 "sb16",
4271 4273 "Creative Sound Blaster 16",
... ... @@ -4273,6 +4275,7 @@ struct soundhw soundhw[] = {
4273 4275 1,
4274 4276 { .init_isa = SB16_init }
4275 4277 },
  4278 +#endif
4276 4279  
4277 4280 #ifdef CONFIG_CS4231A
4278 4281 {
... ... @@ -4308,6 +4311,7 @@ struct soundhw soundhw[] = {
4308 4311 },
4309 4312 #endif
4310 4313  
  4314 +#ifdef CONFIG_AC97
4311 4315 {
4312 4316 "ac97",
4313 4317 "Intel 82801AA AC97 Audio",
... ... @@ -4315,7 +4319,9 @@ struct soundhw soundhw[] = {
4315 4319 0,
4316 4320 { .init_pci = ac97_init }
4317 4321 },
  4322 +#endif
4318 4323  
  4324 +#ifdef CONFIG_ES1370
4319 4325 {
4320 4326 "es1370",
4321 4327 "ENSONIQ AudioPCI ES1370",
... ... @@ -4325,6 +4331,8 @@ struct soundhw soundhw[] = {
4325 4331 },
4326 4332 #endif
4327 4333  
  4334 +#endif /* HAS_AUDIO_CHOICE */
  4335 +
4328 4336 { NULL, NULL, 0, 0, { NULL } }
4329 4337 };
4330 4338  
... ...